--- a/deep/stacked_dae/v_sylvain/nist_sda_retrieve.py	Fri Apr 02 14:53:32 2010 -0400
+++ b/deep/stacked_dae/v_sylvain/nist_sda_retrieve.py	Fri Apr 02 14:53:46 2010 -0400
@@ -132,10 +132,10 @@
         optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=0)
         channel.save()
     if finetune_choice == 2:
-        print('\n\n\tfinetune with NIST followed by P07\n\n')
+        print('\n\n\tfinetune with P07 followed by NIST\n\n')
         optimizer.reload_parameters(PATH+'params_pretrain.txt')
+        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=20)
         optimizer.finetune(datasets.nist_all(),datasets.nist_P07(),max_finetune_epoch_NIST,ind_test=21)
-        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=20)
         channel.save()
     if finetune_choice == 3:
         print('\n\n\tfinetune with NIST only on the logistic regression on top (but validation on P07).\n\
@@ -156,10 +156,10 @@
         optimizer.reload_parameters(PATH+'params_pretrain.txt')
         optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=0)
         channel.save()
-        print('\n\n\tfinetune with NIST (done earlier) followed by P07 (written here)\n\n')
+        print('\n\n\tfinetune with P07 (done earlier) followed by NIST (written here)\n\n')
         sys.stdout.flush()
-        optimizer.reload_parameters('params_finetune_NIST.txt')
-        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=20)
+        optimizer.reload_parameters('params_finetune_P07.txt')
+        optimizer.finetune(datasets.nist_all(),datasets.nist_P07(),max_finetune_epoch_NIST,ind_test=21)
         channel.save()
         print('\n\n\tfinetune with NIST only on the logistic regression on top.\n\
         All hidden units output are input of the logistic regression\n\n')