Edit noise simulation defaults

tinybike · Jul 5, 2015 · ec1a803 · ec1a803
1 parent 9903ce9
commit ec1a803
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/src/pyplots.jl b/src/pyplots.jl
@@ -74,7 +74,7 @@ function plot_overlay(sim::Simulation,
         k = 1
         for (i, lt) in enumerate(liar_thresholds)
             y_points = trajectories[i][algo][metric][:mean][1:time_max]*100
-            println(algo, " ", string(metric), " @ time_max: ", y_points[end])
+            # println(algo, " ", string(metric), " @ time_max: ", y_points[end])
             y_errors = trajectories[i][algo][metric][:stderr][1:time_max]*100
             PyPlot.errorbar(timesteps, y_points, marker=markers[k], yerr=y_errors)
             y_min = min(y_min, minimum(y_points - abs(y_errors)))

diff --git a/test/defaults_cplx.jl b/test/defaults_cplx.jl
@@ -11,7 +11,7 @@ sim.COLLUDE = 0.3
 sim.INDISCRIMINATE = true
 sim.SAVE_RAW_DATA = false
 sim.HISTOGRAM = false
-sim.ALGOS = ["hierarchical"]
+sim.ALGOS = ["clusterfeck"]
 sim.METRICS = [
     "beats",
     "liars_bonus",

diff --git a/test/defaults_noise.jl b/test/defaults_noise.jl
@@ -21,12 +21,11 @@ sim.LABELSORT = false
 sim.SAVE_RAW_DATA = false
 sim.HISTOGRAM = false
 sim.ALGOS = [
-    "PCA",
-    "hierarchical",
-    "fixed-variance",
     "clusterfeck",
-    "k-means",
-    "big-five",
+    "hierarchical",
+    "PCA",
+    "DBSCAN",
+    "affinity",
 ]
 sim.METRICS = [
     "beats",

diff --git a/test/tinker.jl b/test/tinker.jl
@@ -3,7 +3,7 @@ tic()
 @everywhere using Augur
 using Distributions
 
-liar_thresholds = 0.5:0.1:0.8
+liar_thresholds = 0.85:0.05:0.95
 param_range = 5:5:250
 
 sim = Simulation()
@@ -34,21 +34,21 @@ include(joinpath(testpath, "defaults_" * simtype * ".jl"))
 sim.VERBOSE = false
 sim.COLLUDE = 0.33
 
-sim.EVENTS = 50
-sim.REPORTERS = 250
+sim.EVENTS = 100
+sim.REPORTERS = 300
 sim.ITERMAX = 100
-sim.TIMESTEPS = 200
+sim.TIMESTEPS = 150
 
 sim.INDISCRIMINATE = false
-sim.CONSPIRACY = true
+sim.CONSPIRACY = false
 sim.NUM_CONSPIRACIES = 4
 sim.SCALARS = 0.0
 sim.SCALARMIN = 0.0
 sim.SCALARMAX = 1000.0
 sim.REP_RAND = false
 sim.REP_DIST = Pareto(2.0)
 
-sim.HIERARCHICAL_THRESHOLD = 0.5
+sim.HIERARCHICAL_THRESHOLD = 0.7
 sim.HIERARCHICAL_LINKAGE = :average
 sim.CLUSTERFECK_THRESHOLD = 0.7
 sim.DBSCAN_EPSILON = 0.25
@@ -71,18 +71,23 @@ sim.ALGOS = [
     "hierarchical",
     "PCA",
     "DBSCAN",
-    # "affinity",
 ]
 
 sim.METRICS = [
-    # "correct",
-    # "MCC",
+    "correct",
+    "MCC",
     "liar_rep",
+    "precision",
+    "sensitivity",
+    "fallout",
 ]
 sim.TRACK = [
-    # "correct",
-    # "MCC",
+    "correct",
+    "MCC",
     "liar_rep",
+    "precision",
+    "sensitivity",
+    "fallout",
 ]
 
 # Run simulations and save results: