Skip to content

dream
dream
Commit 39dbf389 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

PartJobShop: update case thanks to George comments

parent 753a0f50
Hide whitespace changes
Inline Side-by-side
Showing with 673 additions and 626 deletions
dream/platform/static/css/demo-new.css
View file @ 39dbf389
...@@ -275,7 +275,7 @@ path, ._jsPlumb_endpoint { ...@@ -275,7 +275,7 @@ path, ._jsPlumb_endpoint {
background-image: linear-gradient(to bottom, #ffe 0%, #dde 100%); background-image: linear-gradient(to bottom, #ffe 0%, #dde 100%);
} }
.Dream-Machine, .Dream-MachineJobShop, .Dream-BatchScrapMachine, .Dream-MachineManagedJob { .Dream-Machine, .Dream-MachineJobShop, .Dream-BatchScrapMachine, .Dream-MachineManagedJob, .Dream-MouldAssembly {
border: 1px solid #cbc; border: 1px solid #cbc;
background-color: #fef; background-color: #fef;
background-image: linear-gradient(to bottom, #fef 0%, #ede 100%); background-image: linear-gradient(to bottom, #fef 0%, #ede 100%);
......
dream/simulation/Examples/PartJobShop.json
View file @ 39dbf389
{ {
"edges": { "edges": {
"con_10": [ "con_10": [
"QStart", "CAD1",
"CAD1", "Decomposition",
{} {}
], ],
"con_108": [ "con_15": [
"QMASS", "CAD2",
"MASS3", "Decomposition",
{} {}
], ],
"con_15": [ "con_20": [
"CAD1", "Decomposition",
"Decomposition", "QCAM",
{} {}
], ],
"con_20": [ "con_25": [
"CAD2", "QMILL",
"Decomposition", "MILL2",
{} {}
], ],
"con_25": [ "con_30": [
"Decomposition", "QMILL",
"QCAM", "MILL1",
{} {}
], ],
"con_30": [ "con_35": [
"QMILL", "QStart",
"MILL2", "CAD2",
{} {}
], ],
"con_35": [ "con_40": [
"QMILL", "QCAM",
"MILL1", "CAM1",
{} {}
], ],
"con_40": [ "con_45": [
"QStart", "QCAM",
"CAD2", "CAM2",
{} {}
], ],
"con_45": [ "con_5": [
"QCAM", "QStart",
"CAM1", "CAD1",
{} {}
], ],
"con_5": [ "con_50": [
"QCAM", "QEDM",
"CAM2", "EDM",
{} {}
], ],
"con_50": [ "con_55": [
"QEDM", "QIM",
"EDM", "IM1",
{} {}
], ],
"con_55": [ "con_60": [
"QIM", "QIM",
"IM1", "IM2",
{} {}
], ],
"con_60": [ "con_65": [
"QIM", "MASS3",
"IM2", "QIM",
{} {}
], ],
"con_65": [ "con_70": [
"MASS3", "MASS2",
"QIM", "QIM",
{} {}
], ],
"con_70": [ "con_75": [
"MASS2", "MASS1",
"QIM", "QIM",
{} {}
], ],
"con_75": [ "con_80": [
"MASS1", "QMASS",
"QIM", "MASS1",
{} {}
], ],
"con_82": [ "con_85": [
"QMASS", "QMASS",
"MASS1", "MASS2",
{} {}
], ],
"con_95": [ "con_90": [
"QMASS", "QMASS",
"MASS2", "MASS3",
{} {}
] ]
},
"general": {
"confidenceLevel": 0.95,
"currentDate": "",
"maxSimTime": -1,
"numberOfAntsPerGenerations": 2,
"numberOfGenerations": 4,
"numberOfReplications": 1,
"numberOfSolutions": 4,
"processTimeout": 2000,
"trace": "Yes"
},
"nodes": {
"CAD1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_1",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAD1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"CAD2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_2",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAD2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"CAM1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_3",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAM1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"CAM2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_4",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAM2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"Decomposition": {
"_class": "Dream.OrderDecomposition",
"element_id": "DreamNode_5",
"name": "Decomposition"
},
"E1": {
"_class": "Dream.ExitJobShop",
"element_id": "DreamNode_6",
"name": "Exit"
},
"EDM": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_7",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "EDM",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"IM1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_8",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "IM1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
}, },
"general": { "IM2": {
"confidenceLevel": 0.95, "_class": "Dream.MachineManagedJob",
"currentDate": "2014/02/01", "element_id": "DreamNode_9",
"maxSimTime": -1, "failures": {
"numberOfAntsPerGenerations": 2, "MTTF": "40",
"numberOfGenerations": 4, "MTTR": "10",
"numberOfReplications": 1, "failureDistribution": "No",
"numberOfSolutions": 4, "repairman": "None"
"processTimeout": 200 },
"name": "IM2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
}, },
"nodes": { "MASS1": {
"CAD1": { "_class": "Dream.MouldAssembly",
"_class": "Dream.MachineManagedJob", "element_id": "DreamNode_10",
"element_id": "DreamNode_1", "failures": {
"failures": { "MTTF": 40,
"MTTF": "40", "MTTR": 10,
"MTTR": "10", "failureDistribution": "No",
"failureDistribution": "No", "repairman": "None"
"repairman": "None" },
}, "name": "MouldAss",
"name": "CAD1", "processingTime": {
"processingTime": { "distributionType": "Fixed",
"distributionType": "Fixed", "max": 1,
"max": "1", "mean": 0.9,
"mean": 0.9, "min": 0.1,
"min": "0.1", "stdev": 0.1
"stdev": "0.1" }
}
},
"CAD2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_2",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAD2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"CAM1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_3",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAM1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"CAM2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_4",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "CAM2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"Decomposition": {
"_class": "Dream.OrderDecomposition",
"element_id": "DreamNode_5",
"name": "Decomposition"
},
"E1": {
"_class": "Dream.ExitJobShop",
"element_id": "DreamNode_6"
},
"EDM": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_7",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "EDM",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"IM1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_8",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "IM1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"IM2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_9",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "IM2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"MASS1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_10",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MASS1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"MASS2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_11",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MASS2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"MASS3": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_12",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MASS3",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"MILL1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_13",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MILL1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"MILL2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_14",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MILL2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": 0.9,
"min": "0.1",
"stdev": "0.1"
}
},
"PM1": {
"_class": "Dream.Operator",
"element_id": "DreamNode_15",
"name": "PM1"
},
"PM2": {
"_class": "Dream.Operator",
"element_id": "DreamNode_16",
"name": "PM2"
},
"QCAM": {
"_class": "Dream.ConditionalBuffer",
"capacity": "1",
"element_id": "DreamNode_17",
"isDummy": "0",
"name": "QCAM",
"schedulingRule": "FIFO"
},
"QEDM": {
"_class": "Dream.QueueManagedJob",
"capacity": "1",
"element_id": "DreamNode_18",
"isDummy": "0",
"name": "QEDM",
"schedulingRule": "FIFO"
},
"QIM": {
"_class": "Dream.QueueManagedJob",
"capacity": "1",
"element_id": "DreamNode_19",
"isDummy": "0",
"name": "QIM",
"schedulingRule": "FIFO"
},
"QMASS": {
"_class": "Dream.MouldAssemblyBuffer",
"capacity": "1",
"element_id": "DreamNode_22",
"isDummy": "0",
"name": "QMASS",
"schedulingRule": "FIFO"
},
"QMILL": {
"_class": "Dream.QueueManagedJob",
"capacity": "-1",
"element_id": "DreamNode_20",
"isDummy": "0",
"name": "QMILL",
"schedulingRule": "FIFO"
},
"QStart": {
"_class": "Dream.QueueManagedJob",
"capacity": "1",
"element_id": "DreamNode_21",
"isDummy": "0",
"name": "QStart",
"schedulingRule": "FIFO"
}
}, },
"preference": { "MASS2": {
"coordinates": { "_class": "Dream.MouldAssembly",
"CAD1": { "element_id": "DreamNode_11",
"left": 0.32963397636897157, "failures": {
"top": 0.2680049626379991 "MTTF": 40,
}, "MTTR": 10,
"CAD2": { "failureDistribution": "No",
"left": 0.35914551462607636, "repairman": "None"
"top": 0.023577079050914163 },
}, "name": "MouldAss",
"CAM1": { "processingTime": {
"left": 0.8156850502215475, "distributionType": "Fixed",
"top": 0.03770447816866011 "max": 1,
}, "mean": 0.9,
"CAM2": { "min": 0.1,
"left": 0.7965020644878134, "stdev": 0.1
"top": 0.3105076307737342 }
},
"Decomposition": {
"left": 0.5277238535086819,
"top": 0.10475955623433687
},
"E1": {
"left": 0.967876137039781,
"top": 0.39355726466863505
},
"EDM": {
"left": 0.18964688721194897,
"top": 0.9220848382145941
},
"IM1": {
"left": 0.8751810178550912,
"top": 0.6049810252492097
},
"IM2": {
"left": 0.8845462397808385,
"top": 0.8560412718675537
},
"MASS1": {
"left": 0.5486473277825593,
"top": 0.5247930837013548
},
"MASS2": {
"left": 0.5441103624829352,
"top": 0.7115787006319392
},
"MASS3": {
"left": 0.5501964991975471,
"top": 0.9108024938023543
},
"MILL1": {
"left": 0.1877564659501795,
"top": 0.6841812972040019
},
"MILL2": {
"left": 0.18401596464596484,
"top": 0.44453459509694726
},
"PM1": {
"left": 0.001216264249816622,
"top": 0.021371774115389482
},
"PM2": {
"left": 0.002151852134290946,
"top": 0.2275242854939252
},
"QCAM": {
"left": 0.6798946482505993,
"top": 0.04336252204503648
},
"QEDM": {
"left": 0.05041752133280548,
"top": 0.9193157852349616
},
"QIM": {
"left": 0.7084640625588505,
"top": 0.7069073434280151
},
"QMASS": {
"left": 0.39359833360679664,
"top": 0.7621221762426658
},
"QMILL": {
"left": 0.024330940806924675,
"top": 0.571934442232598
},
"QStart": {
"left": 0.15404040948036557,
"top": 0.05376099760119495
}
},
"zoom_level": 0.99999
}, },
"shift_spreadsheet": [ "MASS3": {
[ "_class": "Dream.MouldAssembly",
"Day", "element_id": "DreamNode_12",
"Machines", "failures": {
"Start", "MTTF": 40,
"End" "MTTR": 10,
], "failureDistribution": "No",
[ "repairman": "None"
null, },
null, "name": "MouldAss",
null, "processingTime": {
null "distributionType": "Fixed",
] "max": 1,
"mean": 0.9,
"min": 0.1,
"stdev": 0.1
}
},
"MILL1": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_13",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MILL1",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"MILL2": {
"_class": "Dream.MachineManagedJob",
"element_id": "DreamNode_14",
"failures": {
"MTTF": "40",
"MTTR": "10",
"failureDistribution": "No",
"repairman": "None"
},
"name": "MILL2",
"processingTime": {
"distributionType": "Fixed",
"max": "1",
"mean": "0.9",
"min": "0.1",
"stdev": "0.1"
}
},
"PM1": {
"_class": "Dream.Operator",
"element_id": "DreamNode_15",
"name": "PM1"
},
"PM2": {
"_class": "Dream.Operator",
"element_id": "DreamNode_16",
"name": "PM2"
},
"QCAM": {
"_class": "Dream.ConditionalBuffer",
"capacity": "1",
"element_id": "DreamNode_17",
"isDummy": "0",
"name": "QCAM",
"schedulingRule": "FIFO"
},
"QEDM": {
"_class": "Dream.QueueManagedJob",
"capacity": "1",
"element_id": "DreamNode_18",
"isDummy": "0",
"name": "QEDM",
"schedulingRule": "FIFO"
},
"QIM": {
"_class": "Dream.QueueManagedJob",
"capacity": -1,
"element_id": "DreamNode_19",
"isDummy": "0",
"name": "QIM",
"schedulingRule": "FIFO"
},
"QMASS": {
"_class": "Dream.MouldAssemblyBuffer",
"capacity": -1,
"element_id": "DreamNode_20",
"isDummy": "0",
"name": "QMASS",
"schedulingRule": "FIFO"
},
"QMILL": {
"_class": "Dream.QueueManagedJob",
"capacity": "-1",
"element_id": "DreamNode_21",
"isDummy": "0",
"name": "QMILL",
"schedulingRule": "FIFO"
},
"QStart": {
"_class": "Dream.QueueManagedJob",
"capacity": "1",
"element_id": "DreamNode_22",
"isDummy": "0",
"name": "QStart",
"schedulingRule": "FIFO"
}
},
"preference": {
"coordinates": {
"CAD1": {
"left": 0.32963397636897157,
"top": 0.2680049626379991
},
"CAD2": {
"left": 0.35914551462607636,
"top": 0.023577079050914163
},
"CAM1": {
"left": 0.8156850502215475,
"top": 0.03770447816866011
},
"CAM2": {
"left": 0.7965020644878134,
"top": 0.3105076307737342
},
"Decomposition": {
"left": 0.5277238535086819,
"top": 0.10475955623433687
},
"E1": {
"left": 0.967876137039781,
"top": 0.39355726466863505
},
"EDM": {
"left": 0.18964688721194897,
"top": 0.9220848382145941
},
"IM1": {
"left": 0.8751810178550912,
"top": 0.6049810252492097
},
"IM2": {
"left": 0.8845462397808385,
"top": 0.8560412718675537
},
"MASS1": {
"left": 0.5486473277825593,
"top": 0.5247930837013548
},
"MASS2": {
"left": 0.5441103624829352,
"top": 0.7115787006319392
},
"MASS3": {
"left": 0.5501964991975471,
"top": 0.9108024938023543
},
"MILL1": {
"left": 0.1877564659501795,
"top": 0.6841812972040019
},
"MILL2": {
"left": 0.18401596464596484,
"top": 0.44453459509694726
},
"PM1": {
"left": 0.001216264249816622,
"top": 0.021371774115389482
},
"PM2": {
"left": 0.002151852134290946,
"top": 0.2275242854939252
},
"QCAM": {
"left": 0.6798946482505993,
"top": 0.04336252204503648
},
"QEDM": {
"left": 0.05041752133280548,
"top": 0.9193157852349616
},
"QIM": {
"left": 0.7084640625588505,
"top": 0.7069073434280151
},
"QMASS": {
"left": 0.39359833360679664,
"top": 0.7621221762426658
},
"QMILL": {
"left": 0.024330940806924675,
"top": 0.571934442232598
},
"QStart": {
"left": 0.15404040948036557,
"top": 0.05376099760119495
}
},
"zoom_level": 0.8099919000000001
},
"shift_spreadsheet": [
[
"Day",
"Machines",
"Start",
"End"
],
[
null,
null,
null,
null
]
],
"wip_part_spreadsheet": [
[
"Order ID",
"Due Date",
"Priority",
"Project Manager",
"Part",
"Part Type",
"Sequence",
"Processing Times",
"Prerequisites Parts"
],
[
"Order 1",
"2014/03/15",
"1",
"PM1",
"Design",
"Design",
"CAD",
"6",
null
],
[
null,
null,
null,
null,
"Part1",
"Basic",
"CAM-MILL-EDM-MILL-MASS",
"8-4-2-8-8",
""
],
[
null,
null,
null,
null,
"Part2",
"Basic",
"CAM-MILL-EDM-MILL-EDM-MASS",
"10-7-8-4-13-8-8",
""
],
[
"",
"",
"",
"",
"Assemble",
"Mould",
"MASS-IM",
"2-12",
""
],
[
"Order 2",
"2014/03/15",
"1",
"PM1",
"Design",
"Design",
"CAD",
"6",
""
],
[
"",
"",
"",
"",
"Part1",
"Basic",
"CAM-MILL-EDM-MILL-MASS",
"8-4-2-8-8",
""
],
[
"",
"",
"",
"",
"Part2",
"Basic",
"CAM-MILL-EDM-MASS",
"20-15-8-8-8",
""
],
[
"",
"",
"",
"",
"Assemble",
"Mould",
"MASS-IM",
"1-12",
""
],
[
"Order 3",
"2014/03/15",
"1",
"PM1",
"Design",
"Design",
"CAD",
"6",
""
],
[
"",
"",
"",
"",
"Part1",
"Basic",
"CAM-MILL-EDM-MASS",
"8-4-2-8-",
""
],
[
"",
"",
"",
"",
"Part2",
"Basic",
"CAM-MILL-EDM-MASS",
"7-15-8-8-8",
""
],
[
"",
"",
"",
"",
"Assemble",
"Mould",
"MASS-IM",
"1-3",
""
], ],
"wip_part_spreadsheet": [ [
[ null,
"Order ID", null,
"Due Date", null,
"Priority", null,
"Project Manager", null,
"Part", null,
"Part Type", null,
"Sequence", null,
"Processing Times", null
"Prerequisites Parts"
],
[
"Order 1",
"2014/03/15",
"1",
"PM1",
"Design",
"Design",
"CAD",
"6",
null
],
[
null,
null,
null,
null,
"Part1",
"Basic",
"CAM-MILL-EDM-MILL-IM",
"8-4-2-8-12",
"Design"
],
[
null,
null,
null,
null,
"Part2",
"Basic",
"CAM-MILL-EDM-CAM-IM",
"20-15-8-4-13",
"Design"
],
[
"",
"",
"",
"",
"Assemble",
"Basic",
"MASS-IM",
"8-12",
"Part1-Part2"
],
[
"Order 2",
"2014/03/15",
"1",
"PM1",
"Design",
"Design",
"CAD",
"8",
""
],
[
"",
"",
"",
"",
"Part1",
"Basic",
"CAM-MILL-EDM-MILL",
"20-15-8-12",
"Design"
],
[
"",
"",
"",
"",
"Part2",
"Basic",
"CAM-MIL",
"2-4",
"Design"
],
[
"Order 3",
"2014/03/15",
"1",
"PM1",
"Design",
"Design",
"CAD",
"7",
""
],
[
"",
"",
"",
"",
"Part1",
"Basic",
"CAM-MILL-EDM-MILL-IM",
"12-7-3-6-9",
"Design"
],
[
null,
null,
null,
null,
"Part2",
"Basic",
"CAM-MILL-EDM-CAM-IM",
"20-14-9-3-12",
"Design"
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
]
] ]
} ]
}
\ No newline at end of file
dream/simulation/GUI/PartJobShop.py
View file @ 39dbf389
...@@ -8,7 +8,7 @@ from datetime import datetime ...@@ -8,7 +8,7 @@ from datetime import datetime
from dream.simulation.GUI import ACO from dream.simulation.GUI import ACO
from dream.simulation.GUI.Default import schema from dream.simulation.GUI.Default import schema
MACHINE_TYPE_SET = set(["Dream.MachineManagedJob"]) MACHINE_TYPE_SET = set(["Dream.MachineManagedJob", "Dream.MouldAssembly"])
class Simulation(ACO.Simulation): class Simulation(ACO.Simulation):
def getConfigurationDict(self): def getConfigurationDict(self):
...@@ -21,6 +21,14 @@ class Simulation(ACO.Simulation): ...@@ -21,6 +21,14 @@ class Simulation(ACO.Simulation):
"_class": 'Dream.MachineManagedJob', "_class": 'Dream.MachineManagedJob',
"name": 'Machine' "name": 'Machine'
} }
conf["Dream-MouldAssembly"] = {
"property_list": [
schema["processingTime"],
schema["failures"]
],
"_class": 'Dream.MouldAssembly',
"name": 'MouldAss'
}
conf["Dream-QueueManagedJob"] = { conf["Dream-QueueManagedJob"] = {
"property_list": [ "property_list": [
schema["capacity"], schema["capacity"],
...@@ -63,7 +71,7 @@ class Simulation(ACO.Simulation): ...@@ -63,7 +71,7 @@ class Simulation(ACO.Simulation):
conf["Dream-Configuration"]["gui"]["job_schedule_spreadsheet"] = 1 conf["Dream-Configuration"]["gui"]["job_schedule_spreadsheet"] = 1
conf["Dream-Configuration"]["gui"]["job_gantt"] = 1 conf["Dream-Configuration"]["gui"]["job_gantt"] = 1
#conf["Dream-Configuration"]["gui"]["debug_json"] = 1 conf["Dream-Configuration"]["gui"]["debug_json"] = 1
# remove tools that does not make sense here # remove tools that does not make sense here
conf.pop('Dream-Machine') conf.pop('Dream-Machine')
...@@ -131,6 +139,13 @@ class Simulation(ACO.Simulation): ...@@ -131,6 +139,13 @@ class Simulation(ACO.Simulation):
route["prerequisites"] = prerequisite_list route["prerequisites"] = prerequisite_list
route_list.append(route) route_list.append(route)
route_counter += 1 route_counter += 1
"""
if sequence_step == "IM":
route_counter += 1
route_list.append({"stationIdsList": ["E1"],
"stepNumber": "%i" % route_counter})
route_counter += 1
"""
return route_list return route_list
def getListFromString(self, my_string): def getListFromString(self, my_string):
...@@ -198,12 +213,20 @@ class Simulation(ACO.Simulation): ...@@ -198,12 +213,20 @@ class Simulation(ACO.Simulation):
processing_time_list = processing_time_list.split('-') processing_time_list = processing_time_list.split('-')
component_dict = {} component_dict = {}
component_dict["_class"] = "Dream.OrderComponent" component_dict["_class"] = "Dream.OrderComponent"
if part_type == "Mould":
component_dict["_class"] = "Dream.Mould"
component_dict["componentType"] = part_type component_dict["componentType"] = part_type
component_dict["id"] = "%i" % i # XXX hack, we use it in UI to retrieve spreadsheet line component_dict["id"] = "%i" % i # XXX hack, we use it in UI to retrieve spreadsheet line
component_dict["name"] = part component_dict["name"] = part
component_list.append(component_dict) component_list.append(component_dict)
route_list = self.getRouteList(sequence_list, processing_time_list, route_list = self.getRouteList(sequence_list, processing_time_list,
prerequisite_list) prerequisite_list)
if part_type == "Mould":
route_list = route_list[1:]
counter = 0
for route in route_list:
route["stepNumber"] = "%i" % counter
counter += 1
component_dict["route"] = route_list component_dict["route"] = route_list
i+=1 i+=1
order_dict["componentsList"] = component_list order_dict["componentsList"] = component_list
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7