Skip to content

Commit

Permalink
restored missing router tests refs #21, #14376
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Feb 21, 2024
1 parent c55738c commit b4cf389
Show file tree
Hide file tree
Showing 18 changed files with 242 additions and 31 deletions.
52 changes: 50 additions & 2 deletions tests/dfrouter/flowmax/long_route/emitters.dfrouter
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
<additional>
<emitter id="source_in1" pos="5" objectid="in1_0" friendlyPos="x" file="emitter_in1.def.xml"/>
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-21 09:43:17 by Eclipse SUMO dfrouter Version v1_19_0+0930-c55738c
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/dfrouterConfiguration.xsd">
<input>
<net-file value="input_net.net.xml"/>
<detector-files value="input_detectors.det.xml"/>
<measure-files value="input_flows.txt"/>
</input>
<output>
<write-license value="true"/>
<routes-output value="routes.rou.xml"/>
<emitters-output value="emitters.add.xml"/>
</output>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<vType id="DEFAULT_VEHTYPE" speedFactor="2.00"/>
<routeDistribution id="MQ_2to3">
<route refId="2to3_to_3to4" probability="1.00"/>
<route refId="2to3_to_post3" probability="1.00"/>
</routeDistribution>
<vehicle id="MQ_2to3.0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_post3"/>
<vehicle id="MQ_2to3.1" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_post3"/>
<vehicle id="MQ_2to3.2" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_3to4"/>
<vehicle id="MQ_2to3.3" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_3to4"/>
<vehicle id="MQ_2to3.4" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_post3"/>
<vehicle id="MQ_2to3.5" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_3to4"/>
<vehicle id="MQ_2to3.6" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_post3"/>
<vehicle id="MQ_2to3.7" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_3to4"/>
<vehicle id="MQ_2to3.8" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_post3"/>
<vehicle id="MQ_2to3.9" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="2to3_to_post3"/>
</additional>
39 changes: 37 additions & 2 deletions tests/dfrouter/flowmax/long_route/routes.dfrouter
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
<routes>
<?xml version="1.0" encoding="UTF-8"?>

<route id="in1_to_out4" edges="in1 1to2 2to3 3to4 out4"/>
<!-- generated on 2024-02-21 09:43:17 by Eclipse SUMO dfrouter Version v1_19_0+0930-c55738c
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/dfrouterConfiguration.xsd">
<input>
<net-file value="input_net.net.xml"/>
<detector-files value="input_detectors.det.xml"/>
<measure-files value="input_flows.txt"/>
</input>
<output>
<write-license value="true"/>
<routes-output value="routes.rou.xml"/>
<emitters-output value="emitters.add.xml"/>
</output>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">

<route id="2to3_to_3to4" edges="2to3 3to4"/>
<route id="2to3_to_post3" edges="2to3 out3 post3"/>

</routes>
2 changes: 2 additions & 0 deletions tests/dfrouter/flowmax/testsuite.dfrouter
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ zero_split

# Tests flows on simple split network
only_source
long_route
wrong_split
66 changes: 63 additions & 3 deletions tests/dfrouter/flowmax/wrong_split/emitters.dfrouter
Original file line number Diff line number Diff line change
@@ -1,4 +1,64 @@
<additional>
<emitter id="source_MQ_1to2" pos="5" objectid="1to2_0" friendlyPos="x" file="emitter_MQ_1to2.def.xml"/>
<emitter id="source_MQ_6to7" pos="5" objectid="6to7_0" friendlyPos="x" file="emitter_MQ_6to7.def.xml"/>
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-21 09:43:17 by Eclipse SUMO dfrouter Version v1_19_0+0930-c55738c
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/dfrouterConfiguration.xsd">
<input>
<net-file value="input_net.net.xml"/>
<detector-files value="input_detectors.det.xml"/>
<measure-files value="input_flows.txt"/>
</input>
<output>
<write-license value="true"/>
<routes-output value="routes.rou.xml"/>
<emitters-output value="emitters.add.xml"/>
</output>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<vType id="DEFAULT_VEHTYPE" speedFactor="2.00"/>
<routeDistribution id="MQ_1to2">
<route refId="1to2_to_9to10" probability="0.50"/>
<route refId="1to2_to_4to5" probability="0.50"/>
</routeDistribution>
<vehicle id="MQ_1to2.0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_4to5"/>
<vehicle id="MQ_1to2.1" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_4to5"/>
<vehicle id="MQ_1to2.2" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_9to10"/>
<vehicle id="MQ_1to2.3" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_9to10"/>
<vehicle id="MQ_1to2.4" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_4to5"/>
<vehicle id="MQ_1to2.5" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_9to10"/>
<vehicle id="MQ_1to2.6" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_4to5"/>
<vehicle id="MQ_1to2.7" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_9to10"/>
<vehicle id="MQ_1to2.8" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_4to5"/>
<vehicle id="MQ_1to2.9" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="1to2_to_4to5"/>
<routeDistribution id="MQ_6to7">
<route refId="6to7_to_9to10" probability="1.00"/>
</routeDistribution>
<vehicle id="MQ_6to7.0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.1" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.2" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.3" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.4" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.5" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.6" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.7" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.8" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
<vehicle id="MQ_6to7.9" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="6to7_to_9to10"/>
</additional>
41 changes: 37 additions & 4 deletions tests/dfrouter/flowmax/wrong_split/routes.dfrouter
Original file line number Diff line number Diff line change
@@ -1,9 +1,42 @@
<routes>
<?xml version="1.0" encoding="UTF-8"?>

<route id="1to2_to_9to10" edges="1to2 2to9split 9to10"/>
<route id="1to2_to_4to5" edges="1to2 2to3 3to4 4to5"/>
<!-- generated on 2024-02-21 09:43:17 by Eclipse SUMO dfrouter Version v1_19_0+0930-c55738c
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/dfrouterConfiguration.xsd">
<route id="6to7_to_9to10" edges="6to7 7to8 8to9 9to10"/>
<input>
<net-file value="input_net.net.xml"/>
<detector-files value="input_detectors.det.xml"/>
<measure-files value="input_flows.txt"/>
</input>
<output>
<write-license value="true"/>
<routes-output value="routes.rou.xml"/>
<emitters-output value="emitters.add.xml"/>
</output>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">

<route id="1to2_to_9to10" edges="1to2 2to9split 9to10"/>
<route id="1to2_to_4to5" edges="1to2 2to3 3to4 4to5"/>

<route id="6to7_to_9to10" edges="6to7 7to8 8to9 9to10"/>

</routes>
1 change: 1 addition & 0 deletions tests/duarouter/function/remove_loops/testsuite.duarouter
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ with_taz

# see #9837
looped_twice
whole_route_is_a_loop
17 changes: 13 additions & 4 deletions tests/duarouter/person/personTrip/carNoRoute/alts.duarouter
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 10/19/15 21:51:20 by SUMO duarouter Version dev-SVN-r19121
<!-- generated on 2024-02-21 09:43:15 by Eclipse SUMO duarouter Version v1_19_0+0930-c55738c
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
SPDX-License-Identifier: EPL-2.0
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/duarouterConfiguration.xsd">
<input>
Expand All @@ -15,6 +20,7 @@ SPDX-License-Identifier: EPL-2.0
<output>
<output-file value="routes.rou.xml"/>
<write-license value="true"/>
</output>
<report>
Expand All @@ -28,10 +34,13 @@ SPDX-License-Identifier: EPL-2.0
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="p0_0" depart="triggered">
<routeDistribution last="0">
<route cost="0.00" probability="0.00000000" edges="beg middle end"/>
<route cost="0.00" probability="1.00000000" edges="beg middle end"/>
</routeDistribution>
</vehicle>
<person id="p0" depart="0.00">
<ride from="beg" to="end" lines="p0_0"/>
<personTrip from="beg" to="end" modes="car" walkFactor="0.75" costs="89.93"/>
</person>
<person id="p1" depart="0.00">
<personTrip from="end" to="beg" modes="car" walkFactor="0.75" costs="1440.00"/>
</person>
</routes>
3 changes: 0 additions & 3 deletions tests/duarouter/person/personTrip/carNoRoute/errors.duarouter
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
Error: No connection between edge 'end' and edge 'beg' found.
Error: No route for trip in person 'p1'.
Quitting (on error).

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Success.
13 changes: 11 additions & 2 deletions tests/duarouter/person/personTrip/carNoRoute/routes.duarouter
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 10/19/15 21:51:20 by SUMO duarouter Version dev-SVN-r19121
<!-- generated on 2024-02-21 09:43:15 by Eclipse SUMO duarouter Version v1_19_0+0930-c55738c
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
SPDX-License-Identifier: EPL-2.0
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/duarouterConfiguration.xsd">
<input>
Expand All @@ -15,6 +20,7 @@ SPDX-License-Identifier: EPL-2.0
<output>
<output-file value="routes.rou.xml"/>
<write-license value="true"/>
</output>
<report>
Expand All @@ -32,4 +38,7 @@ SPDX-License-Identifier: EPL-2.0
<person id="p0" depart="0.00">
<ride from="beg" to="end" lines="p0_0"/>
</person>
<person id="p1" depart="0.00">
<walk edges="end middle beg"/>
</person>
</routes>
1 change: 1 addition & 0 deletions tests/duarouter/person/personTrip/testsuite.duarouter
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,4 @@ geoTrips_lonLat
# test routing taxi trips
taxi
errors
carNoRoute
17 changes: 13 additions & 4 deletions tests/duarouter/personFlow/personTrip/carNoRoute/alts.duarouter
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 10/19/15 21:51:20 by SUMO duarouter Version dev-SVN-r19121
<!-- generated on 2024-02-21 09:43:15 by Eclipse SUMO duarouter Version v1_19_0+0930-c55738c
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
SPDX-License-Identifier: EPL-2.0
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/duarouterConfiguration.xsd">
<input>
Expand All @@ -15,6 +20,7 @@ SPDX-License-Identifier: EPL-2.0
<output>
<output-file value="routes.rou.xml"/>
<write-license value="true"/>
</output>
<report>
Expand All @@ -28,10 +34,13 @@ SPDX-License-Identifier: EPL-2.0
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="p0_0" depart="triggered">
<routeDistribution last="0">
<route cost="0.00" probability="0.00000000" edges="beg middle end"/>
<route cost="0.00" probability="1.00000000" edges="beg middle end"/>
</routeDistribution>
</vehicle>
<person id="p0" depart="0.00">
<ride from="beg" to="end" lines="p0_0"/>
<personTrip from="beg" to="end" modes="car" walkFactor="0.75" costs="89.93"/>
</person>
<person id="p1" depart="0.00">
<personTrip from="end" to="beg" modes="car" walkFactor="0.75" costs="1440.00"/>
</person>
</routes>
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
Error: No connection between edge 'end' and edge 'beg' found.
Error: No route for trip in person 'p1'.
Quitting (on error).

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Success.
13 changes: 11 additions & 2 deletions tests/duarouter/personFlow/personTrip/carNoRoute/routes.duarouter
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 10/19/15 21:51:20 by SUMO duarouter Version dev-SVN-r19121
<!-- generated on 2024-02-21 09:43:15 by Eclipse SUMO duarouter Version v1_19_0+0930-c55738c
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
SPDX-License-Identifier: EPL-2.0
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/duarouterConfiguration.xsd">
<input>
Expand All @@ -15,6 +20,7 @@ SPDX-License-Identifier: EPL-2.0
<output>
<output-file value="routes.rou.xml"/>
<write-license value="true"/>
</output>
<report>
Expand All @@ -32,4 +38,7 @@ SPDX-License-Identifier: EPL-2.0
<person id="p0" depart="0.00">
<ride from="beg" to="end" lines="p0_0"/>
</person>
<person id="p1" depart="0.00">
<walk edges="end middle beg"/>
</person>
</routes>

0 comments on commit b4cf389

Please sign in to comment.