renaming variables

Author: cruizm

epidemic_hoya_et_al/SIR_Hoya.ma

@@ -17,8 +17,8 @@ initialvalue : -1
 
 localtransition : sir-hoya-rule
 
-statevariables: population v c m i_infec i_rec i_sus
-statevalues: 100 0.6 1.0 0.5 0.0 0.0 1.0
+statevariables: population virulence connection movement i_sus i_infec i_rec 
+statevalues: 100 0.6 1.0 0.5 1.0 0.0 0.0
 initialvariablesvalue: SIR_Hoya.var
 
 neighborports : initial infec rec pop sus
@@ -28,7 +28,7 @@ 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 + $v*(0,0)~sus*(0,0)~infec + (0,0)~sus*#macro(effect_neighbours),1)*100)/100;
+{$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_sus := 1 - $i_rec - $i_infec;} 
 1 { (0,0)~initial != -1 }

epidemic_hoya_et_al/SIR_Hoya.var

@@ -1 +1 @@
-(25,25) = 10 0.6 1 1 0.7 0.0 0.3
+(25,25) = 10 0.6 1 1 0.3 0.7 0.0

epidemic_hoya_et_al/SIR_Hoya_macros.inc

@@ -4,9 +4,9 @@
 
 
 #BeginMacro(effect_neighbours) 
-( ((1,0)~pop / $population) * (1,0)~infec * $v * $c * $m  + 
-((0,-1)~pop / $population) * (0,-1)~infec * $v * $c * $m + 
-((0,1)~pop / $population) * (0,1)~infec * $v * $c * $m +
-((-1,0)~pop / $population) * (-1,0)~infec * $v * $c * $m )
+( ((1,0)~pop / $population) * (1,0)~infec * $virulence * $connection * $movement  + 
+((0,-1)~pop / $population) * (0,-1)~infec * $virulence * $connection * $movement + 
+((0,1)~pop / $population) * (0,1)~infec * $virulence * $connection * $movement +
+((-1,0)~pop / $population) * (-1,0)~infec * $virulence * $connection * $movement )
 #EndMacro