if stations share workpower, we have to calculate the utilization correctly. Dumps updated

dream/simulation/CapacityStationController.py

@@ -120,7 +120,7 @@ class CapacityStationController(EventGenerator):
             periodDict['period']=self.env.now
             # loop though the entities
             entitiesToCheck=list(buffer.getActiveObjectQueue())
-            capacityAvailable=station.remainingIntervalCapacity[0]
+            capacityAvailable=station.intervalCapacity[int(self.env.now)]
             capacityAllocated=0
             for entity in entitiesToCheck:
                 if not entity.shouldMove:   # when the first entity that should not move is reached break

dream/tests/dump/CapacityStationAssembly2.json.result

@@ -119,7 +119,7 @@
     "capacityUsed": [
      {
       "period": 0.0, 
-      "utilization": 0
+      "utilization": 0.0
      }, 
      {
       "period": 1.0, 
@@ -136,7 +136,7 @@
      {
       "P1": 70, 
       "period": 4.0, 
-      "utilization": 0.5384615384615384
+      "utilization": 0.35
      }
     ], 
     "detailedWorkPlan": [
@@ -147,7 +147,7 @@
       "time": 4.0
      }
     ], 
-    "meanUtilization": 0.10769230769230768
+    "meanUtilization": 0.06999999999999999
    }
   }, 
   {

dream/tests/dump/CapacityStationSharedResources1.json.result

@@ -26,16 +26,16 @@
      {
       "P1": 30.0, 
       "period": 0.0, 
-      "utilization": 1.0
+      "utilization": 0.375
      }, 
      {
       "period": 1.0, 
-      "utilization": 0
+      "utilization": 0.0
      }, 
      {
       "P1": 20.0, 
       "period": 2.0, 
-      "utilization": 0.06896551724137931
+      "utilization": 0.06666666666666667
      }, 
      {
       "period": 3.0, 
@@ -56,7 +56,7 @@
       "time": 2.0
      }
     ], 
-    "meanUtilization": 0.2672413793103448
+    "meanUtilization": 0.11041666666666666
    }
   }, 
   {
@@ -67,22 +67,22 @@
      {
       "P2": 50, 
       "period": 0.0, 
-      "utilization": 0
+      "utilization": 0.625
      }, 
      {
       "P1": 50.0, 
       "period": 1.0, 
-      "utilization": 0
+      "utilization": 1.0
      }, 
      {
       "P1": 10.0, 
       "period": 2.0, 
-      "utilization": 0.037037037037037035
+      "utilization": 0.03333333333333333
      }, 
      {
       "P1": 40.0, 
       "period": 3.0, 
-      "utilization": 0.6666666666666666
+      "utilization": 0.4
      }
     ], 
     "detailedWorkPlan": [
@@ -111,7 +111,7 @@
       "time": 3.0
      }
     ], 
-    "meanUtilization": 0.17592592592592593
+    "meanUtilization": 0.5145833333333334
    }
   }, 
   {

dream/tests/dump/CapacityStationSharedResources2.json.result

@@ -26,11 +26,11 @@
      {
       "P1": 50, 
       "period": 0.0, 
-      "utilization": 0
+      "utilization": 0.625
      }, 
      {
       "period": 1.0, 
-      "utilization": 0
+      "utilization": 0.0
      }, 
      {
       "period": 2.0, 
@@ -45,7 +45,7 @@
       "time": 0.0
      }
     ], 
-    "meanUtilization": 0.0
+    "meanUtilization": 0.20833333333333334
    }
   }, 
   {
@@ -56,7 +56,7 @@
      {
       "P2": 30.0, 
       "period": 0.0, 
-      "utilization": 1.0
+      "utilization": 0.375
      }, 
      {
       "P1": 30.0, 
@@ -96,7 +96,7 @@
       "time": 2.0
      }
     ], 
-    "meanUtilization": 0.7444444444444445
+    "meanUtilization": 0.5361111111111111
    }
   }, 
   {

dream/tests/dump/CapacityStationSharedResources3.json.result

@@ -26,7 +26,7 @@
      {
       "P1": 30.0, 
       "period": 0.0, 
-      "utilization": 1.0
+      "utilization": 0.375
      }, 
      {
       "P1": 20.0, 
@@ -52,7 +52,7 @@
       "time": 1.0
      }
     ], 
-    "meanUtilization": 0.4666666666666667
+    "meanUtilization": 0.2583333333333333
    }
   }, 
   {
@@ -63,7 +63,7 @@
      {
       "P2": 50, 
       "period": 0.0, 
-      "utilization": 0
+      "utilization": 0.625
      }, 
      {
       "period": 1.0, 
@@ -72,7 +72,7 @@
      {
       "P1": 100, 
       "period": 2.0, 
-      "utilization": 0.5
+      "utilization": 0.3333333333333333
      }
     ], 
     "detailedWorkPlan": [
@@ -89,7 +89,7 @@
       "time": 2.0
      }
     ], 
-    "meanUtilization": 0.16666666666666666
+    "meanUtilization": 0.3194444444444444
    }
   }, 
   {

dream/tests/dump/CapacityStationSpace1.json.result

@@ -56,7 +56,7 @@
      {
       "P2": 50, 
       "period": 0.0, 
-      "utilization": 1.0
+      "utilization": 0.5
      }, 
      {
       "period": 1.0, 
@@ -65,7 +65,7 @@
      {
       "P1": 100, 
       "period": 2.0, 
-      "utilization": 0.5
+      "utilization": 0.3333333333333333
      }
     ], 
     "detailedWorkPlan": [
@@ -82,7 +82,7 @@
       "time": 2.0
      }
     ], 
-    "meanUtilization": 0.5
+    "meanUtilization": 0.2777777777777778
    }
   }, 
   {

dream/tests/dump/CapacityStationSpace2.json.result

@@ -30,7 +30,7 @@
      }, 
      {
       "period": 1.0, 
-      "utilization": 0
+      "utilization": 0.0
      }, 
      {
       "P2": 50, 
@@ -71,7 +71,7 @@
      {
       "P1": 100, 
       "period": 1.0, 
-      "utilization": 0
+      "utilization": 1.0
      }, 
      {
       "period": 2.0, 
@@ -80,7 +80,7 @@
      {
       "P2": 50, 
       "period": 3.0, 
-      "utilization": 1.0
+      "utilization": 0.5
      }
     ], 
     "detailedWorkPlan": [
@@ -97,7 +97,7 @@
       "time": 3.0
      }
     ], 
-    "meanUtilization": 0.25
+    "meanUtilization": 0.375
    }
   }, 
   {