two updates

c72c5719 · Georgios Dagkakis · Jérome Perrin · 56d7efe1 · c72c5719 · c72c5719
Commit c72c5719 authored Dec 23, 2014 by Georgios Dagkakis Committed by Jérome Perrin Feb 04, 2015
2 changed files
--- a/dream/simulation/JSONInputs/BOMOpsMachineWip1.json
+++ b/dream/simulation/JSONInputs/BOMOpsMachineWip1.json
@@ -61,8 +61,9 @@
                         {
                              "id": "C3", 
                              "remainingProcessingTime": {
-                                   "distributionType": "Fixed", 
+                                   "Fixed":{ 
 										"mean": 0.1
+								   }
                              }, 
                              "sequence": "4"
                         }
@@ -160,9 +161,12 @@
                                   {
                                        "operator": "O1", 
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": 1.0
+											"Fixed": {
+												"mean": 1
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "M0"
@@ -192,9 +196,12 @@
                                   {
                                        "operator": "O1", 
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": "2"
+											"Fixed": {
+												"mean": 2
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "M1", 
@@ -237,9 +244,12 @@
                                   {
                                        "operator": "O1", 
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": "1"
+											"Fixed": {
+												"mean": 1
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "M1", 
@@ -282,9 +292,12 @@
                                   {
                                        "operator": "O1", 
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": "3"
+											"Fixed": {
+												"mean": 3
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "M1", 
@@ -318,9 +331,12 @@
                                   {
                                        "operator": "O2", 
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": "1"
+											"Fixed": {
+												"mean": 1
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "MA1"

--- a/dream/simulation/JSONInputs/JobShopOperationDefiningEntities1.json
+++ b/dream/simulation/JSONInputs/JobShopOperationDefiningEntities1.json
@@ -15,9 +15,12 @@
                                   }, 
                                   {
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": 1.0
+											"Fixed": {
+												"mean": 1
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "M1"
@@ -30,9 +33,12 @@
                                   }, 
                                   {
                                        "processingTime": {
-                                             "operationType": 0, 
-                                             "distributionType": "Fixed", 
-                                             "mean": 3.0
+											"Fixed": {
+												"mean": 3
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 0
 										}, 
                                        "stationIdsList": [
                                             "M3"
@@ -45,9 +51,12 @@
                                   }, 
                                   {
                                        "processingTime": {
-                                             "operationType": 1, 
-                                             "distributionType": "Fixed", 
-                                             "mean": 2.0
+											"Fixed": {
+												"mean": 2
+											}
+                                        }, 
+										"operationType": {
+											"Processing": 1
 										}, 
                                        "stationIdsList": [
                                             "M2"