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

Commit MetaInfo

• Revision: fd2a10f8a811605534377b659656b1720f554f4e (tree)
• Zeit: 2009-12-03 23:42:27
• Autor: lorenzo
• Commiter: lorenzo

Log Message

I updated the way in which I save files (p.save gets replaced by n.savetxt).

Ändern Zusammenfassung

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

Diff

diff -r 99975a3dc395 -r fd2a10f8a811 Python-codes/assign_new_bootcount.py
--- a/Python-codes/assign_new_bootcount.py	Thu Dec 03 10:41:43 2009 +0000
+++ b/Python-codes/assign_new_bootcount.py	Thu Dec 03 14:42:27 2009 +0000
@@ -41,7 +41,7 @@
 
     boot_count_cut[:,2]=boot_new_out
 
-    p.save("boot_new_out.dat", boot_count_cut, fmt="%d")
+    n.savetxt("boot_new_out.dat", boot_count_cut, fmt="%d")
 
     return
         
@@ -188,7 +188,7 @@
 
 boot_count_cut=cut_raw_data(raw_data)
 
-p.save("new_boot_count_cut.dat", boot_count_cut, fmt="%d")
+n.savetxt("new_boot_count_cut.dat", boot_count_cut, fmt="%d")
 
 
 

diff -r 99975a3dc395 -r fd2a10f8a811 Python-codes/disambiguate_visitors.py
--- a/Python-codes/disambiguate_visitors.py	Thu Dec 03 10:41:43 2009 +0000
+++ b/Python-codes/disambiguate_visitors.py	Thu Dec 03 14:42:27 2009 +0000
@@ -41,7 +41,7 @@
     #at which contacts are estabilished. It is important to get rid
     #of repeated times, otherwise the final array would be
     #both redundant and huge
-    p.save("time_unique.dat",time_unique, fmt='%d')
+    n.savetxt("time_unique.dat",time_unique, fmt='%d')
     time_boot=bootcount_data[:,0]
 
     # s.where(s.setmember1d(A,B))
@@ -55,7 +55,7 @@
     #is obviously not the case.
     my_sel=ismember(time_boot, time_unique)
     time_boot_sel=time_boot[my_sel]
-    p.save("time_boot_sel.dat",time_boot_sel, fmt='%d')
+    n.savetxt("time_boot_sel.dat",time_boot_sel, fmt='%d')
     
     boot_cut=bootcount_data[my_sel,:]
     boot_out=boot_cut[:,0:3]
@@ -181,7 +181,7 @@
     time_edge_list_and_boot_binary[:,3]=time_edge_list_and_boot[sel_odd,1]
     time_edge_list_and_boot_binary[:,4]=time_edge_list_and_boot[sel_odd,2]
 
-    p.save("edge_list_and_boot_binary.dat",\
+    n.savetxt("edge_list_and_boot_binary.dat",\
            time_edge_list_and_boot_binary, fmt='%d')
 
     #Now I can create a new list where each couple (tag_id,bootcount) is
@@ -197,7 +197,7 @@
     time_edge_list_and_boot_hashed[:,2]=\
              couple_hash_table2(time_edge_list_and_boot_binary[:,3:5])
     print "hashing done again"    
-    p.save("edge_list_and_boot_hashed.dat",\
+    n.savetxt("edge_list_and_boot_hashed.dat",\
            time_edge_list_and_boot_hashed, fmt='%d')
         
         
@@ -329,7 +329,7 @@
     time_edge_list_and_boot_binary[:,3]=time_edge_list_and_boot[sel_odd,1]
     time_edge_list_and_boot_binary[:,4]=time_edge_list_and_boot[sel_odd,2]
 
-    p.save("edge_list_and_boot_binary.dat",\
+    n.savetxt("edge_list_and_boot_binary.dat",\
            time_edge_list_and_boot_binary, fmt='%d')
 
     #Now I can create a new list where each couple (tag_id,bootcount) is
@@ -345,7 +345,7 @@
     time_edge_list_and_boot_hashed[:,2]=\
              couple_hash_table2(time_edge_list_and_boot_binary[:,3:5])
     print "hashing done again"    
-    p.save("edge_list_and_boot_hashed.dat",\
+    n.savetxt("edge_list_and_boot_hashed.dat",\
            time_edge_list_and_boot_hashed, fmt='%d')
         
         
@@ -390,7 +390,7 @@
 # time_edge_list=time_edge_list.astype("uint64")
 time_edge_list_reshaped=duplicate_and_mix_array(time_edge_list)
 time_edge_list_reshaped=time_edge_list_reshaped.astype("int64")
-p.save("edge_list_reshaped.dat",time_edge_list_reshaped,  fmt='%d')
+n.savetxt("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")