Zhong_v2 reference model updated

Author: khvilaboa

epidemic_zhong_et_al_v2/sirs_zhong.ma

@@ -16,20 +16,29 @@ initialvalue : -1
 
 localtransition : sirs-zhong-rule
 
-statevariables: population connection movement cured_rate t_i t_r i_sus_0 i_inf_1 i_inf_2 i_inf_3 i_inf_4 i_inf_5 i_inf_6 i_rec_7 i_rec_8 i_rec_9 i_rec_10 i_rec_11 i_rec_12 i_rec_13 v_1 v_2 v_3 v_4 v_5 v_6
-statevalues: 100 1 0.1 0.0 6 7 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.6 0.6 0.6 0.6 0.6 0.6
+statevariables: population connection movement t_i t_r i_sus_0 i_inf_1 i_inf_2 i_inf_3 i_inf_4 i_inf_5 i_inf_6 i_rec_7 i_rec_8 i_rec_9 i_rec_10 i_rec_11 i_rec_12 i_rec_13 i_rec_14 i_rec_15 i_rec_16 i_rec_17 i_rec_18 i_rec_19 i_rec_20 i_rec_21 i_rec_22 v_1 v_2 v_3 v_4 v_5 v_6 cr_1 cr_2 cr_3 cr_4 cr_5
+statevalues: 100 1 0.6 6 16 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.15 0.15 0.15 0.15 0.15 0.15 0.07 0.07 0.07 0.07 0.07
 initialvariablesvalue: sirs_zhong.var
 
-neighborports : initial pop sus_0 inf_1 inf_2 inf_3 inf_4 inf_5 inf_6 rec_7 rec_8 rec_9 rec_10 rec_11 rec_12 rec_13
+neighborports : initial pop sus_0 inf_1 inf_2 inf_3 inf_4 inf_5 inf_6 rec_7 rec_8 rec_9 rec_10 rec_11 rec_12 rec_13 rec_14 rec_15 rec_16 rec_17 rec_18 rec_19 rec_20 rec_21 rec_22
 
 [sirs-zhong-rule]
-rule : {~initial := 0; ~pop := $population; ~sus_0 := $i_sus_0; ~inf_1 := $i_inf_1; ~inf_2 := $i_inf_2; ~inf_3 := $i_inf_3; ~inf_4 := $i_inf_4; ~inf_5 := $i_inf_5; ~inf_6 := $i_inf_6; ~rec_7 := $i_rec_7; ~rec_8 := $i_rec_8; ~rec_9 := $i_rec_9; ~rec_10 := $i_rec_10; ~rec_11 := $i_rec_11; ~rec_12 := $i_rec_12; ~rec_13 := $i_rec_13;}
+rule : {~initial := 0; ~pop := $population; ~sus_0 := $i_sus_0; ~inf_1 := $i_inf_1; ~inf_2 := $i_inf_2; ~inf_3 := $i_inf_3; ~inf_4 := $i_inf_4; ~inf_5 := $i_inf_5; ~inf_6 := $i_inf_6; ~rec_7 := $i_rec_7; ~rec_8 := $i_rec_8; ~rec_9 := $i_rec_9; ~rec_10 := $i_rec_10; ~rec_11 := $i_rec_11; ~rec_12 := $i_rec_12; ~rec_13 := $i_rec_13; ~rec_14 := $i_rec_14; ~rec_15 := $i_rec_15; ~rec_16 := $i_rec_16; ~rec_17 := $i_rec_17; ~rec_18 := $i_rec_18; ~rec_19 := $i_rec_19; ~rec_20 := $i_rec_20; ~rec_21 := $i_rec_21; ~rec_22 := $i_rec_22;}
  1 {(0,0)~initial = -1}
 
 rule : {
-~pop := $population; ~sus_0 := $i_sus_0; ~inf_1 := $i_inf_1; ~inf_2 := $i_inf_2; ~inf_3 := $i_inf_3; ~inf_4 := $i_inf_4; ~inf_5 := $i_inf_5; ~inf_6 := $i_inf_6; ~rec_7 := $i_rec_7; ~rec_8 := $i_rec_8; ~rec_9 := $i_rec_9; ~rec_10 := $i_rec_10; ~rec_11 := $i_rec_11; ~rec_12 := $i_rec_12; ~rec_13 := $i_rec_13;
+~pop := $population; ~sus_0 := $i_sus_0; ~inf_1 := $i_inf_1; ~inf_2 := $i_inf_2; ~inf_3 := $i_inf_3; ~inf_4 := $i_inf_4; ~inf_5 := $i_inf_5; ~inf_6 := $i_inf_6; ~rec_7 := $i_rec_7; ~rec_8 := $i_rec_8; ~rec_9 := $i_rec_9; ~rec_10 := $i_rec_10; ~rec_11 := $i_rec_11; ~rec_12 := $i_rec_12; ~rec_13 := $i_rec_13; ~rec_14 := $i_rec_14; ~rec_15 := $i_rec_15; ~rec_16 := $i_rec_16; ~rec_17 := $i_rec_17; ~rec_18 := $i_rec_18; ~rec_19 := $i_rec_19; ~rec_20 := $i_rec_20; ~rec_21 := $i_rec_21; ~rec_22 := $i_rec_22;
 }
 {
+$i_rec_22 := $i_rec_21;
+$i_rec_21 := $i_rec_20;
+$i_rec_20 := $i_rec_19;
+$i_rec_19 := $i_rec_18;
+$i_rec_18 := $i_rec_17;
+$i_rec_17 := $i_rec_16;
+$i_rec_16 := $i_rec_15;
+$i_rec_15 := $i_rec_14;
+$i_rec_14 := $i_rec_13;
 $i_rec_13 := $i_rec_12;
 $i_rec_12 := $i_rec_11;
 $i_rec_11 := $i_rec_10;
@@ -38,14 +47,14 @@ $i_rec_9 := $i_rec_8;
 $i_rec_8 := $i_rec_7;
 $i_rec_7 := $i_inf_6 + #macro(local_cured);
 
-$i_inf_6 := round(min((1 - $cured_rate) * $i_inf_5, 1)*100)/100;
-$i_inf_5 := round(min((1 - $cured_rate) * $i_inf_4, 1)*100)/100;
-$i_inf_4 := round(min((1 - $cured_rate) * $i_inf_3, 1)*100)/100;
-$i_inf_3 := round(min((1 - $cured_rate) * $i_inf_2, 1)*100)/100;
-$i_inf_2 := round(min((1 - $cured_rate) * $i_inf_1, 1)*100)/100;
+$i_inf_6 := round(min((1 - $cr_5) * $i_inf_5, 1)*100)/100;
+$i_inf_5 := round(min((1 - $cr_4) * $i_inf_4, 1)*100)/100;
+$i_inf_4 := round(min((1 - $cr_3) * $i_inf_3, 1)*100)/100;
+$i_inf_3 := round(min((1 - $cr_2) * $i_inf_2, 1)*100)/100;
+$i_inf_2 := round(min((1 - $cr_1) * $i_inf_1, 1)*100)/100;
 $i_inf_1 := #macro(internal_infected) + #macro(external_infected);
 
-$i_sus_0 := 1 - $i_inf_1 - $i_inf_2 - $i_inf_3 - $i_inf_4 - $i_inf_5 - $i_inf_6 - $i_rec_7 - $i_rec_8 - $i_rec_9 - $i_rec_10 - $i_rec_11 - $i_rec_12 - $i_rec_13;
+$i_sus_0 := 1 - $i_inf_1 - $i_inf_2 - $i_inf_3 - $i_inf_4 - $i_inf_5 - $i_inf_6 - $i_rec_7 - $i_rec_8 - $i_rec_9 - $i_rec_10 - $i_rec_11 - $i_rec_12 - $i_rec_13 - $i_rec_14 - $i_rec_15 - $i_rec_16 - $i_rec_17 - $i_rec_18 - $i_rec_19 - $i_rec_20 - $i_rec_21 - $i_rec_22;
 
 }
 1 { (0,0)~initial != -1 }

epidemic_zhong_et_al_v2/sirs_zhong.var

@@ -1 +1 @@
-(25,25) = 100 1 0.1 0.0 6 7 0.7 0.3 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.6 0.6 0.6 0.6 0.6 0.6
+(25,25) = 100 1 0.6 6 16 0.7 0.3 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.15 0.15 0.15 0.15 0.15 0.15 0.07 0.07 0.07 0.07 0.07

epidemic_zhong_et_al_v2/sirs_zhong_macros.inc

@@ -1,10 +1,10 @@
 
 #BeginMacro(local_cured) 
-(( round(min($cured_rate * $i_inf_5, 1)*100) +
-round(min($cured_rate * $i_inf_4, 1)*100) +
-round(min($cured_rate * $i_inf_3, 1)*100) +
-round(min($cured_rate * $i_inf_2, 1)*100) +
-round(min($cured_rate * $i_inf_1, 1)*100) ) / 100 )
+(( round(min($cr_5 * $i_inf_5, 1)*100) +
+round(min($cr_4 * $i_inf_4, 1)*100) +
+round(min($cr_3 * $i_inf_3, 1)*100) +
+round(min($cr_2 * $i_inf_2, 1)*100) +
+round(min($cr_1 * $i_inf_1, 1)*100) ) / 100 )
 #EndMacro
 
 #BeginMacro(internal_infected)