dump updated. new topology where entities define the type of operation (manual/automatic)

4460032e · Ioannis Papagiannopoulos · Jérome Perrin · 89f5dd4c · 4460032e · 4460032e
Commit 4460032e authored Sep 15, 2014 by Ioannis Papagiannopoulos Committed by Jérome Perrin Feb 04, 2015
2 changed files
--- a/dream/simulation/JSONInputs/JobShopOperationDefiningEntities1.json
+++ b/dream/simulation/JSONInputs/JobShopOperationDefiningEntities1.json
+{
+    "_class": "Dream.Simulation",
+    "edges": {
+        "0": [
+            "O1",
+            "OP1",
+            {}
+        ],
+        "1": [
+            "O2",
+            "OP1",
+            {}
+        ],
+        "2": [
+            "OP1",
+            "M1",
+            {}
+        ],
+        "3": [
+            "OP1",
+            "M2",
+            {}
+        ],
+        "4": [
+            "OP1",
+            "M3",
+            {}
+        ]
+    },
+    "general": {
+        "_class": "Dream.Configuration",
+        "confidenceLevel": "0.95",
+        "maxSimTime": "-1",
+        "numberOfReplications": "1",
+        "trace": "No",
+		"console": "No"
+    },
+    "nodes": {
+        "E1": {
+            "_class": "Dream.ExitJobShop",
+            "name": "Exit"
+        },
+        "M1": {
+            "_class": "Dream.MachineJobShop",
+            "name": "Machine1",
+            "operationType": "Load"
+        },
+        "M2": {
+            "_class": "Dream.MachineJobShop",
+            "name": "Machine2",
+            "operationType": "Load"
+        },
+        "M3": {
+            "_class": "Dream.MachineJobShop",
+            "name": "Machine3",
+            "operationType": "Load"
+        },
+        "O1": {
+            "_class": "Dream.Operator",
+            "capacity": 1,
+            "name": "Operator1"
+        },
+        "O2": {
+            "_class": "Dream.Operator",
+            "capacity": 1,
+            "name": "Operator2"
+        },
+        "OP1": {
+            "_class": "Dream.OperatorPool",
+            "capacity": 1,
+            "name": "Operator Pool 1"
+        },
+        "Q1": {
+            "_class": "Dream.QueueJobShop",
+            "capacity": 1000,
+            "isDummy": "0",
+            "name": "Queue1",
+            "wip": [
+                {
+                    "_class": "Dream.Job",
+                    "id": "J1",
+                    "name": "Job1",
+                    "route": [
+                        {
+                            "stationIdsList": [
+                                "Q1"
+                            ]
+                        },
+                        {
+                            "processingTime": {
+                                "distributionType": "Fixed",
+                                "mean": 1.0,
+								"operationType": 1
+                            },
+                            "stationIdsList": [
+                                "M1"
+                            ]
+                        },
+                        {
+                            "stationIdsList": [
+                                "Q3"
+                            ]
+                        },
+                        {
+                            "processingTime": {
+                                "distributionType": "Fixed",
+                                "mean": 3.0,
+								"operationType": 0
+                            },
+                            "stationIdsList": [
+                                "M3"
+                            ]
+                        },
+                        {
+                            "stationIdsList": [
+                                "Q2"
+                            ]
+                        },
+                        {
+                            "processingTime": {
+                                "distributionType": "Fixed",
+                                "mean": 2.0,
+								"operationType": 1
+                            },
+                            "stationIdsList": [
+                                "M2"
+                            ]
+                        },
+                        {
+                            "stationIdsList": [
+                                "E1"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        "Q2": {
+            "_class": "Dream.QueueJobShop",
+            "capacity": 1000,
+            "id": "Q2",
+            "isDummy": "0",
+            "name": "Queue2"
+        },
+        "Q3": {
+            "_class": "Dream.QueueJobShop",
+            "capacity": 1000,
+            "isDummy": "0",
+            "name": "Queue3"
+        }
+    }
+}
\ No newline at end of file
--- a/dream/tests/dump/JobShopOperationDefiningEntities1.json.result
+++ b/dream/tests/dump/JobShopOperationDefiningEntities1.json.result
+{
+ "_class": "Dream.Simulation", 
+ "elementList": [
+  {
+   "_class": "Dream.ExitJobShop", 
+   "family": "Exit", 
+   "id": "E1", 
+   "results": {
+    "lifespan": 6.0, 
+    "takt_time": 6.0, 
+    "throughput": 1
+   }
+  }, 
+  {
+   "_class": "Dream.Job", 
+   "family": "Job", 
+   "id": "J1", 
+   "results": {
+    "completionTime": 6.0, 
+    "schedule": [
+     {
+      "entranceTime": 0, 
+      "stationId": "Q1"
+     }, 
+     {
+      "entranceTime": 0.0, 
+      "stationId": "M1"
+     }, 
+     {
+      "entranceTime": 1.0, 
+      "stationId": "Q3"
+     }, 
+     {
+      "entranceTime": 1.0, 
+      "stationId": "M3"
+     }, 
+     {
+      "entranceTime": 4.0, 
+      "stationId": "Q2"
+     }, 
+     {
+      "entranceTime": 4.0, 
+      "stationId": "M2"
+     }, 
+     {
+      "entranceTime": 6.0, 
+      "stationId": "E1"
+     }
+    ]
+   }
+  }, 
+  {
+   "_class": "Dream.MachineJobShop", 
+   "family": "Server", 
+   "id": "M1", 
+   "results": {
+    "blockage_ratio": 0.0, 
+    "failure_ratio": 0.0, 
+    "load_ratio": 0.0, 
+    "waiting_ratio": 83.33333333333333, 
+    "working_ratio": 16.666666666666668
+   }
+  }, 
+  {
+   "_class": "Dream.MachineJobShop", 
+   "family": "Server", 
+   "id": "M2", 
+   "results": {
+    "blockage_ratio": 0.0, 
+    "failure_ratio": 0.0, 
+    "load_ratio": 0.0, 
+    "waiting_ratio": 66.66666666666667, 
+    "working_ratio": 33.333333333333336
+   }
+  }, 
+  {
+   "_class": "Dream.MachineJobShop", 
+   "family": "Server", 
+   "id": "M3", 
+   "results": {
+    "blockage_ratio": 0.0, 
+    "failure_ratio": 0.0, 
+    "load_ratio": 0.0, 
+    "waiting_ratio": 50.0, 
+    "working_ratio": 50.0
+   }
+  }, 
+  {
+   "_class": "Dream.Operator", 
+   "family": "Operator", 
+   "id": "O1", 
+   "results": {
+    "waiting_ratio": 100.0, 
+    "working_ratio": 0.0
+   }
+  }, 
+  {
+   "_class": "Dream.Operator", 
+   "family": "Operator", 
+   "id": "O2", 
+   "results": {
+    "waiting_ratio": 50.0, 
+    "working_ratio": 50.0
+   }
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "family": "Buffer", 
+   "id": "Q1", 
+   "results": {}
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "family": "Buffer", 
+   "id": "Q2", 
+   "results": {}
+  }, 
+  {
+   "_class": "Dream.QueueJobShop", 
+   "family": "Buffer", 
+   "id": "Q3", 
+   "results": {}
+  }
+ ], 
+ "general": {
+  "_class": "Dream.Configuration"
+ }
+}
\ No newline at end of file