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

Commit MetaInfo

• Revisão: d93d2d4c5a8dc3b9544bbf0cbaf4ebdf93db0457 (tree)
• Hora: 2010-01-12 08:02:47
• Autor: lorenzo
• Commiter: lorenzo

Mensagem de Log

Some minor modifications, mainly taking into account the need to use
weights=NA in the diameter calculation.

Mudança Sumário

• modified: Python-codes/iterate_addendum_infectitious_power2.py
• modified: R-codes/analyze_infected_networks.R

Diff

diff -r d12496656c39 -r d93d2d4c5a8d Python-codes/iterate_addendum_infectitious_power2.py
--- a/Python-codes/iterate_addendum_infectitious_power2.py	Mon Jan 11 14:22:35 2010 +0000
+++ b/Python-codes/iterate_addendum_infectitious_power2.py	Mon Jan 11 23:02:47 2010 +0000
@@ -138,13 +138,22 @@
         
     return [visit_arr,visit_flux,visit_arr_extended, my_black_overall] 
 
-
+#here boot_time is simply the dummy argument of a function, but I deal
+#only with contact protocols
 
 def generate_iteration_grid(boot_time_non_unique,\
-                            number_intervals,interval_duration,ini_gap):
+                            number_intervals,interval_duration,t_ini,t_end):
     time_unique=s.unique1d(boot_time_non_unique)
 
-    time_ini=time_unique[0]+ini_gap
+    # time_ini=time_unique[0]+ini_gap
+
+    
+    if (t_ini>0):
+        time_ini=t_ini
+    else:
+        time_ini=time_unique[0]
+
+    
     print "time_ini is, ", time_ini
 
     if (number_intervals<=0 and  interval_duration<=0):
@@ -155,10 +164,18 @@
         print "Error in calling the function"
         #break
     if (number_intervals>0 and interval_duration<=0):
-        time_grid=s.linspace(time_ini,time_unique[-1],number_intervals)
+        if (t_end<=0):
+            time_grid=s.linspace(time_ini,time_unique[-1],number_intervals)
+        elif (t_end>0):
+            time_grid=s.linspace(time_ini,t_end,number_intervals)
+            
 
     if (number_intervals<=0 and interval_duration>0):
-        time_grid=s.arange(time_ini,time_unique[-1],interval_duration)
+        if (t_end<=0):
+            time_grid=s.arange(time_ini,time_unique[-1],interval_duration)
+        if (t_end>0):
+            time_grid=s.arange(time_ini,t_end,interval_duration)
+        
 
     return (time_grid.astype("int64"))
 
@@ -201,13 +218,13 @@
 
 boot_time_non_unique=data_arr[:,0]
 
-ini_gap=1240876800-1240092599   # 86400 #i.e. one day in seconds
-
+t_ini=1246233600   
+t_end=t_ini+86400*3+1
 number_intervals=-12
 interval_duration= 86400 #i.e. 1 day #604800 #i.e. one week in seconds
 
 time_grid=generate_iteration_grid(boot_time_non_unique,\
-                            (number_intervals+1),interval_duration,ini_gap)
+                            (number_intervals+1),interval_duration,t_ini,t_end)
 
 print "len(time_grid) is, ", len(time_grid)
 print "time_grid[0] and time_grid[-1] are, ",  time_grid[0], time_grid[-1]

diff -r d12496656c39 -r d93d2d4c5a8d R-codes/analyze_infected_networks.R
--- a/R-codes/analyze_infected_networks.R	Mon Jan 11 14:22:35 2010 +0000
+++ b/R-codes/analyze_infected_networks.R	Mon Jan 11 23:02:47 2010 +0000
@@ -43,7 +43,7 @@
 
 number_networks <- length(visitor_list)
 
-time_period <- 31 #selected time_period I want to look at
+time_period <- 2 #selected time_period I want to look at
 
 infected_diam <- seq(length(time_period))
 infected_mean_degree<- seq(length(time_period))
@@ -71,7 +71,7 @@
 
 g_infected <- simplify(g_infected)
 
-infected_diam[i+1] <- length(get.diameter(g_infected))-1
+infected_diam[i+1] <- length(get.diameter(g_infected,weights=NA))-1
 infected_mean_degree[i+1] <- mean(degree(g_infected))
 
 
@@ -83,7 +83,7 @@
 
 g_after_infection <- simplify(g_after_infection)
 
-diam_after_infection[i+1] <- length(get.diameter(g_after_infection))-1
+diam_after_infection[i+1] <- length(get.diameter(g_after_infection,weights=NA))-1
 
 mean_degree_after_infection[i+1] <- mean(degree(g_after_infection))