Automated merge with ssh://projects@lgcm.iro.umontreal.ca/hg/theano

examples/tests/test_logistic_regression.py

@@ -23,12 +23,16 @@ class test_logistic_regression_example(unittest.TestCase):
 
     def test_example_main(self): 
         """Test that the file execute without trouble"""
-        from ..examples import logistic_regression
+        import os
+        sys.path.append(os.path.realpath(".."))
+        import logistic_regression
         logistic_regression.main()
 
     def test_example_moduleN(self): 
         """Test that the LogisticRegressionN module execute the same with different mode"""
-        from ..examples import logistic_regression
+        import os
+        sys.path.append(os.path.realpath(".."))
+        import logistic_regression
         pprint.assign(nnet.crossentropy_softmax_1hot_with_bias_dx, printing.FunctionPrinter('xsoftmaxdx'))
         pprint.assign(nnet.crossentropy_softmax_argmax_1hot_with_bias, printing.FunctionPrinter('nll', 'softmax', 'argmax'))
 
@@ -56,23 +60,26 @@ class test_logistic_regression_example(unittest.TestCase):
 
     def test_example_module2(self): 
         """Test that the LogisticRegression2 module execute the same with different mode"""
-        from ..examples import logistic_regression
+        import os
+        sys.path.append(os.path.realpath(".."))
+        import logistic_regression
         lrc = logistic_regression.LogisticRegression2() #TODO: test 2==N
-        lr0 = lrc.make(10,2)
-#        lr0 = lrc.make(10,2,seed=1827)#error
-#        lr1 = lrc.make(10, 2, mode=theano.Mode('c|py', 'fast_run'), seed=1827)
-#         lr2 = lrc.make(10, 2, mode=theano.Mode('py', 'fast_run'), seed=1827)
-#         lr3 = lrc.make(10, 2, mode=theano.Mode('py', 'merge'), seed=1827) #'FAST_RU
-
-#         lr4 = lrc.make(10, 2, mode=compile.FAST_RUN.excluding('fast_run'), seed=1827)
+        lr0 = lrc.make(10,1827)
+#        lr1 = lrc.make(10, mode=theano.Mode('c|py', 'fast_run'), seed=1827)
+#        lr2 = lrc.make(10, mode=theano.Mode('py', 'fast_run'), seed=1827)
+#        lr3 = lrc.make(10, mode=theano.Mode('py', 'merge'), seed=1827) #'FAST_RU
+#        lr4 = lrc.make(10, mode=compile.FAST_RUN.excluding('fast_run'), seed=1827)
 #         #FAST_RUN, FAST_COMPILE, 
-#         data_x = N.random.randn(5, 10)
-#         data_y = (N.random.randn(5) > 0)
+        data_x = N.random.randn(5, 10)
+        data_y = (N.random.randn(5) > 0)
+        data_y = data_y.reshape((data_y.shape[0],1))#need to be a column
+        
 
-#         def train(lr):
-#             for i in xrange(10000):
-#                 lr.lr = 0.02
-#                 xe = lr.update(data_x, data_y) 
+        def train(lr):
+            for i in xrange(1000):
+                lr.lr = 0.02
+                xe = lr.update(data_x, data_y) 
+        train(lr0)
 #        train(lr1)
 #        train(lr2)
 #        train(lr3)
@@ -82,4 +89,4 @@ class test_logistic_regression_example(unittest.TestCase):
 
 if __name__ == '__main__':
     from theano.tests import main
-    main("test_wiki")
+    main("test_logistic_regression")