Commit: 31c3e30fd22f0a0ad951b5ffe92b2b1c7c590050 - myprojects-hg-reborn (hg)

Commit MetaInfo

• Revision: 31c3e30fd22f0a0ad951b5ffe92b2b1c7c590050 (tree)
• Time: 2010-06-07 21:45:40
• Author: lorenzo
• Commiter: lorenzo

Log Message

Some improvements to the code: I can now remove self-interactions in
the time-dependent edge list.

Change Summary

• modified: Python-codes/P_tab_tac.py

Incremental Difference

diff -r 0ec81578f763 -r 31c3e30fd22f Python-codes/P_tab_tac.py
--- a/Python-codes/P_tab_tac.py	Fri Jun 04 11:02:27 2010 +0000
+++ b/Python-codes/P_tab_tac.py	Mon Jun 07 12:45:40 2010 +0000
@@ -23,6 +23,16 @@
     return new_info
 
 
+def remove_self_loops(clean_data):
+    sel=s.where(clean_data[:,1]!=clean_data[:,2])[0]
+
+    clean_data_no_int=clean_data[sel,:]
+
+    return (clean_data_no_int.astype("int64"))
+
+
+
+no_self=1
 
 #NB: this code should be used on an edgelist without self-interactions
 
@@ -30,6 +40,13 @@
 info = [map(int, string.split(line)) for line in f.readlines()]
 f.close()
 
+if (no_self==1):
+
+    info=s.array(info, dtype="int64")
+
+    info=remove_self_loops(info)
+
+    info=info.tolist()
 
 new = get_times(info)
 contacts = new.keys()
@@ -70,11 +87,21 @@
 
 all_times=s.asarray(all_times, dtype="int64")
 
-n.savetxt("t_ab_t_ac.dat",all_times, fmt='%d')
+if (no_self==1):
 
-sel=s.where(all_times>0)
+    n.savetxt("t_ab_t_ac_no_self.dat",all_times, fmt='%d')
 
-n.savetxt("t_ab_t_ac_no_zero.dat",all_times[sel], fmt='%d')
+    sel=s.where(all_times>0)
+
+    n.savetxt("t_ab_t_ac_no_self_no_zero.dat",all_times[sel], fmt='%d')
+
+else :
+
+    n.savetxt("t_ab_t_ac.dat",all_times, fmt='%d')
+
+    sel=s.where(all_times>0)
+
+    n.savetxt("t_ab_t_ac_no_zero.dat",all_times[sel], fmt='%d')
 
 
 print ("So far so good")