Skip to content

Commit

Permalink
added test refs #14258, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Feb 26, 2024
1 parent abafd35 commit a1a6bb0
Show file tree
Hide file tree
Showing 17 changed files with 10,812 additions and 0 deletions.
Empty file.
4,809 changes: 4,809 additions & 0 deletions tests/sumo/cf_model/rail/accel/custom_curves/fcd.sumo

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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="custom" max="114e3" maxPower="2350" maxTraction="150"
resCoef_quadratic="0.28" resCoef_linear="0.03" resCoef_constant="1670"/>
<trip id="r0" depart="0.00" departLane="best" from="e0" to="e2" type="0"/>
</routes>
1 change: 1 addition & 0 deletions tests/sumo/cf_model/rail/accel/custom_curves/options.sumo
Original file line number Diff line number Diff line change
@@ -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
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Error: Either tractionTable or maxPower must be defined for vType '0' with Rail model type 'custom'.
Quitting (on error).
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1
45 changes: 45 additions & 0 deletions tests/sumo/cf_model/rail/accel/custom_missingValues/fcd.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-26 18:18:15 by Eclipse SUMO sumo Version v1_19_0+1027-441ccf2
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<fcd-output value="fcd.xml"/>
</output>
<time>
<begin value="0"/>
<end value="3000"/>
</time>
<processing>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<fcd-export xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/fcd_file.xsd">
</fcd-export>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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="custom"/>
<trip id="r0" depart="0.00" departLane="best" from="e0" to="e2" type="0"/>
</routes>
Original file line number Diff line number Diff line change
@@ -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
Empty file.
Empty file.
5,915 changes: 5,915 additions & 0 deletions tests/sumo/cf_model/rail/accel/custom_tables/fcd.sumo

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions tests/sumo/cf_model/rail/accel/custom_tables/input_routes.rou.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?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="custom"
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>
1 change: 1 addition & 0 deletions tests/sumo/cf_model/rail/accel/custom_tables/options.sumo
Original file line number Diff line number Diff line change
@@ -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
Empty file.
9 changes: 9 additions & 0 deletions tests/sumo/cf_model/rail/accel/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@ REDosto7
NGRS3
MireoPlusB
MireoPlusH

# custom model without extra attributes
custom_missingValues

# custom model without extra attributes
custom_tables

# custom model without extra attributes
custom_curves

0 comments on commit a1a6bb0

Please sign in to comment.