added test refs #14258, #21

eclipse-sumo · Feb 26, 2024 · 9e21835 · 9e21835
1 parent 79a7a5c
commit 9e21835
Show file tree

Hide file tree

Showing 7 changed files with 5,956 additions and 5 deletions.
diff --git a/tests/sumo/cf_model/rail/accel/Freight_custom/errors.sumo b/tests/sumo/cf_model/rail/accel/Freight_custom/errors.sumo
diff --git a/tests/sumo/cf_model/rail/accel/Freight_custom/fcd.sumo b/tests/sumo/cf_model/rail/accel/Freight_custom/fcd.sumo
diff --git a/tests/sumo/cf_model/rail/accel/Freight_custom/input_routes.rou.xml b/tests/sumo/cf_model/rail/accel/Freight_custom/input_routes.rou.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- generated on 2017-02-08 09:09:20.447642 by $Id: route2trips.py 22767 2017-01-30 11:42:27Z behrisch $ via randomTrips.py
+  options: 
+-->
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vType id="0" vClass="rail" carFollowModel="Rail" trainType="Freight"
+        speedTable="0 10 20 30 40 50 60 70 80 90 100 110 120"
+        tractionTable="300 300 263 179 135 108 90 77 67.5 60 54 49 45"
+        resistanceTable="2 4 8.5 14 22 31 41.5 54 68 83.5 111 120 140"/>
+
+    <trip id="r0" depart="0.00" departLane="best" from="e0" to="e2" type="0"/>
+</routes>
diff --git a/tests/sumo/cf_model/rail/accel/Freight_custom/options.sumo b/tests/sumo/cf_model/rail/accel/Freight_custom/options.sumo
@@ -0,0 +1 @@
+-b 0 -e 3000 --no-step-log --no-duration-log --net-file=net.net.xml --fcd-output fcd.xml --routes=input_routes.rou.xml
diff --git a/tests/sumo/cf_model/rail/accel/Freight_custom/output.sumo b/tests/sumo/cf_model/rail/accel/Freight_custom/output.sumo
diff --git a/tests/sumo/cf_model/rail/accel/testsuite.sumo b/tests/sumo/cf_model/rail/accel/testsuite.sumo
@@ -2,6 +2,9 @@ Freight
 
 # use custom mass value
 Freight_heavier
+
+# use custom traction and resistance curve
+Freight_custom
 ICE3
 NGT400_16
 RB628

diff --git a/tests/tools/xml/xml2csv/cross3ltl_vehroutes_schema/csv.tools b/tests/tools/xml/xml2csv/cross3ltl_vehroutes_schema/csv.tools