Changeset 8 for trunk/lib

Timestamp:

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

Author:

tim

Message:

.

Location:

trunk/lib/nanownlib

Files:

• stats.py (modified) (3 diffs)
• storage.py (modified) (5 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']:

trunk/lib/nanownlib/storage.py

@@ -6 +6 @@
 import threading
 import sqlite3
+
+import numpy
 
 def _newid():
@@ -15 +17 @@
     cursor = None
     _population_sizes = None
+    _population_cache = None
     
     def __init__(self, path):
@@ -22 +25 @@
         self.conn.row_factory = sqlite3.Row
         self._population_sizes = {}
+        self._population_cache = {}
         
         if not exists:
@@ -89 +93 @@
             self.conn.close()
 
+    
     def populationSize(self, probe_type):
         if probe_type in self._population_sizes:
@@ -101 +106 @@
             print(e)
             return 0
+
+
+    def subseries(self, probe_type, unusual_case, size=None, offset=None, field='packet_rtt'):
+        if (probe_type,unusual_case,field) not in self._population_cache:
+            query="""
+            SELECT %(field)s AS unusual_case,
+                   (SELECT avg(%(field)s) FROM probes,analysis
+                    WHERE analysis.probe_id=probes.id AND probes.test_case!=:unusual_case AND probes.type=:probe_type AND sample=u.sample) AS other_cases
+            FROM   (SELECT probes.sample,%(field)s FROM probes,analysis 
+                    WHERE analysis.probe_id=probes.id AND probes.test_case =:unusual_case AND probes.type=:probe_type) u
+            """ % {"field":field}
+    
+            params = {"probe_type":probe_type, "unusual_case":unusual_case}
+            cursor = self.conn.cursor()
+            cursor.execute(query, params)
+            self._population_cache[(probe_type,unusual_case,field)] = [dict(row) for row in cursor.fetchall()]
+
+        population = self._population_cache[(probe_type,unusual_case,field)]
+
+        if size == None or size > len(population):
+            size = len(population)
+        if offset == None or offset >= len(population) or offset < 0:
+            offset = numpy.random.random_integers(0,len(population)-1)
+
+        ret_val = population[offset:offset+size]
+        if len(ret_val) < size:
+            ret_val += population[0:size-len(ret_val)]
+        
+        return ret_val
+
+    
+    def clearCache(self):
+        self._population_cache = {}
+
         
     def _insert(self, table, row):