More tests with ml2 to find optimal results

1 files changed, 5 insertions, 5 deletions

diff --git a/experiments/process.py b/experiments/process.py
index d01b3fd..330a49e 100644
--- a/experiments/process.py
+++ b/experiments/process.py
@@ -12,13 +12,13 @@ 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(10., 30., 3.)  # parameter of the time component
-    # alphas = np.logspace(0,2,num=10)
-    # deltas = np.arange(0.005, 0.5, 0.005)  # parameter of the structural component
-    deltas = np.logspace(-4,-2,num=5)
+    # 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 = ml(root_victims, victims, non_victims, age, alpha, delta)
+            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()