Merge branch 'master' of github.com:Thibauth/criminal_cascades

1 files changed, 11 insertions, 11 deletions

diff --git a/experiments/process.py b/experiments/process.py
index f31e0d4..6c71934 100644
--- a/experiments/process.py
+++ b/experiments/process.py
@@ -15,21 +15,21 @@ 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(1e-3, 1e-2, 8e-4)  # parameter of the time component
-    alphas = np.logspace(-4,-1,num=15)
-    # deltas = np.arange(0.001, 0.3, 0.008)  # parameter of the structural component
-    deltas = np.logspace(-4,-1.7,num=15)
+    # alphas = np.arange(.02, .1, .01)  # parameter of the time component
+    alphas = np.logspace(-1,-.5,num=10)
+    # deltas = np.arange(.02, .1, .01)  # parameter of the structural component
+    deltas = np.logspace(-2,-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)
+            beta, roots, ll = ml(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(.04, .075, .003)  # parameter of the time component
-    # # alphas = np.logspace(-4,-1,num=20)
-    # deltas = np.arange(.07, .11, .003)  # parameter of the structural component
-    # # deltas = np.logspace(-2,-.5,num=20)
+    # alphas = np.arange(.15, .25, .01)  # parameter of the time component
+    # # alphas = np.logspace(-4,-.5,num=15)
+    # deltas = np.arange(.08, .1, .01)  # parameter of the structural component
+    # # deltas = np.logspace(-2,-.1,num=15)
     # lmbda = 0.10#np.logspace(-12,-3,num=10)
     # with open("out.log", "w") as fh:
     #     for alpha, delta in product(alphas, deltas):
@@ -38,7 +38,7 @@ if __name__ == "__main__":
     #         fh.write("\t".join(map(str, [alpha, delta, lmbda, roots, ll])) + "\n")
     #         fh.flush()
 
-    # alpha = 0.061
-    # delta = 0.082
+    # alpha = .016
+    # delta = 0.077
     # beta, roots, ll = ml2(root_victims, victims, non_victims, alpha, delta, 1.)
     # print "\t".join(map(str, [alpha, delta, beta, roots, ll]))
\ No newline at end of file