# HG changeset patch
# User xaviermuller
# Date 1272307143 14400
# Node ID 60a4432b807146d34a35334d60e796835f623a80
# Parent  0b7e64e8e93fbd2768c3d76e06a829652c771d3e
 added initial model for weights in jobman

diff -r 0b7e64e8e93f -r 60a4432b8071 baseline/mlp/mlp_nist.py
--- a/baseline/mlp/mlp_nist.py	Sun Apr 25 17:12:03 2010 -0400
+++ b/baseline/mlp/mlp_nist.py	Mon Apr 26 14:39:03 2010 -0400
@@ -266,10 +266,13 @@
     divergence_flag_list=[]
     
     if data_set==0:
+        print 'using nist'
     	dataset=datasets.nist_all()
     elif data_set==1:
+        print 'using p07'
         dataset=datasets.nist_P07()
     elif data_set==2:
+        print 'using pnist'
         dataset=datasets.PNIST07()
     
     
@@ -294,6 +297,8 @@
     # check if we want to initialise the weights with a previously calculated model
     # dimensions must be consistent between old model and current configuration!!!!!! (nb_hidden and nb_targets)
     if init_model!=0:
+        print 'using old model'
+        print init_model
         old_model=numpy.load(init_model)
         classifier.W1.value=old_model['W1']
         classifier.W2.value=old_model['W2']
@@ -526,6 +531,7 @@
 										verbose = state.verbose,\
 										lr_t2_factor=state.lr_t2_factor,
                                         data_set=state.data_set,
+                                        init_model=state.init_model,
                                         channel=channel)
     state.train_error=train_error
     state.validation_error=validation_error