Skip to content

Commit 8dcff4d

Browse files
nkuehnelnkuehnel
committed
adjust tests
1 parent 0d32d67 commit 8dcff4d

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

‎examples/scenarios/dvrp-grid/eight_shared_taxi_config.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
<parameterset type="drt">
66
<parameterset type="ExtensiveInsertionSearch"/>
77
<param name="stopDuration" value="60"/>
8-
<param name="maxWaitTime" value="900"/>
9-
<param name="maxTravelTimeAlpha" value="1.3"/>
10-
<param name="maxTravelTimeBeta" value="600"/>
11-
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
8+
<parameterset type="drtOptimizationConstraints">
9+
<param name="maxWaitTime" value="900"/>
10+
<param name="maxTravelTimeAlpha" value="1.3"/>
11+
<param name="maxTravelTimeBeta" value="600"/>
12+
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
13+
</parameterset>
1214
<param name="vehiclesFile" value="eight_shared_taxi_vehicles.xml"/>
1315
<param name="changeStartLinkToLastLinkInSchedule" value="true"/>
1416
</parameterset>

‎examples/scenarios/dvrp-grid/multi_mode_one_shared_taxi_config.xml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
<parameterset type="ExtensiveInsertionSearch"/>
1515
<param name="mode" value="drt_conventional"/>
1616
<param name="stopDuration" value="60"/>
17-
<param name="maxWaitTime" value="900"/>
18-
<param name="maxTravelTimeAlpha" value="1.3"/>
19-
<param name="maxTravelTimeBeta" value="600"/>
20-
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
17+
<parameterset type="drtOptimizationConstraints">
18+
<param name="maxWaitTime" value="900"/>
19+
<param name="maxTravelTimeAlpha" value="1.3"/>
20+
<param name="maxTravelTimeBeta" value="600"/>
21+
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
22+
</parameterset>
2123
<param name="changeStartLinkToLastLinkInSchedule" value="true"/>
2224
<parameterset type="drtfare">
2325
<param name="basefare" value="1.0"/>
@@ -29,11 +31,12 @@
2931
<parameterset type="drt">
3032
<parameterset type="ExtensiveInsertionSearch"/>
3133
<param name="mode" value="drt_autonomous"/>
32-
<param name="stopDuration" value="60"/>
33-
<param name="maxWaitTime" value="900"/>
34-
<param name="maxTravelTimeAlpha" value="1.3"/>
35-
<param name="maxTravelTimeBeta" value="600"/>
36-
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
34+
<parameterset type="drtOptimizationConstraints">
35+
<param name="maxWaitTime" value="900"/>
36+
<param name="maxTravelTimeAlpha" value="1.3"/>
37+
<param name="maxTravelTimeBeta" value="600"/>
38+
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
39+
</parameterset>
3740
<param name="changeStartLinkToLastLinkInSchedule" value="true"/>
3841
<parameterset type="drtfare">
3942
<param name="basefare" value="0.0"/>

‎examples/scenarios/dvrp-grid/one_shared_taxi_config.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
<parameterset type="drt">
1414
<parameterset type="ExtensiveInsertionSearch"/>
1515
<param name="stopDuration" value="60"/>
16-
<param name="maxWaitTime" value="900"/>
17-
<param name="maxTravelTimeAlpha" value="1.3"/>
18-
<param name="maxTravelTimeBeta" value="600"/>
19-
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
16+
<parameterset type="drtOptimizationConstraints">
17+
<param name="maxWaitTime" value="900"/>
18+
<param name="maxTravelTimeAlpha" value="1.3"/>
19+
<param name="maxTravelTimeBeta" value="600"/>
20+
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
21+
</parameterset>
2022
<param name="vehiclesFile" value="one_shared_taxi_vehicles.xml"/>
2123
<param name="changeStartLinkToLastLinkInSchedule" value="true"/>
2224
</parameterset>

‎examples/scenarios/dvrp-grid/one_taxi_and_one_shared_taxi_config.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
<parameterset type="drt">
99
<parameterset type="ExtensiveInsertionSearch"/>
1010
<param name="stopDuration" value="60"/>
11-
<param name="maxWaitTime" value="900"/>
12-
<param name="maxTravelTimeAlpha" value="1.3"/>
13-
<param name="maxTravelTimeBeta" value="600"/>
11+
<parameterset type="drtOptimizationConstraints">
12+
<param name="maxWaitTime" value="900"/>
13+
<param name="maxTravelTimeAlpha" value="1.3"/>
14+
<param name="maxTravelTimeBeta" value="600"/>
15+
<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
16+
</parameterset>
1417
<param name="vehiclesFile" value="one_shared_taxi_vehicles.xml"/>
1518
</parameterset>
1619
</module>

0 commit comments

Comments
 (0)