added vehicle capacity

nicholscrawford · Jan 30, 2022 · 6464e05 · 6464e05
1 parent aac62cc
commit 6464e05
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/cityFireFig.py b/cityFireFig.py
@@ -2,8 +2,8 @@
 import matplotlib.pyplot as plt
 
 grid = np.zeros((100,200))
-grid[49,57] = 0.9
-grid[46:54,125:142] = 0.1
+grid[49,57] = 0.8
+grid[46:54,125:142] = 0.2
 
 
 plt.imshow(grid,cmap=plt.get_cmap('gnuplot2'))
diff --git a/evacsim.py b/evacsim.py
@@ -1,7 +1,6 @@
 timestep = 5
 
 class path:
-    capacityperkm = 1000
 
     #len is in km, speedlim is in km/hr, out is an object that can accept people (has acceptperson() method, yay for python ambiguity)
     def __init__(self, len, speedlim, out):
@@ -12,7 +11,8 @@ def __init__(self, len, speedlim, out):
         self._peoplearr = [0] * round(timestepsonroad+ 0.5)
 
         self._out = out
-        self._capacityperelement = int(path.capacityperkm * (len / self._peoplearr.__len__()) )
+        capacityperkm = (speedlim*(3.0/3600.0)+4.5e-3)**-1
+        self._capacityperelement = int(capacityperkm * (len / self._peoplearr.__len__()) )
 
     def timestep(self):
         i = len(self._peoplearr) - 1

diff --git a/figures/setupMatrix.png b/figures/setupMatrix.png
diff --git a/topModel.py b/topModel.py
@@ -69,4 +69,3 @@
         evaccomplete += not neighborhoods[n].isempty()
     for p in paths:
         evaccomplete += not paths[p].isempty()
->>>>>>> a21cf560d4138428872e8becea63fc2ba23c431e