Topology47 added. Tests what happens if there is competion for one operator....

Topology47 added. Tests what happens if there is competion for one operator. Dumps46 updated and dump47 added. To be checked

Topology47 added. Tests what happens if there is competion for one operator....
Topology47 added. Tests what happens if there is competion for one operator. Dumps46 updated and dump47 added. To be checked
8a6b0745 · Georgios Dagkakis · Jérome Perrin · e1216020 · 8a6b0745 · 8a6b0745
Commit 8a6b0745 authored Feb 04, 2014 by Georgios Dagkakis Committed by Jérome Perrin Feb 07, 2014
3 changed files
--- a/dream/simulation/JSONInputs/Topology47.json
+++ b/dream/simulation/JSONInputs/Topology47.json
+{
+    "_class": "Dream.Simulation",
+    "edges": {},
+    "general": {
+        "_class": "Dream.Configuration",
+        "numberOfReplications": "1",
+        "maxSimTime": "-1",
+        "trace": "Yes",
+        "confidenceLevel": "0.95"
+    },
+    "nodes": {
+        "M1": {
+            "_class": "Dream.MachineManagedJob",
+            "id": "M1",
+            "name": "Machine1",
+            "operationType": "MT-Load-Setup"
+        },
+        "M2": {
+            "_class": "Dream.MachineManagedJob",
+            "id": "M2",
+            "name": "Machine2",
+            "operationType": "MT-Load-Setup"
+        },
+        "Q1": {
+            "_class": "Dream.QueueManagedJob",
+            "id": "Q1",
+            "name": "Queue1",
+            "isDummy": "0",
+            "capacity": "-1",
+            "wip": [
+                {
+                    "_class": "Dream.Order",
+                    "id": "Or1",
+                    "name": "Order1",
+                    "isCritical": "1",
+                    "manager": "O1",
+                    "route": [
+                        {
+                            "stepNumber": "0",
+                            "stationIdsList": [
+                                "Q1"
+                            ]
+                        },
+                        {
+                            "stepNumber": "1",
+                            "stationIdsList": [
+                                "M1"
+                            ],
+                            "processingTime": {
+                                "distributionType": "Fixed",
+                                "mean": "0.25"
+                            },
+                            "setupTime": {
+                                "setupDistribution": "Fixed",
+                                "setupMean": "0.5"
+                            }
+                        },
+                        {
+                            "stepNumber": "2",
+                            "stationIdsList": [
+                                "Q2"
+                            ]
+                        },
+                        {
+                            "stepNumber": "3",
+                            "stationIdsList": [
+                                "M2"
+                            ],
+                            "processingTime": {
+                                "distributionType": "Fixed",
+                                "mean": "1"
+                            }
+                        },
+                        {
+                            "stepNumber": "4",
+                            "stationIdsList": [
+                                "E1"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        "Q2": {
+            "_class": "Dream.QueueManagedJob",
+            "id": "Q2",
+            "name": "Queue2",
+            "isDummy": "0",
+            "capacity": "-1",
+            "wip": [
+                {
+                    "_class": "Dream.Order",
+                    "id": "Or2",
+                    "name": "Order2",
+                    "isCritical": "0",
+                    "manager": "O1",
+                    "route": [
+                        {
+                            "stepNumber": "0",
+                            "stationIdsList": [
+                                "Q2"
+                            ]
+                        },
+                        {
+                            "stepNumber": "1",
+                            "stationIdsList": [
+                                "M2"
+                            ],
+                            "processingTime": {
+                                "distributionType": "Fixed",
+                                "mean": "1"
+                            },
+                            "setupTime": {
+                                "setupDistribution": "Fixed",
+                                "setupMean": "0.5"
+                            }
+                        },
+                        {
+                            "stepNumber": "2",
+                            "stationIdsList": [
+                                "E1"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        "E1": {
+            "_class": "Dream.ExitJobShop",
+            "id": "E1",
+            "name": "Stock"
+        },
+        "O1": {
+            "_class": "Dream.Operator",
+            "capacity": "1",
+            "name": "Operator1"
+        }
+    }
+}
\ No newline at end of file
--- a/dream/tests/dump/Topology46.json.result
+++ b/dream/tests/dump/Topology46.json.result
@@ -14,10 +14,11 @@
   "id": "M1", 
   "results": {
    "working_ratio": 5.555555555555555, 
-    "waiting_ratio": 94.44444444444444, 
    "blockage_ratio": 0.0, 
-    "failure_ratio": 0.0, 
-    "setup_ratio": 0.0
+    "waiting_ratio": 94.44444444444444, 
+    "setup_ratio": 0.0, 
+    "load_ratio": 0.0, 
+    "failure_ratio": 0.0
   }
  }, 
  {
@@ -25,10 +26,11 @@
   "id": "M2", 
   "results": {
    "working_ratio": 44.44444444444444, 
-    "waiting_ratio": 0.0, 
    "blockage_ratio": 0.0, 
-    "failure_ratio": 0.0, 
-    "setup_ratio": 55.55555555555556
+    "waiting_ratio": 0.0, 
+    "setup_ratio": 55.55555555555556, 
+    "load_ratio": 0.0, 
+    "failure_ratio": 0.0
   }
  }, 
  {

--- a/dream/tests/dump/Topology47.json.result
+++ b/dream/tests/dump/Topology47.json.result
+{
+ "elementList": [
+  {
+   "_class": "Dream.Exit", 
+   "id": "E1", 
+   "results": {
+    "throughput": 2, 
+    "takt_time": 1.5, 
+    "lifespan": 2.5
+   }
+  }, 
+  {
+   "_class": "Dream.Machine", 
+   "id": "M1", 
+   "results": {
+    "working_ratio": 8.333333333333334, 
+    "blockage_ratio": 0.0, 
+    "waiting_ratio": 75.0, 
+    "setup_ratio": 16.666666666666668, 
+    "load_ratio": 0.0, 
+    "failure_ratio": 0.0
+   }
+  }, 
+  {
+   "_class": "Dream.Machine", 
+   "id": "M2", 
+   "results": {
+    "working_ratio": 66.66666666666667, 
+    "blockage_ratio": 0.0, 
+    "waiting_ratio": 16.666666666666668, 
+    "setup_ratio": 16.666666666666668, 
+    "load_ratio": 0.0, 
+    "failure_ratio": 0.0
+   }
+  }, 
+  {
+   "_class": "Dream.Operator", 
+   "id": "O1", 
+   "results": {
+    "working_ratio": 33.333333333333336, 
+    "waiting_ratio": 66.66666666666667
+   }
+  }, 
+  {
+   "_class": "Dream.QueueManagedJob", 
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
+  }, 
+  {
+   "_class": "Dream.QueueManagedJob", 
+   "id": "Q2", 
+   "schedulingRule": "FIFO"
+  }
+ ], 
+ "_class": "Dream.Simulation", 
+ "general": {
+  "_class": "Dream.Configuration"
+ }
+}
\ No newline at end of file