support NonStarvingEntry in the optimization model

dream/plugins/Batches/AddBatchStations.py

@@ -20,8 +20,8 @@ class AddBatchStations(plugin.InputPreparationPlugin):
         # get the number of units for a standard batch
         standardBatchUnits=0
         for node_id, node in nodes.iteritems():
-            if node['_class']=='Dream.BatchSource':
-                standardBatchUnits=int(node['batchNumberOfUnits'])    
+            if node['_class'] in ['Dream.BatchSource', 'Dream.NonStarvingEntry']:
+                standardBatchUnits=int(node['entityData']['numberOfUnits'])    
                 
         # loop through all the objects and set that the name will be equal to the id
         for node_id, node in nodes.iteritems():
@@ -69,7 +69,7 @@ class AddBatchStations(plugin.InputPreparationPlugin):
             if node['_class']=='Dream.BatchDecompositionBlocking':
                 predecessorId=self.getPredecessors(data, node_id)[0]
                 predecessorClass=nodes[predecessorId]['_class']
-                if predecessorClass=='Dream.BatchSource':
+                if predecessorClass in ['Dream.BatchSource', 'Dream.NonStarvingEntry']:
                     data['graph']['node'][node_id]['_class']='Dream.BatchDecompositionStartTime'
    
         # loop through the nodes

dream/plugins/Batches/BatchesWIPKEtool.py

@@ -24,8 +24,8 @@ class BatchesWIPKEtool(plugin.InputPreparationPlugin):
         # get the number of units for a standard batch
         standardBatchUnits=0
         for node_id, node in nodes.iteritems():
-            if node['_class']=='Dream.BatchSource':
-                standardBatchUnits=int(node['batchNumberOfUnits']) 
+            if node['_class'] in ['Dream.BatchSource', 'Dream.NonStarvingEntry']:
+                standardBatchUnits=int(node['entityData']['numberOfUnits']) 
             node['wip']=[]
             
         data_uri_encoded_input_data = data['input'].get(self.configuration_dict['input_id'], {})

dream/plugins/Batches/BatchesWIPShort.py

@@ -23,8 +23,8 @@ class BatchesWIPShort(plugin.InputPreparationPlugin):
         # get the number of units for a standard batch
         standardBatchUnits=0
         for node_id, node in nodes.iteritems():
-            if node['_class']=='Dream.BatchSource':
-                standardBatchUnits=int(node['batchNumberOfUnits']) 
+            if node['_class'] in ['Dream.BatchSource', 'Dream.NonStarvingEntry']:
+                standardBatchUnits=int(node['entityData']['numberOfUnits']) 
             node['wip']=[]
 
         # remove the titles

dream/plugins/Batches/BatchesWIPSpreadsheet.py

@@ -25,8 +25,8 @@ class BatchesWIPSpreadsheet(plugin.InputPreparationPlugin):
     # get the number of units for a standard batch
     standardBatchUnits=0
     for node_id, node in nodes.iteritems():
-        if node['_class']=='Dream.BatchSource':
-            standardBatchUnits=int(node['batchNumberOfUnits']) 
+        if node['_class'] in ['Dream.BatchSource', 'Dream.NonStarvingEntry']:
+            standardBatchUnits=int(node['entityData']['numberOfUnits']) 
         node['wip']=[]
 
     if wipData:

dream/simulation/SkilledOperatorRouter.py

@@ -455,7 +455,7 @@ class SkilledRouter(Router):
     def getPreviousQueue(self, machine):
         predecessor=machine.previous[0]
         while 1:
-            if "Source" in str(predecessor.__class__):
+            if "Source" in str(predecessor.__class__) or "NonStarvingEntry" in str(predecessor.__class__):
                 return None
             if "Queue" in str(predecessor.__class__) or "Clearance" in str(predecessor.__class__):
                 return predecessor