Zhong model running

... but it needs some fine-tunning

Author: khvilaboa

epidemic_zhong_et_al/sirs_zhong.ma

@@ -17,8 +17,8 @@ initialvalue : -1
 
 localtransition : sirs-zhong-rule
 
-statevariables: population area p contact_rate cured_rate t_i t_p t_l t_r i_sus_0 i_inc_1 i_inc_2 i_inf_3 i_inf_4 i_lat_5 i_lat_6 i_rec_7 i_rec8 i_rec9
-statevalues: 100 1 1000 0.5 0.02 2 2 2 3 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+statevariables: population area p connection contact_rate cured_rate t_i t_p t_l t_r i_sus_0 i_inc_1 i_inc_2 i_inf_3 i_inf_4 i_lat_5 i_lat_6 i_rec_7 i_rec_8 i_rec_9
+statevalues: 100 1 100 1 1 0.00 2 2 2 3 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
 initialvariablesvalue: sirs_zhong.var
 
 neighborports : initial sus_0 inc_1 inc_2 inf_3 inf_4 lat_5 lat_6 rec_7 rec_8 rec_9 pop
@@ -42,7 +42,7 @@ $i_inf_3 := trunc(min((1 - $cured_rate) * $i_inc_2, 1)*100)/100;
 $i_inc_2 := trunc(min((1 - $cured_rate) * $i_inc_1, 1)*100)/100;
 $i_inc_1 := #macro(internal_infected) + #macro(external_infected);
 
-$i_sus_0 := 1 - $i_inc_1 - $i_inc_2 - $i_inf_3 - $i_inf_4 - $i_lat_5 - $i_lat_6 - $i_rec_7 - $i_rec8 - $i_rec9;
+$i_sus_0 := 1 - $i_inc_1 - $i_inc_2 - $i_inf_3 - $i_inf_4 - $i_lat_5 - $i_lat_6 - $i_rec_7 - $i_rec_8 - $i_rec_9;
 
 }
 1 { (0,0)~initial != -1 }

epidemic_zhong_et_al/sirs_zhong.var

@@ -1 +1 @@
-(25,25) = 100 1 1000 0.5 0.02 2 2 2 3 0.7 0.3 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+(25,25) = 100 1 100 1 1 0.00 2 2 2 3 0.7 0.3 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0

epidemic_zhong_et_al/sirs_zhong_macros.inc

@@ -8,39 +8,39 @@ trunc(min($cured_rate * $i_inc_1, 1)*100) ) / 100 )
 #EndMacro
 
 #BeginMacro(internal_infected) 
-( truncate(min(( $contact_rate * 
-((%i_sus_0 * $population) / $area) *
-%i_sus_0 * 
-($i_lat_6 + $i_lat_5 + $i_inf_4 + $i_inf_3 + $i_incv_2 + $i_inc_1)
-) / $p, 1)*100) / 100 )
+( trunc(min(($contact_rate * 
+(($i_sus_0 * $population) / $area) *
+$i_sus_0 *
+($i_lat_6 + $i_lat_5 + $i_inf_4 + $i_inf_3 + $i_inc_2 + $i_inc_1)
+) / $p, 1) * 100) / 100 )
 #EndMacro
 
 #BeginMacro(external_infected) 
-( truncate(min(( $connection *
+( trunc(min(( $connection *
 $contact_rate * 
-((%i_sus_0 * $population) / $area) *
-%i_sus_0 * 
+(($i_sus_0 * $population) / $area) *
+$i_sus_0 * 
 ((1,0)~lat_6 + (1,0)~lat_5 + (1,0)~inf_4 + (1,0)~inf_3 + (1,0)~inc_2 + (1,0)~inc_1)
 ) / $p, 1)*100) / 100 )
 +
-( truncate(min(( $connection *
+( trunc(min(( $connection *
 $contact_rate * 
-((%i_sus_0 * $population) / $area) *
-%i_sus_0 * 
+(($i_sus_0 * $population) / $area) *
+$i_sus_0 * 
 ((0,-1)~lat_6 + (0,-1)~lat_5 + (0,-1)~inf_4 + (0,-1)~inf_3 + (0,-1)~inc_2 + (0,-1)~inc_1)
 ) / $p, 1)*100) / 100 )
 +
-( truncate(min(( $connection *
+( trunc(min(( $connection *
 $contact_rate * 
-((%i_sus_0 * $population) / $area) *
-%i_sus_0 * 
+(($i_sus_0 * $population) / $area) *
+$i_sus_0 * 
 ((0,1)~lat_6 + (0,1)~lat_5 + (0,1)~inf_4 + (0,1)~inf_3 + (0,1)~inc_2 + (0,1)~inc_1)
 ) / $p, 1)*100) / 100 )
 +
-( truncate(min(( $connection *
+( trunc(min(( $connection *
 $contact_rate * 
-((%i_sus_0 * $population) / $area) *
-%i_sus_0 * 
+(($i_sus_0 * $population) / $area) *
+$i_sus_0 * 
 ((-1,0)~lat_6 + (-1,0)~lat_5 + (-1,0)~inf_4 + (-1,0)~inf_3 + (-1,0)~inc_2 + (-1,0)~inc_1)
 ) / $p, 1)*100) / 100 )
 #EndMacro