Topology26 updated according the new notation - agreement with ulbranch

e6a09767 · Ioannis Papagiannopoulos · Jérome Perrin · 41604f8a · e6a09767 · e6a09767
Commit e6a09767 authored Jan 14, 2014 by Ioannis Papagiannopoulos Committed by Jérome Perrin Jan 20, 2014
Showing with 72 additions and 24 deletions

dream/simulation/JSONInputs/Topology26.json dream/simulation/JSONInputs/Topology26.json +36 -12

dream/tests/dump/Topology26.json.result dream/tests/dump/Topology26.json.result +36 -12

No files found.
--- a/dream/simulation/JSONInputs/Topology26.json
+++ b/dream/simulation/JSONInputs/Topology26.json
@@ -84,7 +84,9 @@
                "distributionType": "Fixed", 
                "mean": "0"
              }, 
-              "stationId": "Q1", 
+              "stationIdsList": [
+              "Q1"
+              ], 
              "stepNumber": 0
            }, 
            {
@@ -92,7 +94,9 @@
                "distributionType": "Fixed", 
                "mean": "10"
              }, 
-              "stationId": "M1", 
+              "stationIdsList": [
+              "M1"
+              ], 
              "stepNumber": 1
            }, 
            {
@@ -100,7 +104,9 @@
                "distributionType": "Fixed", 
                "mean": "0"
              }, 
-              "stationId": "Q3", 
+              "stationIdsList": [
+              "Q3"
+              ], 
              "stepNumber": 2
            }, 
            {
@@ -108,7 +114,9 @@
                "distributionType": "Fixed", 
                "mean": "20"
              }, 
-              "stationId": "M3", 
+              "stationIdsList": [
+              "M3"
+              ], 
              "stepNumber": 3
            }
          ]
@@ -135,7 +143,9 @@
                "distributionType": "Fixed", 
                "mean": "0"
              }, 
-              "stationId": "Q2", 
+              "stationIdsList": [
+              "Q2"
+              ], 
              "stepNumber": 0
            }, 
            {
@@ -143,7 +153,9 @@
                "distributionType": "Fixed", 
                "mean": "20"
              }, 
-              "stationId": "M2", 
+              "stationIdsList": [
+              "M2"
+              ], 
              "stepNumber": 1
            }, 
            {
@@ -151,7 +163,9 @@
                "distributionType": "Fixed", 
                "mean": "0"
              }, 
-              "stationId": "Q1", 
+              "stationIdsList": [
+              "Q1"
+              ], 
              "stepNumber": 2
            }, 
            {
@@ -159,7 +173,9 @@
                "distributionType": "Fixed", 
                "mean": "34"
              }, 
-              "stationId": "M1", 
+              "stationIdsList": [
+              "M1"
+              ], 
              "stepNumber": 3
            }
          ]
@@ -186,7 +202,9 @@
                "distributionType": "Fixed", 
                "mean": "0"
              }, 
-              "stationId": "Q3", 
+              "stationIdsList": [
+              "Q3"
+              ], 
              "stepNumber": 0
            }, 
            {
@@ -194,7 +212,9 @@
                "distributionType": "Fixed", 
                "mean": "30"
              }, 
-              "stationId": "M3", 
+              "stationIdsList": [
+              "M3"
+              ], 
              "stepNumber": 1
            }, 
            {
@@ -202,7 +222,9 @@
                "distributionType": "Fixed", 
                "mean": "0"
              }, 
-              "stationId": "Q1", 
+              "stationIdsList": [
+              "Q1"
+              ], 
              "stepNumber": 2
            }, 
            {
@@ -210,7 +232,9 @@
                "distributionType": "Fixed", 
                "mean": "20"
              }, 
-              "stationId": "M1", 
+              "stationId": [
+              "M1"
+              ], 
              "stepNumber": 3
            }
          ]

--- a/dream/tests/dump/Topology26.json.result
+++ b/dream/tests/dump/Topology26.json.result
@@ -19,7 +19,9 @@
       "distributionType": "Fixed", 
       "mean": "0"
      }, 
-      "stationId": "Q1", 
+      "stationIdsList": [
+       "Q1"
+      ], 
      "stepNumber": 0
     }, 
     {
@@ -27,7 +29,9 @@
       "distributionType": "Fixed", 
       "mean": "10"
      }, 
-      "stationId": "M1", 
+      "stationIdsList": [
+       "M1"
+      ], 
      "stepNumber": 1
     }, 
     {
@@ -35,7 +39,9 @@
       "distributionType": "Fixed", 
       "mean": "0"
      }, 
-      "stationId": "Q3", 
+      "stationIdsList": [
+       "Q3"
+      ], 
      "stepNumber": 2
     }, 
     {
@@ -43,7 +49,9 @@
       "distributionType": "Fixed", 
       "mean": "20"
      }, 
-      "stationId": "M3", 
+      "stationIdsList": [
+       "M3"
+      ], 
      "stepNumber": 3
     }
    ], 
@@ -94,7 +102,9 @@
       "distributionType": "Fixed", 
       "mean": "0"
      }, 
-      "stationId": "Q2", 
+      "stationIdsList": [
+       "Q2"
+      ], 
      "stepNumber": 0
     }, 
     {
@@ -102,7 +112,9 @@
       "distributionType": "Fixed", 
       "mean": "20"
      }, 
-      "stationId": "M2", 
+      "stationIdsList": [
+       "M2"
+      ], 
      "stepNumber": 1
     }, 
     {
@@ -110,7 +122,9 @@
       "distributionType": "Fixed", 
       "mean": "0"
      }, 
-      "stationId": "Q1", 
+      "stationIdsList": [
+       "Q1"
+      ], 
      "stepNumber": 2
     }, 
     {
@@ -118,7 +132,9 @@
       "distributionType": "Fixed", 
       "mean": "34"
      }, 
-      "stationId": "M1", 
+      "stationIdsList": [
+       "M1"
+      ], 
      "stepNumber": 3
     }
    ], 
@@ -169,7 +185,9 @@
       "distributionType": "Fixed", 
       "mean": "0"
      }, 
-      "stationId": "Q3", 
+      "stationIdsList": [
+       "Q3"
+      ], 
      "stepNumber": 0
     }, 
     {
@@ -177,7 +195,9 @@
       "distributionType": "Fixed", 
       "mean": "30"
      }, 
-      "stationId": "M3", 
+      "stationIdsList": [
+       "M3"
+      ], 
      "stepNumber": 1
     }, 
     {
@@ -185,7 +205,9 @@
       "distributionType": "Fixed", 
       "mean": "0"
      }, 
-      "stationId": "Q1", 
+      "stationIdsList": [
+       "Q1"
+      ], 
      "stepNumber": 2
     }, 
     {
@@ -193,7 +215,9 @@
       "distributionType": "Fixed", 
       "mean": "20"
      }, 
-      "stationId": "M1", 
+      "stationId": [
+       "M1"
+      ], 
      "stepNumber": 3
     }
    ],