naming convention changes in objects. dailyThroughput->IntervalThrouput

dream/simulation/Exit.py

@@ -67,7 +67,7 @@ class Exit(CoreObject):
         
         self.totalTaktTime=0            # the total time between to consecutive exits    
         self.TaktTime=[]                # list that holds the avg time between to consecutive exits     
-        self.dailyThroughPutList=[]                                  
+        self.intervalThroughPutList=[]                                  
                                                       
   
     def run(self):
@@ -213,8 +213,9 @@ class Exit(CoreObject):
             json['results']['throughput']=self.numOfExits
             if self.totalNumberOfUnitsExited!=self.numOfExits:   #output this only if there was variability in units
                 json['results']['unitsThroughput']=self.totalNumberOfUnitsExited
-            if len(self.dailyThroughPutList):
-                json['results']['dailyThroughputList']=self.dailyThroughPutList
+            if len(self.intervalThroughPutList):    #output this only if there is an interval throughput
+                                                    #TODO - check how to output in stochastic cases
+                json['results']['dailyThroughputList']=self.intervalThroughPutList
             json['results']['lifespan']=self.Lifespan[0]
             json['results']['takt_time']=self.TaktTime[0]            
                 

dream/simulation/Globals.py

@@ -170,14 +170,14 @@ def setWIP(entityList):
             entity.schedule.append([object,now()])              #append the time to schedule so that it can be read in the result
             entity.currentStation=object                        # update the current station of the entity 
        
-def countDailyThroughput(argumentDict={}):
+def countIntervalThroughput(argumentDict={}):
     currentExited=0  
     for obj in G.ObjList:
         if obj.type is 'Exit':
             totalExited=obj.totalNumberOfUnitsExited
-            previouslyExited=sum(obj.dailyThroughPutList)
+            previouslyExited=sum(obj.intervalThroughPutList)
             currentExited+=totalExited-previouslyExited
-    obj.dailyThroughPutList.append(currentExited)
+    obj.intervalThroughPutList.append(currentExited)
             
             
             

dream/simulation/JSONInputs/Topology48.json

@@ -145,7 +145,7 @@
             "name": "calculateDailyAttainment",
             "start": "480",
             "interval": "480",
-            "method": "Globals.countDailyThroughput",
+            "method": "Globals.countIntervalThroughput",
             "argumentDict": {
             }
         }