Skip to content

dream
dream
Commit 66401eb4 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

JobShop: rearrange tabs to follow the logic flow of using the SW

parent 4fd106ac
Show whitespace changes
Inline Side-by-side
Showing with 118815 additions and 118703 deletions
dream/simulation/Examples/GUI_models/BOMOpsComplex2orders.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Debug JSON",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,16 +157,19 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultList",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -193,6 +200,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -227,6 +235,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -301,6 +310,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersACO.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Debug JSON",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,16 +157,19 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultList",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -193,6 +200,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -227,6 +235,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -301,6 +310,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersACOcomparison.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Edit Configuration",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,17 +157,20 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultComparison",
"output_id": "order_lateness",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -194,6 +201,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -228,6 +236,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -302,6 +311,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersACOcomparisonKE.json
View file @ 66401eb4
......@@ -91,16 +91,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Edit Configuration",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -121,6 +124,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -159,17 +163,20 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultComparison",
"output_id": "order_lateness",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -200,6 +207,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -234,6 +242,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -308,6 +317,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersACOcomparisonWIP.json
View file @ 66401eb4
......@@ -85,11 +85,13 @@
"input": {
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -110,6 +112,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -148,17 +151,20 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultComparison",
"output_id": "order_lateness",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -189,6 +195,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -223,6 +230,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -297,6 +305,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersACOcomparisonWIPfullShifts.json
View file @ 66401eb4
......@@ -85,11 +85,13 @@
"input": {
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -110,6 +112,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -148,17 +151,20 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultComparison",
"output_id": "order_lateness",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -189,6 +195,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -223,6 +230,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -297,6 +305,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersWIPAssmJustEnded.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Debug JSON",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,16 +157,19 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultList",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -193,6 +200,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -227,6 +235,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -301,6 +310,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersWIPDesignJustCompleted.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Debug JSON",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,16 +157,19 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultList",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -193,6 +200,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -227,6 +235,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -301,6 +310,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersWIPSetupJustCompl.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Debug JSON",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,16 +157,19 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultList",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -193,6 +200,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -227,6 +235,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -301,6 +310,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/Examples/GUI_models/BOMOpsComplex2ordersWIPSetupWIP.json
View file @ 66401eb4
......@@ -85,16 +85,19 @@
"input": {
"debug": {
"gadget": "Input_viewDebugJson",
"priority": 1,
"title": "Debug JSON",
"type": "object_view"
},
"view": {
"gadget": "Input_viewProductionLine",
"priority": 9,
"title": "Production Line",
"type": "object_view"
},
"view_management": {
"gadget": "Input_viewDocumentManagement",
"priority": 3,
"title": "Manage document",
"type": "object_view"
},
......@@ -115,6 +118,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 7,
"title": "Operator Skills",
"type": "object_view"
},
......@@ -153,16 +157,19 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 10,
"title": "Production Orders Spreadsheet",
"type": "object_view"
},
"view_result": {
"gadget": "Input_viewResultList",
"priority": 2,
"title": "Results",
"type": "object_view"
},
"view_run_simulation": {
"gadget": "Input_viewSimulation",
"priority": 4,
"title": "Run Simulation",
"type": "object_view"
},
......@@ -193,6 +200,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 6,
"title": "Operators and Machine Shift Spreadsheet",
"type": "object_view"
},
......@@ -227,6 +235,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 5,
"title": "WIP Spreadsheet",
"type": "object_view"
},
......@@ -301,6 +310,7 @@
]
},
"gadget": "Input_viewSpreadsheet",
"priority": 8,
"title": "Workplan Spreadsheet",
"type": "object_view"
}
......
dream/simulation/reformat.py
View file @ 66401eb4
......@@ -124,9 +124,23 @@ def migrate_to_new_format(graph):
with open(sys.argv[1]) as infile:
m = json.load(infile)
m = migrate_to_new_format(m)
#m = migrate_to_new_format(m)
#m.update(preferences=positionGraph(m))
m['application_configuration']['input']['view_production_orders_spreadsheet']['priority'] = 10
m['application_configuration']['input']['view']['priority'] = 9
m['application_configuration']['input']['view_workplan_spreadsheet']['priority'] = 8
m['application_configuration']['input']['view_operator_skills_spreadsheet']['priority'] = 7
m['application_configuration']['input']['view_shift_spreadsheet']['priority'] = 6
m['application_configuration']['input']['view_wip_spreadsheet']['priority'] = 5
m['application_configuration']['input']['view_run_simulation']['priority'] = 4
m['application_configuration']['input']['view_management']['priority'] = 3
m['application_configuration']['input']['view_result']['priority'] = 2
if 'debug' in m['application_configuration']['input']:
m['application_configuration']['input']['debug']['priority'] = 1
m['application_configuration']['input']['debug']['name'] = "Edit Configuration"
with open(sys.argv[1], "w") as outfile:
json.dump(m, outfile, sort_keys=True,
indent=4, separators=(',', ': '))
......
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