Commit 25ef2bd9 authored by Georgios Dagkakis's avatar Georgios Dagkakis

batchModel updated

parent 620c3239
...@@ -286,16 +286,16 @@ ...@@ -286,16 +286,16 @@
"type": "object_view", "type": "object_view",
"title": "Machine Shifts Spreadsheet" "title": "Machine Shifts Spreadsheet"
}, },
"view_result": {
"gadget": "Input_viewResultList",
"type": "object_view",
"title": "Results"
},
"view_run_simulation": { "view_run_simulation": {
"gadget": "Input_viewSimulation", "gadget": "Input_viewSimulation",
"type": "object_view", "type": "object_view",
"title": "Run Simulation" "title": "Run Simulation"
}, },
"view_result": {
"gadget": "Input_viewResultList",
"type": "object_view",
"title": "Results"
},
"view": { "view": {
"gadget": "Input_viewProductionLine", "gadget": "Input_viewProductionLine",
"type": "object_view", "type": "object_view",
...@@ -491,25 +491,16 @@ ...@@ -491,25 +491,16 @@
}, },
"_class": "Dream.BatchScrapMachine" "_class": "Dream.BatchScrapMachine"
}, },
"B9": { "B4": {
"coordinate": { "coordinate": {
"top": 0.7565175398133711, "top": 0.24087466145736686,
"left": 0.21072871541220164 "left": 0.5187142701900398
}, },
"_class": "Dream.Queue", "_class": "Dream.LineClearance",
"capacity": 4, "capacity": 2,
"name": "B9", "name": "B4",
"schedulingRule": "FIFO" "schedulingRule": "FIFO"
}, },
"St7D": {
"coordinate": {
"top": 0.7640847057948053,
"left": 0.6385832092381459
},
"_class": "Dream.BatchDecomposition",
"numberOfSubBatches": 8,
"name": "St7_D"
},
"St2M1": { "St2M1": {
"interruption": { "interruption": {
"failure": "" "failure": ""
...@@ -707,6 +698,15 @@ ...@@ -707,6 +698,15 @@
"_class": "Dream.BatchScrapMachine", "_class": "Dream.BatchScrapMachine",
"id": "St1M1" "id": "St1M1"
}, },
"BRB": {
"coordinate": {
"top": 0.22001598561825875,
"left": 0.732266858260719
},
"_class": "Dream.BatchReassembly",
"numberOfSubBatches": 4,
"name": "BRB"
},
"St8RA": { "St8RA": {
"coordinate": { "coordinate": {
"top": 0.5350013587825962, "top": 0.5350013587825962,
...@@ -794,15 +794,14 @@ ...@@ -794,15 +794,14 @@
"_class": "Dream.BatchSource", "_class": "Dream.BatchSource",
"id": "Dream.BatchSource1" "id": "Dream.BatchSource1"
}, },
"B4": { "St7D": {
"coordinate": { "coordinate": {
"top": 0.24087466145736686, "top": 0.7640847057948053,
"left": 0.5187142701900398 "left": 0.6385832092381459
}, },
"_class": "Dream.LineClearance", "_class": "Dream.BatchDecomposition",
"capacity": 2, "numberOfSubBatches": 8,
"name": "B4", "name": "St7_D"
"schedulingRule": "FIFO"
}, },
"B7": { "B7": {
"coordinate": { "coordinate": {
...@@ -855,14 +854,15 @@ ...@@ -855,14 +854,15 @@
"name": "B8", "name": "B8",
"schedulingRule": "FIFO" "schedulingRule": "FIFO"
}, },
"BRB": { "B9": {
"coordinate": { "coordinate": {
"top": 0.22001598561825875, "top": 0.7565175398133711,
"left": 0.732266858260719 "left": 0.21072871541220164
}, },
"_class": "Dream.BatchReassembly", "_class": "Dream.Queue",
"numberOfSubBatches": 4, "capacity": 4,
"name": "BRB" "name": "B9",
"schedulingRule": "FIFO"
}, },
"BRA": { "BRA": {
"coordinate": { "coordinate": {
...@@ -875,190 +875,190 @@ ...@@ -875,190 +875,190 @@
} }
}, },
"edge": { "edge": {
"con_459": { "con_1497": {
"destination": "St2M0", "source": "St8M0",
"_class": "Dream.Edge", "destination": "St8RA",
"source": "B2" "_class": "Dream.Edge"
}, },
"con_1043": { "con_1043": {
"source": "B8",
"destination": "St4M0", "destination": "St4M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B8"
}, },
"con_1001": { "con_1001": {
"source": "St3M0",
"destination": "B8", "destination": "B8",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St3M0"
}, },
"con_1121": { "con_1121": {
"source": "B9",
"destination": "St5M0", "destination": "St5M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B9"
}, },
"con_1229": { "con_1229": {
"source": "St5M0",
"destination": "B10", "destination": "B10",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St5M0"
}, },
"con_57": { "con_1401": {
"destination": "BDB", "source": "St7D",
"_class": "Dream.Edge", "destination": "St7M0",
"source": "Dream.BatchSource1" "_class": "Dream.Edge"
}, },
"con_581": { "con_581": {
"source": "St0M1",
"destination": "B3", "destination": "B3",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St0M1"
}, },
"con_87": { "con_87": {
"source": "BDA",
"destination": "St0M0", "destination": "St0M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "BDA"
}, },
"con_1479": { "con_1479": {
"source": "St8M1",
"destination": "St8RB", "destination": "St8RB",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St8M1"
}, },
"con_861": { "con_861": {
"source": "BRB",
"destination": "B7", "destination": "B7",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "BRB"
}, },
"con_1377": { "con_1377": {
"source": "B11",
"destination": "St7D", "destination": "St7D",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B11"
}, },
"con_1293": { "con_1293": {
"source": "B10",
"destination": "St6M1", "destination": "St6M1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B10"
}, },
"con_1351": { "con_1351": {
"source": "St6M0",
"destination": "B11", "destination": "B11",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St6M0"
}, },
"con_513": { "con_513": {
"source": "St2M0",
"destination": "BRA", "destination": "BRA",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St2M0"
}, },
"con_1159": { "con_1159": {
"source": "B9",
"destination": "St5M1", "destination": "St5M1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B9"
}, },
"con_1193": { "con_1193": {
"source": "St5M1",
"destination": "B10", "destination": "B10",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St5M1" },
"con_1509": {
"source": "St8RB",
"destination": "Dream.Exit1",
"_class": "Dream.Edge"
}, },
"con_1261": { "con_1261": {
"source": "B10",
"destination": "St6M0", "destination": "St6M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B10"
}, },
"con_273": { "con_273": {
"source": "St0M0",
"destination": "B1", "destination": "B1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St0M0"
}, },
"con_1497": { "con_459": {
"destination": "St8RA", "source": "B2",
"_class": "Dream.Edge", "destination": "St2M0",
"source": "St8M0" "_class": "Dream.Edge"
}, },
"con_645": { "con_645": {
"source": "B3",
"destination": "St1M1", "destination": "St1M1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B3"
}, },
"con_705": { "con_705": {
"source": "St1M1",
"destination": "B4", "destination": "B4",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St1M1"
}, },
"con_761": { "con_761": {
"source": "B4",
"destination": "St2M1", "destination": "St2M1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B4"
}, },
"con_339": { "con_339": {
"source": "B1",
"destination": "St1M0", "destination": "St1M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B1"
}, },
"con_71": { "con_71": {
"source": "BDB",
"destination": "St0M1", "destination": "St0M1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "BDB"
},
"con_1523": {
"destination": "Dream.Exit1",
"_class": "Dream.Edge",
"source": "St8RA"
}, },
"con_1423": { "con_1423": {
"source": "St7M0",
"destination": "B12", "destination": "B12",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St7M0"
}, },
"con_957": { "con_957": {
"source": "B7",
"destination": "St3M0", "destination": "St3M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B7"
}, },
"con_1321": { "con_1321": {
"source": "St6M1",
"destination": "B11", "destination": "B11",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St6M1"
}, },
"con_39": { "con_39": {
"source": "Dream.BatchSource1",
"destination": "BDA", "destination": "BDA",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "Dream.BatchSource1"
}, },
"con_1509": { "con_1523": {
"source": "St8RA",
"destination": "Dream.Exit1", "destination": "Dream.Exit1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St8RB"
}, },
"con_1401": { "con_57": {
"destination": "St7M0", "source": "Dream.BatchSource1",
"_class": "Dream.Edge", "destination": "BDB",
"source": "St7D" "_class": "Dream.Edge"
}, },
"con_1443": { "con_1443": {
"source": "B12",
"destination": "St8M0", "destination": "St8M0",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B12"
}, },
"con_1463": { "con_1463": {
"source": "B12",
"destination": "St8M1", "destination": "St8M1",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "B12"
}, },
"con_1083": { "con_1083": {
"source": "St4M0",
"destination": "B9", "destination": "B9",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St4M0"
}, },
"con_813": { "con_813": {
"source": "St2M1",
"destination": "BRB", "destination": "BRB",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St2M1"
}, },
"con_401": { "con_401": {
"source": "St1M0",
"destination": "B2", "destination": "B2",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "St1M0"
}, },
"con_911": { "con_911": {
"source": "BRA",
"destination": "B7", "destination": "B7",
"_class": "Dream.Edge", "_class": "Dream.Edge"
"source": "BRA"
} }
} }
}, },
...@@ -1067,12 +1067,12 @@ ...@@ -1067,12 +1067,12 @@
"trace": "No", "trace": "No",
"ke_url": "http://git.erp5.org/gitweb/dream.git/blob_plain/HEAD:/dream/KnowledgeExtraction/Mockup_Processingtimes.xls", "ke_url": "http://git.erp5.org/gitweb/dream.git/blob_plain/HEAD:/dream/KnowledgeExtraction/Mockup_Processingtimes.xls",
"processTimeout": 10, "processTimeout": 10,
"timeUnitPerDay": 24,
"seed": 1, "seed": 1,
"confidenceLevel": 0.95, "timeUnitPerDay": 24,
"maxSimTime": 5000, "maxSimTime": 5000,
"currentDate": "2014/02/18 11:00", "currentDate": "2014/02/18 11:00",
"throughputTarget": 10 "throughputTarget": 10,
"confidenceLevel": 0.95
}, },
"class_definition": { "class_definition": {
"node": { "node": {
...@@ -1424,6 +1424,7 @@ ...@@ -1424,6 +1424,7 @@
}, },
"batchNumberOfUnits": { "batchNumberOfUnits": {
"required": true, "required": true,
"type": "number",
"description": "the number of units of the created batches", "description": "the number of units of the created batches",
"name": "Number Of Units" "name": "Number Of Units"
}, },
...@@ -1463,6 +1464,7 @@ ...@@ -1463,6 +1464,7 @@
} }
], ],
"type": "number", "type": "number",
"name": "Capacity",
"description": "capacity of the queue. -1 means infinite" "description": "capacity of the queue. -1 means infinite"
}, },
"_failureDist": { "_failureDist": {
...@@ -1488,20 +1490,14 @@ ...@@ -1488,20 +1490,14 @@
] ]
}, },
"_operationType": { "_operationType": {
"properties": {
"operationType": {
"enum": [ "enum": [
"MT-Load", "MT-Load",
"MT-Load-Setup", "MT-Load-Setup",
"MT-Load-Setup-Processing" "MT-Load-Setup-Processing"
], ],
"type": "string" "type": "string",
}
},
"_class": "Dream.PropertyList",
"description": "the type of operations that are performed manually in the machine", "description": "the type of operations that are performed manually in the machine",
"name": "Operation type", "name": "Operation type"
"id": "operationType"
}, },
"_dist": { "_dist": {
"allOf": [ "allOf": [
...@@ -1771,6 +1767,7 @@ ...@@ -1771,6 +1767,7 @@
"WT" "WT"
], ],
"type": "string", "type": "string",
"name": "Scheduling Rule",
"description": "Scheduling Rule of this buffer" "description": "Scheduling Rule of this buffer"
} }
}, },
...@@ -1928,20 +1925,6 @@ ...@@ -1928,20 +1925,6 @@
null null
] ]
], ],
"operator_shift_spreadsheet": [
[
"Date",
"Product Builder",
"Start",
"Stop"
],
[
null,
null,
null,
null
]
],
"machine_shift_spreadsheet": [ "machine_shift_spreadsheet": [
[ [
"Date", "Date",
...@@ -2010,6 +1993,20 @@ ...@@ -2010,6 +1993,20 @@
"" ""
] ]
], ],
"operator_shift_spreadsheet": [
[
"Date",
"Product Builder",
"Start",
"Stop"
],
[
null,
null,
null,
null
]
],
"operator_skill_spreadsheet": [ "operator_skill_spreadsheet": [
[ [
"Product Builder", "Product Builder",
......
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