Commit 6caa7aa3 authored by Georgios Dagkakis's avatar Georgios Dagkakis

Main script modified to activate the AllocationManager

Conflicts:
	dream/simulation/LineGenerationJSON.py
parent 5b1dffa9
...@@ -88,6 +88,8 @@ from ShiftScheduler import ShiftScheduler ...@@ -88,6 +88,8 @@ from ShiftScheduler import ShiftScheduler
import PrintRoute import PrintRoute
from CapacityStation import CapacityStation from CapacityStation import CapacityStation
from AllocationManagement import AllocationManagement
from CapacityStationExit import CapacityStationExit from CapacityStationExit import CapacityStationExit
from CapacityStationBuffer import CapacityStationBuffer from CapacityStationBuffer import CapacityStationBuffer
from CapacityStationController import CapacityStationController from CapacityStationController import CapacityStationController
...@@ -181,6 +183,7 @@ def createObjectResourcesAndCoreObjects(): ...@@ -181,6 +183,7 @@ def createObjectResourcesAndCoreObjects():
G.QueueManagedJobList=[] G.QueueManagedJobList=[]
G.ObjectResourceList=[] G.ObjectResourceList=[]
G.CapacityStationBufferList=[] G.CapacityStationBufferList=[]
G.AllocationManagementList=[]
G.CapacityStationList=[] G.CapacityStationList=[]
G.CapacityStationExitList=[] G.CapacityStationExitList=[]
G.CapacityStationControllerList=[] G.CapacityStationControllerList=[]
...@@ -267,6 +270,13 @@ def createObjectResourcesAndCoreObjects(): ...@@ -267,6 +270,13 @@ def createObjectResourcesAndCoreObjects():
# get the successorList for the 'Frames' # get the successorList for the 'Frames'
coreObject.nextFrameIds=getSuccessorList(element['id'], lambda source, destination, edge_data: edge_data.get('entity') == 'Frame') coreObject.nextFrameIds=getSuccessorList(element['id'], lambda source, destination, edge_data: edge_data.get('entity') == 'Frame')
elif objClass=='Dream.AllocationManagement':
id=element.get('id', 'not found')
name=element.get('name', 'not found')
argumentDict=element.get('argumentDict', {})
AM=AllocationManagement(id, name, argumentDict=argumentDict)
G.AllocationManagementList.append(AM)
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# loop through all the core objects # loop through all the core objects
# to read predecessors # to read predecessors
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment