-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
18 changed files
with
242 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,3 +12,5 @@ zero_split | |
|
||
# Tests flows on simple split network | ||
only_source | ||
long_route | ||
wrong_split |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,3 +39,4 @@ with_taz | |
|
||
# see #9837 | ||
looped_twice | ||
whole_route_is_a_loop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
tests/duarouter/person/personTrip/carNoRoute/errors.duarouter
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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). | ||
1 change: 0 additions & 1 deletion
1
tests/duarouter/person/personTrip/carNoRoute/exitcode.duarouter
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Success. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -194,3 +194,4 @@ geoTrips_lonLat | |
# test routing taxi trips | ||
taxi | ||
errors | ||
carNoRoute |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
tests/duarouter/personFlow/personTrip/carNoRoute/errors.duarouter
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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). | ||
1 change: 0 additions & 1 deletion
1
tests/duarouter/personFlow/personTrip/carNoRoute/exitcode.duarouter
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Success. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.