Added Moore and von Neumann neighborhoods

Author: romancardenas

epidemic_roman/sir_roman.inc

@@ -3,7 +3,23 @@
 #EndMacro
 
 
-#BeginMacro(i_effect)
+#BeginMacro(i_effect_moore)
+min
+(
+  (0,0)~sus,
+  (0,0)~sus * $virulence *
+  (
+    (0,0)~infec + $connection * $movement / (0,0)~pop *
+    (
+      (-1,-1)~pop * (-1,-1)~infec + (-1,0)~pop * (-1,0)~infec + (-1,1)~pop * (-1,1)~infec +
+      (0,-1)~pop * (0,-1)~infec + (0,1)~pop * (0,1)~infec +
+      (1,-1)~pop * (1,-1)~infec + (1,0)~pop * (1,0)~infec + (1,1)~pop * (1,1)~infec
+    )
+  )
+)
+#EndMacro
+
+#BeginMacro(i_effect_von_neumann)
 min
 (
   (0,0)~sus,

epidemic_roman/sir_roman.pal

@@ -1,7 +1,7 @@
 [-100; -0.001] 255 0 0
-[0; 0.200] 0 0 0
-[0.201; 0.400] 50 50 50
+[0; 0.200] 200 200 200
+[0.201; 0.400] 150 150 150
 [0.401; 0.600] 100 100 100
-[0.601; 0.800] 150 150 150
-[0.801; 1.00] 200 200 200
-[1.001;100] 255 0 0
+[0.601; 0.800] 50 50 50
+[0.801; 1.00] 0 0 0
+[1.001;100] 255 0 0

epidemic_roman/sir_roman.var

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

epidemic_roman/sir_roman_moore.ma

@@ -0,0 +1,35 @@
+#include(sir_roman.inc)
+[top]
+components : area
+
+[area]
+type : cell
+width : 50
+height : 50
+delay : transport
+defaultDelayTime : 1
+border : wrapped
+neighbors : area(-1,-1) area(-1,0) area(-1,1)
+neighbors : area(0,-1)  area(0,0)  area(0,1)
+neighbors : area(1,-1)  area(1,0)  area(1,1)
+initialvalue : -1
+
+
+localtransition : sir-roman-rule
+
+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_roman.var
+
+neighborports : initial infec rec pop sus
+
+[sir-roman-rule]
+rule : {~initial := 0; ~pop := $population; ~infec := $i_infec; ~sus := $i_sus; ~rec := $i_rec; }
+ 1 {(0,0)~initial = -1}
+
+rule : {~pop := $population; ~infec := $i_infec; ~sus := $i_sus; ~rec := $i_rec; }
+{
+$i_rec := round(((0,0)~rec + #macro(recovery) * (0,0)~infec)*100)/100;
+$i_infec:= round(((1 - #macro(recovery)) * (0,0)~infec + #macro(i_effect_moore))*100)/100;
+$i_sus := 1 - $i_rec - $i_infec;}
+1 { (0,0)~initial != -1 }

epidemic_roman/sir_roman.ma renamed to epidemic_roman/sir_roman_von_neumann.ma

@@ -9,9 +9,9 @@ height : 50
 delay : transport
 defaultDelayTime : 1
 border : wrapped
-neighbors : 			area(-1,0)
+neighbors :             area(-1,0)
 neighbors : area(0,-1)  area(0,0)  area(0,1)
-neighbors : 			area(1,0)
+neighbors :             area(1,0)
 initialvalue : -1
 
 
@@ -29,7 +29,7 @@ rule : {~initial := 0; ~pop := $population; ~infec := $i_infec; ~sus := $i_sus;
 
 rule : {~pop := $population; ~infec := $i_infec; ~sus := $i_sus; ~rec := $i_rec; }
 {
-$i_sus := round(((0,0)~sus - #macro(i_effect))*100)/100;
-$i_infec:= round(((1 - #macro(recovery)) * (0,0)~infec + (0,0)~sus - $i_sus)*100)/100;
-$i_rec := 1 - $i_sus - $i_infec;}
+$i_rec := round(((0,0)~rec + #macro(recovery) * (0,0)~infec)*100)/100;
+$i_infec:= round(((1 - #macro(recovery)) * (0,0)~infec + #macro(i_effect_von_neumann))*100)/100;
+$i_sus := 1 - $i_rec - $i_infec;}
 1 { (0,0)~initial != -1 }