bug fix, all tests run

dream/simulation/LineGenerationJSON.py

@@ -302,35 +302,6 @@ def createObjects():
             # get the successorList for the 'Frames'
             coreObject.nextFrameIds=getSuccessorList(element['id'], lambda source, destination, edge_data: edge_data.get('entity') == 'Frame')
             coreObject.nextIds=getSuccessorList(element['id'])           # update the nextIDs list of the object
-                                                                                                                                                                              
-                                   
-#         elif objClass=='Dream.CapacityStation':
-#             id=element.get('id', 'not found')
-#             name=element.get('name', 'not found')
-#             intervalCapacity=element.get('intervalCapacity', [])
-#             sharedResources=element.get('sharedResources', {})
-#             CS=CapacityStation(id,name,intervalCapacity=intervalCapacity, sharedResources=sharedResources)
-#             CS.nextIds=getSuccessorList(id)
-#             G.CapacityStationList.append(CS)
-#             G.ObjList.append(CS)
-#             
-#         elif objClass=='Dream.CapacityStationBuffer':
-#             id=element.get('id', 'not found')
-#             name=element.get('name', 'not found')
-#             requireFullProject=bool(element.get('requireFullProject', 0))
-#             CB=CapacityStationBuffer(id,name,requireFullProject=requireFullProject)
-#             CB.nextIds=getSuccessorList(id)
-#             G.CapacityStationBufferList.append(CB)
-#             G.ObjList.append(CB)
-#             
-#         elif objClass=='Dream.CapacityStationExit':
-#             id=element.get('id', 'not found')
-#             name=element.get('name', 'not found')
-#             nextCapacityStationBufferId=element.get('nextCapacityStationBufferId', None)
-#             CE=CapacityStationExit(id,name,nextCapacityStationBufferId=nextCapacityStationBufferId)
-#             G.CapacityStationExitList.append(CE)
-#             G.ExitList.append(CE)
-#             G.ObjList.append(CE)
              
     # -----------------------------------------------------------------------
     #                loop through all the nodes to  

dream/simulation/Queue.py

@@ -40,14 +40,11 @@ class Queue(CoreObject):
     def __init__(self, id='', name='', capacity=1, isDummy=False, schedulingRule="FIFO", level=None, gatherWipStat=False, inputsDict={}):
         self.type="Queue"           # String that shows the type of object
         CoreObject.__init__(self, id, name)
-        # used for the routing of the entities
-        #     holds the capacity of the Queue
-        if capacity>0:
-            self.capacity=capacity
-        else:
+        capacity=float(capacity)
+        if capacity<0 or capacity==float("inf"):
             self.capacity=float("inf")
-
-        #     No failures are considered for the Queue        
+        else:
+            self.capacity=int(capacity)
 
         self.isDummy=bool(int(isDummy))                    #Boolean that shows if it is the dummy first Queue
         self.schedulingRule=schedulingRule      #the scheduling rule that the Queue follows