Changeset 6 for trunk/lib/nanownlib/__init__.py

Timestamp:

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

Author:

tim

Message:

.

File:

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

trunk/lib/nanownlib/__init__.py

@@ -214 +214 @@
     for p in packets:
         key = (p['sent'],p['tcpseq'],p['tcpack'],p['payload_len'])
-        #if (key not in seen)\
-        #   or p['sent']==1 and (seen[key]['observed'] < p['observed'])\
-        #   or p['sent']==0 and (seen[key]['observed'] > p['observed']):
-        if (key not in seen) or (seen[key]['observed'] > p['observed']):
+        if (key not in seen)\
+           or p['sent']==1 and (seen[key]['observed'] < p['observed'])\
+           or p['sent']==0 and (seen[key]['observed'] > p['observed']):
+            #if (key not in seen) or (seen[key]['observed'] > p['observed']):
             seen[key] = p
     
@@ -352 +352 @@
     pprint.pprint(evaluations)
 
-    delta_margin = 0.1
+    delta_margin = 0.15
     best_strim = 0
     best_rtrim = 0
@@ -439 +439 @@
     remaining_tm = trimean([row['packet_rtt'] for row in cursor])
 
-    return (tc, tm_map[tc]-remaining_tm)
+    ret_val = (tc, tm_map[tc]-remaining_tm)
+    print("unusual_case: %s, delta: %f" % ret_val)
+    return ret_val