fixup! editoast: remove none from margin values

OpenRailAssociation · Jul 17, 2024 · 22ea2c6 · 22ea2c6
1 parent fd922b8
commit 22ea2c6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 45 deletions.
diff --git a/tests/tests/regression_tests_data/coasting_not_intersecting_v2.json b/tests/tests/regression_tests_data/coasting_not_intersecting_v2.json
@@ -49,7 +49,7 @@
             }
         ],
         "comfort": "STANDARD",
-        "margin": "None"
+        "margin": "0%"
     },
     "prelude": [
         {
@@ -132,7 +132,7 @@
                             "2"
                         ],
                         "values": [
-                            "None",
+                            "0%",
                             "7%"
                         ]
                     },
@@ -171,12 +171,6 @@
                     "initial_speed": 0,
                     "labels": [],
                     "constraint_distribution": "MARECO",
-                    "margins": {
-                        "boundaries": [],
-                        "values": [
-                            "None"
-                        ]
-                    },
                     "options": {
                         "use_electrical_profiles": false
                     },
@@ -207,12 +201,6 @@
                     "initial_speed": 0,
                     "labels": [],
                     "constraint_distribution": "STANDARD",
-                    "margins": {
-                        "boundaries": [],
-                        "values": [
-                            "None"
-                        ]
-                    },
                     "options": {
                         "use_electrical_profiles": false
                     },
@@ -243,12 +231,6 @@
                     "initial_speed": 0,
                     "labels": [],
                     "constraint_distribution": "STANDARD",
-                    "margins": {
-                        "boundaries": [],
-                        "values": [
-                            "None"
-                        ]
-                    },
                     "options": {
                         "use_electrical_profiles": false
                     },
@@ -299,7 +281,7 @@
                             "2"
                         ],
                         "values": [
-                            "None",
+                            "0%",
                             "8%"
                         ]
                     },

diff --git a/tests/tests/regression_tests_data/forward_coasting_not_intersecting.json b/tests/tests/regression_tests_data/forward_coasting_not_intersecting.json
@@ -42,7 +42,7 @@
                     "2"
                 ],
                 "values": [
-                    "None",
+                    "0%",
                     "4min/100km"
                 ]
             },

diff --git a/tests/tests/regression_tests_data/stdcm_timetable_conflict.json b/tests/tests/regression_tests_data/stdcm_timetable_conflict.json
@@ -42,7 +42,7 @@
             }
         ],
         "comfort": "STANDARD",
-        "margin": "None"
+        "margin": "0%"
     },
     "prelude": [
         {
@@ -120,8 +120,8 @@
                             "2"
                         ],
                         "values": [
-                            "None",
-                            "None"
+                            "0%",
+                            "0%"
                         ]
                     },
                     "options": {
@@ -215,8 +215,8 @@
                             "2"
                         ],
                         "values": [
-                            "None",
-                            "None"
+                            "0%",
+                            "0%"
                         ]
                     },
                     "options": {

diff --git a/tests/tests/regression_tests_data/stdcm_zone_transition_near_start.json b/tests/tests/regression_tests_data/stdcm_zone_transition_near_start.json
@@ -42,7 +42,7 @@
             }
         ],
         "comfort": "STANDARD",
-        "margin": "None",
+        "margin": "0%",
         "standard_allowance": "14%"
     },
     "prelude": [
@@ -96,9 +96,9 @@
                             "4"
                         ],
                         "values": [
-                            "None",
+                            "0%",
                             "7min/100km",
-                            "None"
+                            "0%"
                         ]
                     },
                     "options": {
@@ -151,7 +151,7 @@
                             "2"
                         ],
                         "values": [
-                            "None",
+                            "0%",
                             "5%"
                         ]
                     },
@@ -195,12 +195,6 @@
                     "initial_speed": 0,
                     "labels": [],
                     "constraint_distribution": "MARECO",
-                    "margins": {
-                        "boundaries": [],
-                        "values": [
-                            "None"
-                        ]
-                    },
                     "options": {
                         "use_electrical_profiles": false
                     },
@@ -236,12 +230,6 @@
                     "initial_speed": 0,
                     "labels": [],
                     "constraint_distribution": "STANDARD",
-                    "margins": {
-                        "boundaries": [],
-                        "values": [
-                            "None"
-                        ]
-                    },
                     "options": {
                         "use_electrical_profiles": false
                     },
@@ -292,8 +280,8 @@
                             "2"
                         ],
                         "values": [
-                            "None",
-                            "None"
+                            "0%",
+                            "0%"
                         ]
                     },
                     "options": {