Changeset 8 for trunk/lib/nanownlib/stats.py

Timestamp:

07/09/15 19:01:23 (9 years ago)

Author:

tim

Message:

.

File:

• trunk/lib/nanownlib/stats.py (modified) (3 diffs)

trunk/lib/nanownlib/stats.py

@@ -311 +311 @@
     ret_val = []
     for t in range(num_trials):
-        ret_val.append(estimator(subseries(db, probe_type, unusual_case, subseries_size)))
+        ret_val.append(estimator(db.subseries(probe_type, unusual_case, subseries_size)))
 
     return ret_val
@@ -344 +344 @@
 #         0 if it isn't unusual
 #        -1 if it is unusual in the wrong direction
-def multiBoxTest(params, unusual_case, greater, samples):
-    #XXX: packet_rtt field from params
-    dists = samples2Distributions(samples, 'packet_rtt')
-    
-    uc = dists[unusual_case]
-    rest = []
-    for tc,d in dists.items():
-        if tc != unusual_case:
-            rest.extend(d)
-
+def multiBoxTest(params, greater, samples):
+    uc = [s['unusual_case'] for s in samples]
+    rest = [s['other_cases'] for s in samples]
+    
     uc_high = numpy.percentile(uc, params['high'])
     rest_low = numpy.percentile(rest, params['low'])
@@ -379 +373 @@
 
     mh = midhinge(diffs, params['distance'])
+    #mh = trimean(diffs, params['distance'])
     if greater:
         if mh > params['threshold']: