Add date/time transformer and new model that uses it

5 files changed, 28 insertions, 16 deletions

diff --git a/config/simple_mlp_2_cs.py b/config/simple_mlp_2_cs.py
index 692d325..fa2f4c1 100644
--- a/config/simple_mlp_2_cs.py
+++ b/config/simple_mlp_2_cs.py
@@ -2,10 +2,6 @@ import model.simple_mlp as model
 
 import data
 
-n_dow = 7       # number of division for dayofweek/dayofmonth/hourofday
-n_dom = 31
-n_hour = 24
-
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 n_end_pts = 5
 
diff --git a/config/simple_mlp_2_noembed.py b/config/simple_mlp_2_noembed.py
index bc300e7..2f45f63 100644
--- a/config/simple_mlp_2_noembed.py
+++ b/config/simple_mlp_2_noembed.py
@@ -2,10 +2,6 @@ import model.simple_mlp as model
 
 import data
 
-n_dow = 7       # number of division for dayofweek/dayofmonth/hourofday
-n_dom = 31
-n_hour = 24
-
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 n_end_pts = 5
 
diff --git a/config/simple_mlp_tgtcls_0_cs.py b/config/simple_mlp_tgtcls_0_cs.py
index b174517..96faca0 100644
--- a/config/simple_mlp_tgtcls_0_cs.py
+++ b/config/simple_mlp_tgtcls_0_cs.py
@@ -4,10 +4,6 @@ import data
 
 import model.simple_mlp_tgtcls as model
 
-n_dow = 7       # number of division for dayofweek/dayofmonth/hourofday
-n_dom = 31
-n_hour = 24
-
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 n_end_pts = 5
 
diff --git a/config/simple_mlp_tgtcls_1_cs.py b/config/simple_mlp_tgtcls_1_cs.py
index 6bf82e1..293a0ab 100644
--- a/config/simple_mlp_tgtcls_1_cs.py
+++ b/config/simple_mlp_tgtcls_1_cs.py
@@ -4,10 +4,6 @@ import data
 
 import model.simple_mlp_tgtcls as model
 
-n_dow = 7       # number of division for dayofweek/dayofmonth/hourofday
-n_dom = 31
-n_hour = 24
-
 n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
 n_end_pts = 5
 
diff --git a/config/simple_mlp_tgtcls_1_cswdt.py b/config/simple_mlp_tgtcls_1_cswdt.py
new file mode 100644
index 0000000..9261635
--- /dev/null
+++ b/config/simple_mlp_tgtcls_1_cswdt.py
@@ -0,0 +1,28 @@
+import cPickle
+
+import data
+
+import model.simple_mlp_tgtcls as model
+
+n_begin_end_pts = 5     # how many points we consider at the beginning and end of the known trajectory
+n_end_pts = 5
+
+n_valid = 1000
+
+with open(data.DATA_PATH + "/arrival-clusters.pkl") as f: tgtcls = cPickle.load(f)
+
+dim_embeddings = [
+    ('origin_call', data.n_train_clients+1, 10),
+    ('origin_stand', data.n_stands+1, 10),
+    ('week_of_year', 53, 10),
+    ('day_of_week', 7, 10),
+    ('qhour_of_day', 24 * 4, 10)
+]
+
+dim_input = n_begin_end_pts * 2 * 2 + sum(x for (_, _, x) in dim_embeddings)
+dim_hidden = [500]
+dim_output = tgtcls.shape[0]
+
+learning_rate = 0.0001
+momentum = 0.99
+batch_size = 32