Remove _simple

23 files changed, 17 insertions, 17 deletions

diff --git a/config/dest_simple_mlp_2_cs.py b/config/dest_mlp_2_cs.py
index abb7bfc..ca1ee39 100644
--- a/config/dest_simple_mlp_2_cs.py
+++ b/config/dest_mlp_2_cs.py
@@ -1,7 +1,7 @@
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp import Model, Stream
+from model.dest_mlp import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_2_cswdt.py b/config/dest_mlp_2_cswdt.py
index c5eae6b..592378a 100644
--- a/config/dest_simple_mlp_2_cswdt.py
+++ b/config/dest_mlp_2_cswdt.py
@@ -1,7 +1,7 @@
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp import Model, Stream
+from model.dest_mlp import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_2_noembed.py b/config/dest_mlp_2_noembed.py
index 9a9a158..d7582fe 100644
--- a/config/dest_simple_mlp_2_noembed.py
+++ b/config/dest_mlp_2_noembed.py
@@ -1,7 +1,7 @@
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp import Model, Stream
+from model.dest_mlp import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_emb_only.py b/config/dest_mlp_emb_only.py
index 76acdfa..76acdfa 100644
--- a/config/dest_simple_mlp_emb_only.py
+++ b/config/dest_mlp_emb_only.py
diff --git a/config/dest_simple_mlp_tgtcls_0_cs.py b/config/dest_mlp_tgtcls_0_cs.py
index 6f55013..684e653 100644
--- a/config/dest_simple_mlp_tgtcls_0_cs.py
+++ b/config/dest_mlp_tgtcls_0_cs.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp_tgtcls import Model, Stream
+from model.dest_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_tgtcls_1_cs.py b/config/dest_mlp_tgtcls_1_cs.py
index cdd8673..1d28c1a 100644
--- a/config/dest_simple_mlp_tgtcls_1_cs.py
+++ b/config/dest_mlp_tgtcls_1_cs.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp_tgtcls import Model, Stream
+from model.dest_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_tgtcls_1_cswdt.py b/config/dest_mlp_tgtcls_1_cswdt.py
index 066a14a..13abd90 100644
--- a/config/dest_simple_mlp_tgtcls_1_cswdt.py
+++ b/config/dest_mlp_tgtcls_1_cswdt.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp_tgtcls import Model, Stream
+from model.dest_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_tgtcls_1_cswdtx.py b/config/dest_mlp_tgtcls_1_cswdtx.py
index 3ae25c2..1a39dfd 100644
--- a/config/dest_simple_mlp_tgtcls_1_cswdtx.py
+++ b/config/dest_mlp_tgtcls_1_cswdtx.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp_tgtcls import Model, Stream
+from model.dest_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/dest_simple_mlp_tgtcls_1_cswdtx_alexandre.py b/config/dest_mlp_tgtcls_1_cswdtx_alexandre.py
index a067111..d75810a 100644
--- a/config/dest_simple_mlp_tgtcls_1_cswdtx_alexandre.py
+++ b/config/dest_mlp_tgtcls_1_cswdtx_alexandre.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.dest_simple_mlp_tgtcls import Model, Stream
+from model.dest_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx.py b/config/joint_mlp_tgtcls_111_cswdtx.py
index 99bee8f..83d3d11 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx.py
+++ b/config/joint_mlp_tgtcls_111_cswdtx.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.joint_simple_mlp_tgtcls import Model, Stream
+from model.joint_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger.py b/config/joint_mlp_tgtcls_111_cswdtx_bigger.py
index 8e991a1..7ebe864 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger.py
+++ b/config/joint_mlp_tgtcls_111_cswdtx_bigger.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.joint_simple_mlp_tgtcls import Model, Stream
+from model.joint_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 10     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger_dropout.py b/config/joint_mlp_tgtcls_111_cswdtx_bigger_dropout.py
index 4476879..e0448cc 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger_dropout.py
+++ b/config/joint_mlp_tgtcls_111_cswdtx_bigger_dropout.py
@@ -7,7 +7,7 @@ from blocks.filter import VariableFilter
 from blocks import roles
 
 import data
-from model.joint_simple_mlp_tgtcls import Model, Stream
+from model.joint_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 10     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx_noise_dout.py b/config/joint_mlp_tgtcls_111_cswdtx_noise_dout.py
index bfc3ac8..fbc88a1 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx_noise_dout.py
+++ b/config/joint_mlp_tgtcls_111_cswdtx_noise_dout.py
@@ -7,7 +7,7 @@ from blocks.filter import VariableFilter
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.joint_simple_mlp_tgtcls import Model, Stream
+from model.joint_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/joint_simple_mlp_tgtcls_1_cswdtx.py b/config/joint_mlp_tgtcls_1_cswdtx.py
index a66c98b..f53e41c 100644
--- a/config/joint_simple_mlp_tgtcls_1_cswdtx.py
+++ b/config/joint_mlp_tgtcls_1_cswdtx.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.joint_simple_mlp_tgtcls import Model, Stream
+from model.joint_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/joint_simple_mlp_tgtcls_1_cswdtx_bigger.py b/config/joint_mlp_tgtcls_1_cswdtx_bigger.py
index ad323f8..72d3c83 100644
--- a/config/joint_simple_mlp_tgtcls_1_cswdtx_bigger.py
+++ b/config/joint_mlp_tgtcls_1_cswdtx_bigger.py
@@ -4,7 +4,7 @@ import cPickle
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.joint_simple_mlp_tgtcls import Model, Stream
+from model.joint_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 7     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/time_simple_mlp_1.py b/config/time_mlp_1.py
index 35f60b1..4c2bffb 100644
--- a/config/time_simple_mlp_1.py
+++ b/config/time_mlp_1.py
@@ -1,7 +1,7 @@
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.time_simple_mlp import Model, Stream
+from model.time_mlp import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/time_simple_mlp_2_cswdtx.py b/config/time_mlp_2_cswdtx.py
index 26cb5c6..30dda87 100644
--- a/config/time_simple_mlp_2_cswdtx.py
+++ b/config/time_mlp_2_cswdtx.py
@@ -1,7 +1,7 @@
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.time_simple_mlp import Model, Stream
+from model.time_mlp import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/config/time_simple_mlp_tgtcls_2_cswdtx.py b/config/time_mlp_tgtcls_2_cswdtx.py
index 1bfbac7..809a808 100644
--- a/config/time_simple_mlp_tgtcls_2_cswdtx.py
+++ b/config/time_mlp_tgtcls_2_cswdtx.py
@@ -1,7 +1,7 @@
 from blocks.initialization import IsotropicGaussian, Constant
 
 import data
-from model.time_simple_mlp_tgtcls import Model, Stream
+from model.time_mlp_tgtcls import Model, Stream
 
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
diff --git a/model/dest_simple_mlp.py b/model/dest_mlp.py
index 78d7131..78d7131 100644
--- a/model/dest_simple_mlp.py
+++ b/model/dest_mlp.py
diff --git a/model/dest_simple_mlp_tgtcls.py b/model/dest_mlp_tgtcls.py
index 46fca2b..46fca2b 100644
--- a/model/dest_simple_mlp_tgtcls.py
+++ b/model/dest_mlp_tgtcls.py
diff --git a/model/joint_simple_mlp_tgtcls.py b/model/joint_mlp_tgtcls.py
index d6d4e49..d6d4e49 100644
--- a/model/joint_simple_mlp_tgtcls.py
+++ b/model/joint_mlp_tgtcls.py
diff --git a/model/time_simple_mlp.py b/model/time_mlp.py
index a52590d..a52590d 100644
--- a/model/time_simple_mlp.py
+++ b/model/time_mlp.py
diff --git a/model/time_simple_mlp_tgtcls.py b/model/time_mlp_tgtcls.py
index 35c8d8a..35c8d8a 100644
--- a/model/time_simple_mlp_tgtcls.py
+++ b/model/time_mlp_tgtcls.py