Commit: e788865417c80884c49f3e4f6dd112ef431dcf89 - myprojects-hg-reborn (hg)

Commit MetaInfo

• Revision: e788865417c80884c49f3e4f6dd112ef431dcf89 (tree)
• Zeit: 2009-09-22 18:13:25
• Autor: lorenzo
• Commiter: lorenzo

Log Message

I simply removed some unnecessary comments from the code and set the time
slice duration to 20 sec.

Ändern Zusammenfassung

• modified: Python-codes/infectious_power_3.py

Diff

diff -r a4c76e5f1074 -r e788865417c8 Python-codes/infectious_power_3.py
--- a/Python-codes/infectious_power_3.py	Mon Sep 21 17:07:29 2009 +0000
+++ b/Python-codes/infectious_power_3.py	Tue Sep 22 09:13:25 2009 +0000
@@ -86,7 +86,7 @@
 
 loader = Loader(sys.argv[1:], decode=1, xxtea_crypto_key=XXTEA_CRYPTO_KEY, load_contacts=1, unique_contacts=0, load_sightings=1, unique_sightings=0)
 
-analyzer = PowerAnalyzer(loader, time_delta=60, tag_id_min=1100, tag_id_max=2047)
+analyzer = PowerAnalyzer(loader, time_delta=20, tag_id_min=1100, tag_id_max=2047)
 
 
 
@@ -95,67 +95,6 @@
         if len(frame['boot_count'][tag_id]) < 1:
 	    continue
 
-        #As Ciro put it
-        #print frame['time'], tag_id, frame['count'][tag_id][0], frame['count'][tag_id][1], frame['count'][tag_id][2], frame['count'][tag_id][3], len(frame['boot_count'][tag_id]),list(frame['boot_count'][tag_id])[0]
-
-
-#         a=b=c=d=e=f=g=-1
-
-#         if (len(list(frame['antenna'][tag_id]))==1):
-#             a=list(frame['antenna'][tag_id])[0]
-        
-#         elif (len(list(frame['antenna'][tag_id]))==2):
-#             a=list(frame['antenna'][tag_id])[0]
-#             b=list(frame['antenna'][tag_id])[1]
-
-#         elif (len(list(frame['antenna'][tag_id]))==3):
-#             a=list(frame['antenna'][tag_id])[0]
-#             b=list(frame['antenna'][tag_id])[1]
-#             c=list(frame['antenna'][tag_id])[2]
-
-#         elif (len(list(frame['antenna'][tag_id]))==4):
-
-#             a=list(frame['antenna'][tag_id])[0]
-#             b=list(frame['antenna'][tag_id])[1]
-#             c=list(frame['antenna'][tag_id])[2]
-#             d=list(frame['antenna'][tag_id])[3]
-
-#         elif (len(list(frame['antenna'][tag_id]))==5):
-
-#             a=list(frame['antenna'][tag_id])[0]
-#             b=list(frame['antenna'][tag_id])[1]
-#             c=list(frame['antenna'][tag_id])[2]
-#             d=list(frame['antenna'][tag_id])[3]
-#             e=list(frame['antenna'][tag_id])[4]
-
-#         elif (len(list(frame['antenna'][tag_id]))==6):
-
-#             a=list(frame['antenna'][tag_id])[0]
-#             b=list(frame['antenna'][tag_id])[1]
-#             c=list(frame['antenna'][tag_id])[2]
-#             d=list(frame['antenna'][tag_id])[3]
-#             e=list(frame['antenna'][tag_id])[4]
-#             f=list(frame['antenna'][tag_id])[5]
-
-#         elif (len(list(frame['antenna'][tag_id]))==7):
-
-#             a=list(frame['antenna'][tag_id])[0]
-#             b=list(frame['antenna'][tag_id])[1]
-#             c=list(frame['antenna'][tag_id])[2]
-#             d=list(frame['antenna'][tag_id])[3]
-#             e=list(frame['antenna'][tag_id])[4]
-#             f=list(frame['antenna'][tag_id])[5]
-#             g=list(frame['antenna'][tag_id])[6]
-
-
-
-
-        #print "len antenna and a,b,c,d are, ", len(list(frame['antenna'][tag_id]))\
-              #,a,b,c,d
-#         print frame['time'], tag_id, frame['count'][tag_id][0],\
-#               frame['count'][tag_id][1],\
-#               frame['count'][tag_id][2], frame['count'][tag_id][3],\
-#               list(frame['boot_count'][tag_id])[0],list(frame['antenna'][tag_id])
 
         x=frame['antenna'][tag_id]