Merge branch 'master' of https://github.com/mmitss/mmitss

mmitss · Feb 8, 2021 · d8fbedd · d8fbedd
2 parents c2a5582 + decff53
commit d8fbedd
Show file tree

Hide file tree

Showing 8 changed files with 608 additions and 797 deletions.
diff --git a/docs/mmitss-deployment/mmitss-build-docker-image.docx b/docs/mmitss-deployment/mmitss-build-docker-image.docx
diff --git a/docs/mmitss-deployment/mmitss-field-deployment.docx b/docs/mmitss-deployment/mmitss-field-deployment.docx
diff --git a/src/mrp/priority-request-solver/Test/PriorityRequestSender/priorityRequest.json b/src/mrp/priority-request-solver/Test/PriorityRequestSender/priorityRequest.json
@@ -4,11 +4,11 @@
         "intersectionID": 44383,
         "minuteOfYear": 487593,
         "msOfMinute": 21000,
-        "noOfRequest": 1,
+        "noOfRequest": 2,
         "regionalID": 0,
         "requestorInfo": [
             {
-                "ETA": 38.0,
+                "ETA": 35.0,
                 "ETA_Duration": 4.0,
                 "basicVehicleRole": 9,
                 "elevation_Meter": 0.0,
@@ -17,10 +17,25 @@
                 "latitude_DecimalDegree": 0.0,
                 "longitude_DecimalDegree": 0.0,
                 "priorityRequestStatus": 0,
-                "requestedSignalGroup": 8,
-                "speed_MeterPerSecond": 0.0,
+                "requestedSignalGroup": 4,
+                "speed_MeterPerSecond": 14.5,
                 "vehicleID": 601,
                 "vehicleType": 9
+            },
+            {
+                "ETA": 25.0,
+                "ETA_Duration": 4.0,
+                "basicVehicleRole": 16,
+                "elevation_Meter": 0.0,
+                "heading_Degree": 0.0,
+                "inBoundLaneID": 0,
+                "latitude_DecimalDegree": 0.0,
+                "longitude_DecimalDegree": 0.0,
+                "priorityRequestStatus": 0,
+                "requestedSignalGroup": 2,
+                "speed_MeterPerSecond": 15.0,
+                "vehicleID": 602,
+                "vehicleType": 6
             }
         ]
     }

diff --git a/src/mrp/priority-request-solver/Test/TCIMsgSender/currPhase.json b/src/mrp/priority-request-solver/Test/TCIMsgSender/currPhase.json
@@ -1,14 +1,14 @@
 {
     "currentPhases": [
         {
-            "Phase": 1,
+            "Phase": 4,
             "State": "green",
-            "ElapsedTime": 100
+            "ElapsedTime": 200
         },
         {
-            "Phase": 5,
+            "Phase": 8,
             "State": "green",
-            "ElapsedTime": 100
+            "ElapsedTime": 200
         }
     ],
     "MsgType": "CurrNextPhaseStatus",

diff --git a/src/mrp/priority-request-solver/Test/TCIMsgSender/signalPlan.json b/src/mrp/priority-request-solver/Test/TCIMsgSender/signalPlan.json
@@ -45,11 +45,11 @@
         "Passage": [
             2.0,
             5.0,
-            0.0,
+            2.0,
             5.0,
             2.0,
             5.0,
-            0.0,
+            2.0,
             5.0
         ],
         "MaxGreen": [
@@ -65,21 +65,21 @@
         "YellowChange": [
             3.0,
             4.0,
-            0.0,
+            3.0,
             3.6,
             3.0,
             4.0,
-            0.0,
+            3.0,
             3.6
         ],
         "RedClear": [
             1.0,
             2.5,
-            0.0,
+            1.0,
             3.4000000000000004,
             1.0,
             2.5,
-            0.0,
+            1.0,
             3.4000000000000004
         ],
         "PhaseRing": [