Changeset 6 for trunk/bin

Timestamp:

07/09/15 12:27:04 (9 years ago)

Author:

tim

Message:

.

Location:

trunk/bin

Files:

• graph (added)
• train (modified) (10 diffs)

trunk/bin/train

@@ -290 +290 @@
 
 
-def trainMidhinge(db, unusual_case, greater, subsample_size):
+def trainMidhinge(db, unusual_case, greater, subseries_size):
 
     def trainAux(distance, threshold, num_trials):
-        estimator = functools.partial(midhingeTest, {'distance':distance,'threshold':threshold}, unusual_case, greater)
-        estimates = bootstrap2(estimator, db, 'train', subsample_size, num_trials)
-        null_estimates = bootstrap2(estimator, db, 'train_null', subsample_size, num_trials)
+        estimator = functools.partial(midhingeTest, {'distance':distance,'threshold':threshold}, greater)
+        estimates = bootstrap3(estimator, db, 'train', unusual_case, subseries_size, num_trials)
+        null_estimates = bootstrap3(estimator, db, 'train_null', unusual_case, subseries_size, num_trials)
 
         bad_estimates = len([e for e in estimates if e != 1])
@@ -306 +306 @@
     #determine expected delta based on differences
     start = time.time()
-    mean_diffs = list(samples2MeanDiffs(subsample(db, 'train'), 'packet_rtt', unusual_case))
+    mean_diffs = [s['unusual_case']-s['other_cases'] for s in subseries(db, 'train', unusual_case)]
     threshold = trimean(mean_diffs)/2.0
     print("initial threshold:", threshold)
@@ -313 +313 @@
     print("trimean threshold:", trimean(mean_diffs)/2.0)
     
-    mean_diffs = list(samples2MeanDiffs(subsample(db, 'train_null'), 'packet_rtt', unusual_case))
+    mean_diffs = [s['unusual_case']-s['other_cases'] for s in subseries(db, 'train_null', unusual_case)]
     print(len(mean_diffs))
     print("null mean:", statistics.mean(mean_diffs))
@@ -323 +323 @@
     
     start = time.time()
-    wt = WorkerThreads(1, trainAux)
-    
-    num_trials = 200
+    wt = WorkerThreads(2, trainAux)
+    
+    num_trials = 20
     performance = []
     #for distance in range(1,46,4):
@@ -335 +335 @@
         fp,fn = errors
         performance.append(((fp+fn)/2.0, job_id, fn, fp))
+    #for distance in range(25,46,4):
+    #    job_id = distance
+    #    fp,fn = trainAux(distance, threshold, num_trials)
+    #    performance.append(((fp+fn)/2.0, job_id, fn, fp))
+    
     performance.sort()
     pprint.pprint(performance)
@@ -342 +347 @@
 
     
-    num_trials = 200
+    num_trials = 20
     start = time.time()
     performance = []
@@ -359 +364 @@
 
     
-    num_trials = 200
+    num_trials = 20
     start = time.time()
     performance = []
@@ -374 +379 @@
     best_distance = performance[0][1]
     print("best_distance:",best_distance)
-
-    num_trials = 200
+    
+    num_trials = 20
     start = time.time()
     performance = []
@@ -394 +399 @@
     return {'algorithm':"midhinge",
             'params':params,
-            'sample_size':subsample_size,
+            'sample_size':subseries_size,
             'num_trials':num_trials,
             'trial_type':"train",
@@ -421 +426 @@
 print(":", end-start)
 
+import cProfile
+
 start = time.time()
-results = trainMidhinge(db, unusual_case, greater, 6000)
-db.addClassifierResults(results)
+#cProfile.run('results = trainMidhinge(db, unusual_case, greater, 100)')
+results = trainMidhinge(db, unusual_case, greater, 100)
+#db.addClassifierResults(results)
 print("midhinge result:", results)
 end = time.time()
 print(":", end-start)
+
+sys.exit(0)
 
 start = time.time()