Commit: 8d54d703377c5a92f00becf50a9c184fb4fb3d39 - myprojects-hg-reborn (hg)

Commit MetaInfo

• Revisión: 8d54d703377c5a92f00becf50a9c184fb4fb3d39 (tree)
• Tiempo: 2009-09-11 00:30:46
• Autor: lorenzo
• Commiter: lorenzo

Log Message

Some changes to these codes to make it easier to work with them and analyze the data.

Cambiar Resumen

• modified: Python-codes/disambiguate_visitors.py
• modified: Python-codes/test_filters.py

Diferencia incremental

diff -r 057c46d6ae8a -r 8d54d703377c Python-codes/disambiguate_visitors.py
--- a/Python-codes/disambiguate_visitors.py	Thu Sep 10 13:48:41 2009 +0000
+++ b/Python-codes/disambiguate_visitors.py	Thu Sep 10 15:30:46 2009 +0000
@@ -337,45 +337,39 @@
         
 
 
-read=0
-
-if (read==1):
-
-    for arg in  sys.argv[1:]:
-
-        time_edge_list=p.load(arg)
 
-    time_edge_list=time_edge_list.astype("int")
+for arg in  sys.argv[1:]:
 
-    bootcount_data=p.load("tag_and_boot_every_20_sec.dat")
-    bootcount_data=bootcount_data.astype("int")
-    print "time to use the new function"
-    bootcount_cut=resize_bootcount_file2(time_edge_list, bootcount_data)
-    print "new function is done"
-    p.save("boot_count_cut.dat",bootcount_cut,  fmt='%d')
+    time_edge_list=p.load(arg)
 
-elif (read==0):
+time_edge_list=time_edge_list.astype("int")
+
+bootcount_data=p.load("tag_and_boot_every_20_sec.dat")
+bootcount_data=bootcount_data.astype("int")
+print "time to use the new function"
+bootcount_cut=resize_bootcount_file2(time_edge_list, bootcount_data)
+print "new function is done"
+p.save("boot_count_cut.dat",bootcount_cut,  fmt='%d')
 
 
 
-    for arg in  sys.argv[1:]:
-
-        time_edge_list=p.load(arg)
 
 
-    time_edge_list=time_edge_list.astype("int")
-    time_edge_list_reshaped=duplicate_and_mix_array(time_edge_list)
-    time_edge_list_reshaped=time_edge_list_reshaped.astype("int")
-    p.save("edge_list_reshaped.dat",time_edge_list_reshaped,  fmt='%d')
 
-    resized_tag_boot_list=p.load("boot_count_cut.dat")
-    resized_tag_boot_list=resized_tag_boot_list.astype("int")
-                                 
-    # time_and_boot_edge_list= \
-          # associate_boot_to_tag_improved(resized_tag_boot_list,time_edge_list_reshaped)
 
-    time_and_boot_edge_list= \
-          associate_boot_to_tag_improved2(resized_tag_boot_list,time_edge_list_reshaped)
+# time_edge_list=time_edge_list.astype("int")
+time_edge_list_reshaped=duplicate_and_mix_array(time_edge_list)
+time_edge_list_reshaped=time_edge_list_reshaped.astype("int")
+p.save("edge_list_reshaped.dat",time_edge_list_reshaped,  fmt='%d')
+
+# resized_tag_boot_list=p.load("boot_count_cut.dat")
+# resized_tag_boot_list=resized_tag_boot_list.astype("int")
+
+# time_and_boot_edge_list= \
+      # associate_boot_to_tag_improved(resized_tag_boot_list,time_edge_list_reshaped)
+
+time_and_boot_edge_list= \
+      associate_boot_to_tag_improved2(bootcount_cut,time_edge_list_reshaped)
 
 
 

diff -r 057c46d6ae8a -r 8d54d703377c Python-codes/test_filters.py
--- a/Python-codes/test_filters.py	Thu Sep 10 13:48:41 2009 +0000
+++ b/Python-codes/test_filters.py	Thu Sep 10 15:30:46 2009 +0000
@@ -2,7 +2,7 @@
 import scipy as s
 import pylab as p
 import numpy as n
-import sys
+