1 files changed, 15 insertions, 14 deletions
diff --git a/experiments/process.py b/experiments/process.py
index 49fe7a0..40bc9f3 100644
--- a/experiments/process.py
+++ b/experiments/process.py
@@ -1,6 +1,7 @@
 import sys
 from ml import ml
 from ml2 import ml2
+from ml3 import ml3
 import numpy as np
 from cPickle import load
 from itertools import product
@@ -12,18 +13,18 @@ if __name__ == "__main__":
         sys.exit("usage: {0} <file>".format(sys.argv[0]))
     root_victims, victims, non_victims, age = load(open(sys.argv[1]))
     
-    # # alphas = np.arange(5e-4, 3e-3, 1e-4)  # parameter of the time component
-    # alphas = np.logspace(-5,-1,num=20)
-    # # deltas = np.arange(0.03, 0.1, 0.005)  # parameter of the structural component
-    # deltas = np.logspace(-5,-1,num=20)
-    # with open("out.log", "w") as fh:
-    #     for alpha, delta in product(alphas, deltas):
-    #         beta, roots, ll = ml2(root_victims, victims, non_victims, age, alpha, delta)
-    #         print "\t".join(map(str, [alpha, delta, beta, roots, ll]))
-    #         fh.write("\t".join(map(str, [alpha, delta, beta, roots, ll])) + "\n")
-    #         fh.flush()
+    # alphas = np.arange(5e-4, 3e-3, 1e-4)  # parameter of the time component
+    alphas = np.logspace(-4,2,num=20)
+    # deltas = np.arange(0.03, 0.1, 0.005)  # parameter of the structural component
+    deltas = np.logspace(-4,-1,num=10)
+    with open("out.log", "w") as fh:
+        for alpha, delta in product(alphas, deltas):
+            beta, roots, ll = ml3(root_victims, victims, non_victims, age, alpha, delta)
+            print "\t".join(map(str, [alpha, delta, beta, roots, ll]))
+            fh.write("\t".join(map(str, [alpha, delta, beta, roots, ll])) + "\n")
+            fh.flush()
 
-    alpha = 0.004
-    delta = 0.06
-    beta, roots, ll = ml2(root_victims, victims, non_victims, age, alpha, delta)
-    print "\t".join(map(str, [1./alpha, delta, beta, roots, ll]))
-\ No newline at end of file
+    # alpha = 0.0028
+    # delta = 0.06
+    # beta, roots, ll = ml2(root_victims, victims, non_victims, age, alpha, delta)
+    # print "\t".join(map(str, [1./alpha, delta, beta, roots, ll]))
+\ No newline at end of file