Bugfix: changed trunc() to round()

Author: khvilaboa

epidemic_hoya_et_al/SIR_Hoya.ma

@@ -28,8 +28,8 @@ rule : {~initial := 0; ~pop := $population; ~infec := $i_infec; ~sus := $i_sus;
  1 {(0,0)~initial = -1}
 
 rule : {~pop := $population; ~infec := $i_infec; ~sus := $i_sus; ~rec := $i_rec; }
-{$i_infec:= trunc(min((1 - #macro(e)) * (0,0)~infec + $virulence*(0,0)~sus*(0,0)~infec + (0,0)~sus*#macro(effect_neighbours),1)*100)/100;
-$i_rec := trunc(min((0,0)~rec + #macro(e)*(0,0)~infec,1)*100)/100;
+{$i_infec:= round(min((1 - #macro(e)) * (0,0)~infec + $virulence*(0,0)~sus*(0,0)~infec + (0,0)~sus*#macro(effect_neighbours),1)*100)/100;
+$i_rec := round(min((0,0)~rec + #macro(e)*(0,0)~infec,1)*100)/100;
 $i_sus := 1 - $i_rec - $i_infec;} 
 1 { (0,0)~initial != -1 }
 

epidemic_zhong_et_al/generator/model_generator.py

@@ -55,7 +55,7 @@
 update_rules += "$i_%s := $i_%s + #macro(local_cured);\n\n" % (states[idx_first_rec], states[idx_first_rec-1])
 
 for i in range(idx_first_rec-1, 1, -1):
-    update_rules += "$i_%s := trunc(min((1 - $cured_rate) * $i_%s, 1)*100)/100;\n" % (states[i], states[i - 1])
+    update_rules += "$i_%s := round(min((1 - $cured_rate) * $i_%s, 1)*100)/100;\n" % (states[i], states[i - 1])
 update_rules += "$i_%s := #macro(internal_infected) + #macro(external_infected);\n\n" % states[1]
 
 update_rules += "$i_%s := 1 " % states[0]
@@ -77,13 +77,13 @@
 
 local_cured_rules = []
 for i in range(idx_first_rec-2, 0, -1):
-    local_cured_rules.append("trunc(min($cured_rate * $i_%s, 1)*100)" % states[i])
+    local_cured_rules.append("round(min($cured_rate * $i_%s, 1)*100)" % states[i])
 
 content = content.replace("[[local_cured]]", "(( %s ) / 100 )" % " +\n".join(local_cured_rules))
 content = content.replace("[[infected_vars]]", " + ".join(["i_%s" % s for s in states[idx_first_rec:0]]))
 
 external_infected_comp = \
-"""( trunc(min(( $connection *
+"""( round(min(( $connection *
 $contact_rate * 
 (($i_sus_0 * $population) / $area) *
 $i_sus_0 * 

epidemic_zhong_et_al/generator/template_sirs_zhong_ma

@@ -17,7 +17,7 @@ initialvalue : -1
 localtransition : sirs-zhong-rule
 
 statevariables: population area p connection contact_rate cured_rate t_i t_p t_l t_r [[internal_vars]]
-statevalues: 100 1 500 1 1 0.00 2 2 2 3 [[internal_vars_values]]
+statevalues: 100 1 100 1 0.2 0.0 2 2 2 3 [[internal_vars_values]]
 initialvariablesvalue: sirs_zhong.var
 
 neighborports : initial pop [[ports]]

epidemic_zhong_et_al/generator/template_sirs_zhong_macros

@@ -4,7 +4,7 @@
 #EndMacro
 
 #BeginMacro(internal_infected) 
-( trunc(min(($contact_rate * 
+( round(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)

epidemic_zhong_et_al/sirs_zhong.ma

@@ -35,11 +35,11 @@ $i_rec_9 := $i_rec_8;
 $i_rec_8 := $i_rec_7;
 $i_rec_7 := $i_lat_6 + #macro(local_cured);
 
-$i_lat_6 := trunc(min((1 - $cured_rate) * $i_lat_5, 1)*100)/100;
-$i_lat_5 := trunc(min((1 - $cured_rate) * $i_inf_4, 1)*100)/100;
-$i_inf_4 := trunc(min((1 - $cured_rate) * $i_inf_3, 1)*100)/100;
-$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_lat_6 := round(min((1 - $cured_rate) * $i_lat_5, 1)*100)/100;
+$i_lat_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_inc_2, 1)*100)/100;
+$i_inc_2 := round(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_rec_8 - $i_rec_9;

epidemic_zhong_et_al/sirs_zhong_macros.inc

@@ -1,43 +1,43 @@
 
 #BeginMacro(local_cured) 
-(( trunc(min($cured_rate * $i_lat_5, 1)*100) + 
-trunc(min($cured_rate * $i_inf_4, 1)*100) + 
-trunc(min($cured_rate * $i_inf_3, 1)*100) + 
-trunc(min($cured_rate * $i_inc_2, 1)*100) + 
-trunc(min($cured_rate * $i_inc_1, 1)*100) ) / 100 )
+(( round(min($cured_rate * $i_lat_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_inc_2, 1)*100) + 
+round(min($cured_rate * $i_inc_1, 1)*100) ) / 100 )
 #EndMacro
 
 #BeginMacro(internal_infected) 
-( trunc(min(($contact_rate * 
+( round(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) 
-( trunc(min(( $connection *
+( round(min(( $connection *
 $contact_rate * 
 (($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 )
 +
-( trunc(min(( $connection *
+( round(min(( $connection *
 $contact_rate * 
 (($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 )
 +
-( trunc(min(( $connection *
+( round(min(( $connection *
 $contact_rate * 
 (($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 )
 +
-( trunc(min(( $connection *
+( round(min(( $connection *
 $contact_rate * 
 (($i_sus_0 * $population) / $area) *
 $i_sus_0 *