main script changed so that it can read the mode where we ran the simulation...

main script changed so that it can read the mode where we ran the simulation until we have no more Entities. This mode is given with the dummy maxSimTime=-1 in the inputs for now

dream/simulation/CoreObject.py

@@ -128,14 +128,28 @@ class CoreObject(Process):
                difValuesFlag=True
         return difValuesFlag 
       
+      
+    #get the active object. This always returns self  
     def getActiveObject(self):
         return self
     
+    #get the activeQ of the active object.
     def getActiveObjectQueue(self):
         return self.Res.activeQ
        
+    #get the giver object in a getEntity transaction.       
     def getGiverObject(self):
         return self.previous[self.predecessorIndex]
     
+    #get the giver object queue in a getEntity transaction.      
     def getGiverObjectQueue(self):
-        return self.getGiverObject().Res.activeQ
+        return self.getGiverObject().Res.activeQ
\ No newline at end of file
+    
+    #get the receiver object in a removeEntity transaction.  
+    def getReceiverObject(self):
+        return self.next[self.predecessorIndex]
+   
+    #get the receiver object queue in a removeEntity transaction.    
+    def getReceiverObjectQueue(self):
+        return self.getReceiverObject().Res.activeQ
+    
\ No newline at end of file

dream/simulation/JSONInputs/Topology18.json

@@ -20,7 +20,7 @@
     "general": {
         "_class": "Dream.Configuration",
         "numberOfReplications": "1",
-        "maxSimTime": "1000",
+        "maxSimTime": "-1",
         "trace": "Yes",
         "confidenceLevel": "0.95"
     },

dream/simulation/JSONInputs/Topology19.json

@@ -20,7 +20,7 @@
     "general": {
         "_class": "Dream.Configuration",
         "numberOfReplications": "1",
-        "maxSimTime": "1000",
+        "maxSimTime": "-1",
         "trace": "Yes",
         "confidenceLevel": "0.95"
     },

dream/simulation/JSONInputs/Topology20.json

@@ -20,7 +20,7 @@
     "general": {
         "_class": "Dream.Configuration",
         "numberOfReplications": "1",
-        "maxSimTime": "1000",
+        "maxSimTime": "-1",
         "trace": "Yes",
         "confidenceLevel": "0.95"
     },

dream/simulation/LineGenerationJSON.py

@@ -50,7 +50,7 @@ except ImportError:
   sys.modules['scipy'] = scipy
   logger.error("Scipy cannot be imported, using dummy implementation")
 
-from SimPy.Simulation import activate, initialize, simulate, now
+from SimPy.Simulation import activate, initialize, simulate, now, infinity
 from Source import Source
 from Globals import G
 from Machine import Machine
@@ -211,6 +211,7 @@ def createObjects():
             name=element.get('name', 'not found')
             E=ExitJobShop(id, name)
             G.ExitJobShopList.append(E)
+            G.ExitList.append(E)
             G.ObjList.append(E)
             
         elif objClass=='Dream.Queue':
@@ -432,8 +433,18 @@ def main(argv=[], input_data=None):
             pass
         
         activateObjects()
-                    
-        simulate(until=G.maxSimTime)      #start the simulation
+        
+        #if the simulation is ran until no more events are scheduled, then we have to find the end time as the time the last entity ended. 
+        if G.maxSimTime==-1:
+            simulate(until=infinity)    #simulate until there are no more events. If someone does it for a model that has always events, then it will run forever!
+            #identify from the exits what is the time that the last entity has ended. 
+            endList=[]
+            for exit in G.ExitList:
+                endList.append(exit.timeLastEntityLeft)
+            G.maxSimTime=float(max(endList))    
+        #else we simulate until the given maxSimTime
+        else:            
+            simulate(until=G.maxSimTime)      #simulate until the given maxSimTime
         
         #carry on the post processing operations for every object in the topology       
         for element in G.ObjList: