Commit cdec2b01 authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Jérome Perrin

change so that schedule of order is also outputted. Update in the dump

parent 18769d8d
......@@ -1248,10 +1248,10 @@ def createWIP():
O=Order(id, name, route, priority=priority, dueDate=dueDate,orderDate=orderDate,
isCritical=isCritical, basicsEnded=basicsEnded, manager=manager, componentsList=componentsList,
componentsReadyForAssembly=componentsReadyForAssembly, extraPropertyDict=extraPropertyDict)
# G.JobList.append(O)
G.OrderList.append(O)
G.WipList.append(O)
G.EntityList.append(O)
G.EntityList.append(O)
G.JobList.append(O)
# ===========================================================================
# reads the interruptions of the stations
......
......@@ -97,6 +97,30 @@
"waiting_ratio": 50.0
}
},
{
"_class": "Dream.Job",
"id": "O1",
"results": {
"completionTime": 1.0,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
},
{
"entranceTime": 0,
"stationId": "M0",
"stepNumber": 1
},
{
"entranceTime": 1.0,
"stationId": "OD0",
"stepNumber": 2
}
]
}
},
{
"_class": "Dream.QueueJobShop",
"id": "Q0",
......
......@@ -131,6 +131,30 @@
"waiting_ratio": 80.0
}
},
{
"_class": "Dream.Job",
"id": "O1",
"results": {
"completionTime": 1.0,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
},
{
"entranceTime": 0,
"stationId": "M0",
"stepNumber": 1
},
{
"entranceTime": 1.0,
"stationId": "OD0",
"stepNumber": 2
}
]
}
},
{
"_class": "Dream.QueueJobShop",
"id": "Q0",
......
......@@ -136,6 +136,30 @@
"waiting_ratio": 80.0
}
},
{
"_class": "Dream.Job",
"id": "O1",
"results": {
"completionTime": 1.0,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
},
{
"entranceTime": 0,
"stationId": "M0",
"stepNumber": 1
},
{
"entranceTime": 1.0,
"stationId": "OD0",
"stepNumber": 2
}
]
}
},
{
"_class": "Dream.QueueJobShop",
"id": "Q0",
......
......@@ -180,6 +180,30 @@
"waiting_ratio": 85.71428571428571
}
},
{
"_class": "Dream.Job",
"id": "O1",
"results": {
"completionTime": 1.0,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
},
{
"entranceTime": 0,
"stationId": "M0",
"stepNumber": 1
},
{
"entranceTime": 1.0,
"stationId": "OD0",
"stepNumber": 2
}
]
}
},
{
"_class": "Dream.QueueJobShop",
"id": "Q0",
......
......@@ -49,6 +49,64 @@
"waiting_ratio": 88.88888888888889
}
},
{
"_class": "Dream.Job",
"id": "Or1",
"results": {
"completionTime": 4.5,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q1",
"stepNumber": 0
},
{
"entranceTime": 0.0,
"stationId": "M1",
"stepNumber": 1
},
{
"entranceTime": 0.25,
"stationId": "Q2",
"stepNumber": 2
},
{
"entranceTime": 1.5,
"stationId": "M2",
"stepNumber": 3
},
{
"entranceTime": 4.5,
"stationId": "E1",
"stepNumber": 4
}
]
}
},
{
"_class": "Dream.Job",
"id": "Or2",
"results": {
"completionTime": 1.5,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q2",
"stepNumber": 0
},
{
"entranceTime": 0.0,
"stationId": "M2",
"stepNumber": 1
},
{
"entranceTime": 1.5,
"stationId": "E1",
"stepNumber": 2
}
]
}
},
{
"_class": "Dream.QueueManagedJob",
"id": "Q1",
......
......@@ -41,6 +41,64 @@
"waiting_ratio": 66.66666666666667
}
},
{
"_class": "Dream.Job",
"id": "Or1",
"results": {
"completionTime": 3.0,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q1",
"stepNumber": 0
},
{
"entranceTime": 0.0,
"stationId": "M1",
"stepNumber": 1
},
{
"entranceTime": 0.75,
"stationId": "Q2",
"stepNumber": 2
},
{
"entranceTime": 2.0,
"stationId": "M2",
"stepNumber": 3
},
{
"entranceTime": 3.0,
"stationId": "E1",
"stepNumber": 4
}
]
}
},
{
"_class": "Dream.Job",
"id": "Or2",
"results": {
"completionTime": 2.0,
"schedule": [
{
"entranceTime": 0,
"stationId": "Q2",
"stepNumber": 0
},
{
"entranceTime": 0.5,
"stationId": "M2",
"stepNumber": 1
},
{
"entranceTime": 2.0,
"stationId": "E1",
"stepNumber": 2
}
]
}
},
{
"_class": "Dream.QueueManagedJob",
"id": "Q1",
......
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