Merge branch 'master' of github.com:adbrebs/taxi

17 files changed, 0 insertions, 34 deletions

diff --git a/config/dest_simple_mlp_2_cs.py b/config/dest_simple_mlp_2_cs.py
index 4fd8c4a..abb7bfc 100644
--- a/config/dest_simple_mlp_2_cs.py
+++ b/config/dest_simple_mlp_2_cs.py
@@ -6,8 +6,6 @@ from model.dest_simple_mlp import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 dim_embeddings = [
     ('origin_call', data.origin_call_train_size, 10),
     ('origin_stand', data.stands_size, 10)
diff --git a/config/dest_simple_mlp_2_cswdt.py b/config/dest_simple_mlp_2_cswdt.py
index 4563176..c5eae6b 100644
--- a/config/dest_simple_mlp_2_cswdt.py
+++ b/config/dest_simple_mlp_2_cswdt.py
@@ -6,8 +6,6 @@ from model.dest_simple_mlp import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 dim_embeddings = [
     ('origin_call', data.origin_call_train_size, 10),
     ('origin_stand', data.stands_size, 10),
diff --git a/config/dest_simple_mlp_2_noembed.py b/config/dest_simple_mlp_2_noembed.py
index de3b3e4..9a9a158 100644
--- a/config/dest_simple_mlp_2_noembed.py
+++ b/config/dest_simple_mlp_2_noembed.py
@@ -6,8 +6,6 @@ from model.dest_simple_mlp import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 dim_embeddings = []   # do not use embeddings
 
 dim_input = n_begin_end_pts * 2 * 2 + sum(x for (_, _, x) in dim_embeddings)
diff --git a/config/dest_simple_mlp_tgtcls_0_cs.py b/config/dest_simple_mlp_tgtcls_0_cs.py
index 0808661..6f55013 100644
--- a/config/dest_simple_mlp_tgtcls_0_cs.py
+++ b/config/dest_simple_mlp_tgtcls_0_cs.py
@@ -9,8 +9,6 @@ from model.dest_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f: tgtcls = cPickle.load(f)
 
 dim_embeddings = [
diff --git a/config/dest_simple_mlp_tgtcls_1_cs.py b/config/dest_simple_mlp_tgtcls_1_cs.py
index 8bdd028..cdd8673 100644
--- a/config/dest_simple_mlp_tgtcls_1_cs.py
+++ b/config/dest_simple_mlp_tgtcls_1_cs.py
@@ -9,8 +9,6 @@ from model.dest_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f: tgtcls = cPickle.load(f)
 
 dim_embeddings = [
diff --git a/config/dest_simple_mlp_tgtcls_1_cswdt.py b/config/dest_simple_mlp_tgtcls_1_cswdt.py
index 38fa62d..066a14a 100644
--- a/config/dest_simple_mlp_tgtcls_1_cswdt.py
+++ b/config/dest_simple_mlp_tgtcls_1_cswdt.py
@@ -9,8 +9,6 @@ from model.dest_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f: tgtcls = cPickle.load(f)
 
 dim_embeddings = [
diff --git a/config/dest_simple_mlp_tgtcls_1_cswdtx.py b/config/dest_simple_mlp_tgtcls_1_cswdtx.py
index f350457..3ae25c2 100644
--- a/config/dest_simple_mlp_tgtcls_1_cswdtx.py
+++ b/config/dest_simple_mlp_tgtcls_1_cswdtx.py
@@ -9,8 +9,6 @@ from model.dest_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f: tgtcls = cPickle.load(f)
 
 dim_embeddings = [
diff --git a/config/dest_simple_mlp_tgtcls_1_cswdtx_alexandre.py b/config/dest_simple_mlp_tgtcls_1_cswdtx_alexandre.py
index c9748ad..a067111 100644
--- a/config/dest_simple_mlp_tgtcls_1_cswdtx_alexandre.py
+++ b/config/dest_simple_mlp_tgtcls_1_cswdtx_alexandre.py
@@ -9,8 +9,6 @@ from model.dest_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f: tgtcls = cPickle.load(f)
 
 dim_embeddings = [
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx.py b/config/joint_simple_mlp_tgtcls_111_cswdtx.py
index b969da1..99bee8f 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx.py
+++ b/config/joint_simple_mlp_tgtcls_111_cswdtx.py
@@ -9,8 +9,6 @@ from model.joint_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f:
     dest_tgtcls = cPickle.load(f)
 
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger.py b/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger.py
index 0077881..93ff5c7 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger.py
+++ b/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger.py
@@ -9,8 +9,6 @@ from model.joint_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 10     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f:
     dest_tgtcls = cPickle.load(f)
 
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger_dropout.py b/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger_dropout.py
index bc5121b..b047d7c 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger_dropout.py
+++ b/config/joint_simple_mlp_tgtcls_111_cswdtx_bigger_dropout.py
@@ -9,8 +9,6 @@ from model.joint_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 10     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f:
     dest_tgtcls = cPickle.load(f)
 
diff --git a/config/joint_simple_mlp_tgtcls_111_cswdtx_noise_dout.py b/config/joint_simple_mlp_tgtcls_111_cswdtx_noise_dout.py
index fd4dabf..bfc3ac8 100644
--- a/config/joint_simple_mlp_tgtcls_111_cswdtx_noise_dout.py
+++ b/config/joint_simple_mlp_tgtcls_111_cswdtx_noise_dout.py
@@ -12,8 +12,6 @@ from model.joint_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f:
     dest_tgtcls = cPickle.load(f)
 
diff --git a/config/joint_simple_mlp_tgtcls_1_cswdtx.py b/config/joint_simple_mlp_tgtcls_1_cswdtx.py
index 1e21000..a66c98b 100644
--- a/config/joint_simple_mlp_tgtcls_1_cswdtx.py
+++ b/config/joint_simple_mlp_tgtcls_1_cswdtx.py
@@ -9,8 +9,6 @@ from model.joint_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f:
     dest_tgtcls = cPickle.load(f)
 
diff --git a/config/joint_simple_mlp_tgtcls_1_cswdtx_bigger.py b/config/joint_simple_mlp_tgtcls_1_cswdtx_bigger.py
index a8242a7..ad323f8 100644
--- a/config/joint_simple_mlp_tgtcls_1_cswdtx_bigger.py
+++ b/config/joint_simple_mlp_tgtcls_1_cswdtx_bigger.py
@@ -9,8 +9,6 @@ from model.joint_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 7     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 with open(os.path.join(data.path, 'arrival-clusters.pkl')) as f:
     dest_tgtcls = cPickle.load(f)
 
diff --git a/config/time_simple_mlp_1.py b/config/time_simple_mlp_1.py
index 6cfe510..35f60b1 100644
--- a/config/time_simple_mlp_1.py
+++ b/config/time_simple_mlp_1.py
@@ -6,8 +6,6 @@ from model.time_simple_mlp import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 dim_embeddings = [
 ]
 
diff --git a/config/time_simple_mlp_2_cswdtx.py b/config/time_simple_mlp_2_cswdtx.py
index 4a1a92c..26cb5c6 100644
--- a/config/time_simple_mlp_2_cswdtx.py
+++ b/config/time_simple_mlp_2_cswdtx.py
@@ -6,8 +6,6 @@ from model.time_simple_mlp import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 dim_embeddings = [
     ('origin_call', data.origin_call_train_size, 10),
     ('origin_stand', data.stands_size, 10),
diff --git a/config/time_simple_mlp_tgtcls_2_cswdtx.py b/config/time_simple_mlp_tgtcls_2_cswdtx.py
index d8a1281..1bfbac7 100644
--- a/config/time_simple_mlp_tgtcls_2_cswdtx.py
+++ b/config/time_simple_mlp_tgtcls_2_cswdtx.py
@@ -6,8 +6,6 @@ from model.time_simple_mlp_tgtcls import Model, Stream
 
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 
-n_valid = 1000
-
 # generate target classes as a Fibonacci sequence
 tgtcls = [1, 2]
 for i in range(22):