another 2 topologies updated

cd92aa95 · Georgios Dagkakis · Ioannis Papagiannopoulos · d8d5506b · cd92aa95 · cd92aa95
Commit cd92aa95 authored Dec 23, 2014 by Georgios Dagkakis Committed by Ioannis Papagiannopoulos Jan 06, 2015
Showing with 16 additions and 11 deletions

dream/simulation/JSONInputs/Topology24.json dream/simulation/JSONInputs/Topology24.json +6 -4

dream/simulation/JSONInputs/Topology25.json dream/simulation/JSONInputs/Topology25.json +10 -7

No files found.
--- a/dream/simulation/JSONInputs/Topology24.json
+++ b/dream/simulation/JSONInputs/Topology24.json
@@ -26,8 +26,9 @@
               "M1": {
                    "name": "Machine1", 
                    "scrapQuantity": {
-                         "distributionType": "Fixed", 
-                         "mean": "2"
+                         "Fixed": {
+                              "mean": 2.0
+                         }
                    }, 
                    "processingTime": {
                         "Fixed": {
@@ -41,8 +42,9 @@
               "M2": {
                    "name": "Machine2", 
                    "scrapQuantity": {
-                         "distributionType": "Fixed", 
-                         "mean": "2"
+                         "Fixed": {
+                              "mean": 2.0
+                         }
                    }, 
                    "processingTime": {
                         "Fixed": {

--- a/dream/simulation/JSONInputs/Topology25.json
+++ b/dream/simulation/JSONInputs/Topology25.json
@@ -57,8 +57,9 @@
                    "name": "Station1", 
                    "top": 0.5909090909090908, 
                    "scrapQuantity": {
-                         "distributionType": "Fixed", 
-                         "mean": "1"
+                         "Fixed": {
+                              "mean": 1.0
+                         }
                    }, 
                    "processingTime": {
                         "Fixed": {
@@ -74,8 +75,9 @@
                    "name": "Station3", 
                    "top": 0.5909090909090908, 
                    "scrapQuantity": {
-                         "distributionType": "Fixed", 
-                         "mean": "2"
+                         "Fixed": {
+                              "mean": 2.0
+                         }
                    }, 
                    "processingTime": {
                         "Fixed": {
@@ -91,9 +93,10 @@
                    "name": "Station2", 
                    "top": 0.5909090909090908, 
                    "scrapQuantity": {
-                         "distributionType": "Fixed", 
-                         "mean": "1"
-                    }, 
+                         "Fixed": {
+                              "mean": 1.0
+                         }                    
+					}, 
                    "processingTime": {
                         "Fixed": {
                              "mean": 0.2