refactoring

.gitignore

@@ -2,6 +2,8 @@
 !model_graphs/.gitkeep
 !batch_graphs/.gitkeep
 
+.vscode
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

fire_evacuation/model.py

@@ -80,21 +80,21 @@ def __init__(
         for (x, y), value in np.ndenumerate(floorplan):
             value = str(value)
             floor_object = None
-            if value is "W":
+            if value == "W":
                 floor_object = Wall((x, y), self)
-            elif value is "E":
+            elif value == "E":
                 floor_object = FireExit((x, y), self)
                 self.fire_exit_list.append((x, y))
                 self.door_list.append(
                     (x, y)
                 )  # Add fire exits to doors as well, since, well, they are
-            elif value is "F":
+            elif value == "F":
                 floor_object = Furniture((x, y), self)
                 self.furniture_list.append((x, y))
-            elif value is "D":
+            elif value == "D":
                 floor_object = Door((x, y), self)
                 self.door_list.append((x, y))
-            elif value is "S":
+            elif value == "S":
                 self.spawn_list.append((x, y))
 
             if floor_object:
@@ -317,9 +317,9 @@ def count_human_status(model, status):
         """
         count = 0
         for agent in model.schedule.agents:
-            if isinstance(agent, Human):
-                if agent.get_status() == status:
-                    count += 1
+            if isinstance(agent, Human) and agent.get_status() == status:
+                count += 1
+
         return count
 
     @staticmethod
@@ -329,7 +329,7 @@ def count_human_mobility(model, mobility):
         """
         count = 0
         for agent in model.schedule.agents:
-            if isinstance(agent, Human):
-                if agent.get_mobility() == mobility:
-                    count += 1
+            if isinstance(agent, Human) and agent.get_mobility() == mobility:
+                count += 1
+
         return count