Mybranch

Command.py

@@ -0,0 +1,28 @@
+from abc import abstractmethod
+import simulation
+import utils
+import visualiser
+class command():
+    @abstractmethod
+    def __init__(self,name):
+        self.name=name
+
+    @abstractmethod
+    def excute(self):
+        pass
+
+
+class simulateCommand(command):
+    def excute(self):
+        simulation.run()
+
+class savefileCutCommand(command):
+    def excute(self,folder):
+        utils.check_folder(folder)
+
+
+
+class pltCommand(command):
+    def excute(self):
+        visualiser.plot_sir()
+

Iterator.py

@@ -0,0 +1,22 @@
+from abc import abstractmethod
+
+
+class iterator():
+    @abstractmethod
+    def getNext(self):
+        pass
+
+    @abstractmethod
+    def hasMore(self):
+        pass
+
+class populationIterator(iterator):
+    def __init__(self,tracker):
+        self.tracker=tracker
+        self.currentposition=0
+    def getNext(self):
+        if(self.hasMore()):
+            self.currentposition+=1
+            return self.tracker[self.currentposition]
+    def hasMore(self):
+        return self.currentposition < len(self.tracker)

demo_COVID.py

@@ -1,6 +1,6 @@
 import os
 import sys
-
+import command
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.animation import FuncAnimation
@@ -433,6 +433,6 @@ def update(frame, population, destinations, pop_size, infection_range=0.01,
              treatment_factor, healthcare_capacity, age_dependent_risk, 
              treatment_dependent_risk, visualise, verbose,)
 
-
+    command.excute(plt)
     animation = FuncAnimation(fig, update, fargs = fargs, frames = simulation_steps, interval = 33)
     plt.show()

population.py

@@ -10,7 +10,7 @@
 
 from motion import get_motion_parameters
 from utils import check_folder
-
+import iterator
 def initialize_population(Config, mean_age=45, max_age=105,
                           xbounds=[0, 1], ybounds=[0, 1]):
     '''initialized the population for the simulation