remove dictionnary duplication

Grégoire · Grégoire · commit ada4162aa7ea · 2014-11-10T19:14:27.000-05:00
diff --git a/code/rnnslu.py b/code/rnnslu.py
@@ -227,8 +227,27 @@ def load(self, folder):
 
 
 
-def main(param):
-
+def main(param=None):
+    if not param:
+        param = {'fold': 3,
+         # 5 folds 0,1,2,3,4
+         'data': 'atis',
+         'lr': 0.0970806646812754,
+         'verbose': 1,
+         'decay': True,
+         # decay on the learning rate if improvement stops
+         'win': 7,
+         # number of words in the context window
+         'nhidden': 200,
+         # number of hidden units
+         'seed': 345,
+         'emb_dimension': 50,
+         # dimension of word embedding
+         'nepochs': 60,
+         # 60 is recommended
+         'savemodel': False}
+    print param
+ 
     folder = os.path.basename(__file__).split('.')[0]
     if not os.path.exists(folder):
         os.mkdir(folder)
@@ -341,24 +360,4 @@ def main(param):
 
 
 if __name__ == '__main__':
-    # best model
-    s = {'fold': 3,
-         # 5 folds 0,1,2,3,4
-         'data': 'atis',
-         'lr': 0.0970806646812754,
-         'verbose': 1,
-         'decay': True,
-         # decay on the learning rate if improvement stops
-         'win': 7,
-         # number of words in the context window
-         'nhidden': 200,
-         # number of hidden units
-         'seed': 345,
-         'emb_dimension': 50,
-         # dimension of word embedding
-         'nepochs': 60,
-         # 60 is recommended
-         'savemodel': False}
-
-    print s
-    main(s)
+    main()
diff --git a/code/test.py b/code/test.py
@@ -15,26 +15,7 @@
 
 
 def test_rnnslu():
-    # best model
-    s = {'fold': 3,
-         # 5 folds 0,1,2,3,4
-         'data': 'atis',
-         'lr': 0.0970806646812754,
-         'verbose': 1,
-         'decay': True,
-         # decay on the learning rate if improvement stops
-         'win': 7,
-         # number of words in the context window
-         'nhidden': 200,
-         # number of hidden units
-         'seed': 345,
-         'emb_dimension': 50,
-         # dimension of word embedding
-         'nepochs': 1,
-         # 60 is recommended
-         'savemodel': False}
-
-    rnnslu.main(s)
+    rnnslu.main()
 
 
 def test_logistic_sgd():
