Merge branch 'ulbranch'

dream/simulation/BatchDecompositionStartTime.py

+# ===========================================================================
+# Copyright 2013 University of Limerick
+#
+# This file is part of DREAM.
+#
+# DREAM is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DREAM is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with DREAM.  If not, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+'''
+Created on 14 11 2013
+
+@author: George
+'''
+'''
+Customization of the BatchDecomposition so that it sets the start time in the Batch.
+Custom object. Maybe we should have a generic method that the objects can call in order to set that
+'''
+
+from BatchDecomposition import BatchDecomposition
+from SimPy.Simulation import now
+
+class BatchDecompositionStartTime(BatchDecomposition):
+    
+    '''
+    #gets an entity from the predecessor     
+    def getEntity(self):
+        activeEntity=BatchDecomposition.getEntity(self)
+        activeEntity.startTime=now()
+        return activeEntity
+    '''
+    
+    #removes an entity from the object    
+    def removeEntity(self):
+        # if it is the first sub-batch of the parent batch that leaves
+        # assign it as the batch start time
+        if len(self.getActiveObjectQueue())==self.numberOfSubBatches:
+            batch=self.getActiveObjectQueue()[0].parentBatch
+            batch.startTime=now()
+        activeEntity=BatchDecomposition.removeEntity(self)
+        return activeEntity

dream/simulation/Job.py

@@ -55,7 +55,7 @@ class Job(Entity):                                  # inherits from the Entity c
             json['_class'] = 'Dream.Job'
             json['id'] = str(self.id)
             json['results'] = {}
-            json['extraPropertyDict'] = self.extraPropertyDict
+            #json['extraPropertyDict'] = self.extraPropertyDict
             
             #if the Job has reached an exit, input completion time in the results
             if self.schedule[-1][0].type=='Exit':

dream/simulation/M3.py

+# ===========================================================================
+# Copyright 2013 University of Limerick
+#
+# This file is part of DREAM.
+#
+# DREAM is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DREAM is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with DREAM.  If not, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+'''
+Created on 14 11 2013
+
+@author: George
+'''
+'''
+Customization of BatchScrapMachine so that it gets blocked if the succeeding BatchDecomposition is blocked.
+Custom object, not too much of generic use. Maybe in the future there should be a composite 
+BatchScrapMachine->BatchDecomposition
+'''
+
+from BatchScrapMachine import BatchScrapMachine
+from SimPy.Simulation import now
+
+class M3(BatchScrapMachine):
+    
+    # =======================================================================
+    # This is only for a BatchScrapMachine that is followed by a BatchDecomposition
+    # We consider that since this is in essence one station, the BatchScrapMachine should be blocked if the 
+    # should be blocked if the BatchDecomposition is blocked
+    # =======================================================================
+    def canAcceptAndIsRequested(self):
+        # get active and giver objects
+        activeObject=self.getActiveObject()
+        activeObjectQueue=self.getActiveObjectQueue()
+        giverObject=self.getGiverObject()
+        nextObject=self.next[0]
+        batchReassemblyHoldsBatch=False
+        if len(nextObject.getActiveObjectQueue())>0:
+            if nextObject.getActiveObjectQueue()[0].type=='Batch' or len(nextObject.getActiveObjectQueue())==4:
+                batchReassemblyHoldsBatch=True
+                
+               
+        # if we have only one predecessor just check if there is a place, 
+        # the machine is up and the predecessor has an entity to dispose
+        # this is done to achieve better (cpu) processing time
+        if(len(activeObject.previous)==1):
+            return activeObject.Up and len(activeObjectQueue)<activeObject.capacity\
+                 and giverObject.haveToDispose(activeObject) and (not batchReassemblyHoldsBatch)
+    
+    
+    
\ No newline at end of file

dream/simulation/ObjectResource.py

@@ -31,11 +31,16 @@ from SimPy.Simulation import Resource
 # ===========================================================================
 class ObjectResource(object):
     
+    def __init__(self):
+        self.initialized = False
+        
     def initialize(self):
         self.totalWorkingTime=0         #holds the total working time
         self.totalWaitingTime=0         #holds the total waiting time
         self.timeLastOperationStarted=0    #holds the time that the last repair was started        
-        self.Res=Resource(self.capacity) 
+        self.Res=Resource(self.capacity)
+        # variable that checks weather the resource is already initialized
+        self.initialized = True
     
     # =======================================================================
     #                    checks if the worker is available
@@ -91,3 +96,9 @@ class ObjectResource(object):
     def getResourceQueue(self):
         return self.Res.activeQ
     
+    # =======================================================================
+    # check if the resource is already initialized
+    # =======================================================================
+    def isInitialized(self):
+        return self.initialized
+    

dream/simulation/OperatorPool.py

@@ -80,8 +80,11 @@ class OperatorPool(ObjectResource):
 #         self.timeLastOperationStarted=0    #holds the time that the last operation was started        
 
         # initialize the operators
+        # an operator that may have been initialized by an other operator pool, is initiated again
+        # reconsider
         for operator in self.operators:
-            operator.initialize()
+            if not operator.isInitialized():
+                operator.initialize()
             
     # =======================================================================
     #                  checks if there are operators available

dream/simulation/Repairman.py

@@ -36,7 +36,8 @@ from ObjectResource import ObjectResource
 # ===========================================================================
 class Repairman(ObjectResource):
     
-    def __init__(self, id, name, capacity=1):    
+    def __init__(self, id, name, capacity=1):  
+        ObjectResource.__init__(self)  
         self.id=id      
         self.objName=name
         self.capacity=capacity      # repairman is an instance of resource
@@ -49,7 +50,7 @@ class Repairman(ObjectResource):
         self.coreObjectIds=[]
         # list with the coreObjects that the repairman repairs
         self.coreObjects=[]
-                
+        
     # =======================================================================    
     #            actions to be taken after the simulation ends
     # =======================================================================

dream/tests/dump/Topology18.json.result

@@ -88,4 +88,4 @@
  "general": {
   "_class": "Dream.Configuration"
  }
-}
+}
\ No newline at end of file

dream/tests/dump/Topology19.json.result

@@ -132,4 +132,4 @@
  "general": {
   "_class": "Dream.Configuration"
  }
-}
+}
\ No newline at end of file

dream/tests/dump/Topology20.json.result

@@ -194,4 +194,4 @@
  "general": {
   "_class": "Dream.Configuration"
  }
-}
+}
\ No newline at end of file