diff --git a/tests/duarouter/meta/help/output.duarouter b/tests/duarouter/meta/help/output.duarouter index f18728c02ba3..4f24ffce1dab 100644 --- a/tests/duarouter/meta/help/output.duarouter +++ b/tests/duarouter/meta/help/output.duarouter @@ -1,4 +1,4 @@ -Eclipse SUMO duarouter Version v1_21_0+0881-109d9298130 +Eclipse SUMO duarouter Version v1_21_0+1212-c8e3c67cccc Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de Shortest path router and DUE computer for the microscopic, multi-modal traffic simulation SUMO. @@ -136,6 +136,10 @@ Processing Options: ALT-variant from the given file --astar.save-landmark-distances FILE Save lookup table for astar ALT-variant to the given file + --scale FLOAT Scale demand by the given factor (by + discarding or duplicating vehicles) + --scale-suffix STR Suffix to be added when creating ids for + cloned vehicles --gawron.beta FLOAT Use FLOAT as Gawron's beta --gawron.a FLOAT Use FLOAT as Gawron's a --keep-all-routes Save routes with near zero probability diff --git a/tests/duarouter/meta/write_template_commented_full/cfg.duarouter b/tests/duarouter/meta/write_template_commented_full/cfg.duarouter index b080cfc95aa9..067a7a5260b5 100644 --- a/tests/duarouter/meta/write_template_commented_full/cfg.duarouter +++ b/tests/duarouter/meta/write_template_commented_full/cfg.duarouter @@ -1,6 +1,6 @@ - @@ -204,6 +204,12 @@ + + + + + + diff --git a/tests/duarouter/meta/write_template_full/cfg.duarouter b/tests/duarouter/meta/write_template_full/cfg.duarouter index 0bcdc2d12fd3..5522b87439b4 100644 --- a/tests/duarouter/meta/write_template_full/cfg.duarouter +++ b/tests/duarouter/meta/write_template_full/cfg.duarouter @@ -1,6 +1,6 @@ - @@ -78,6 +78,8 @@ + + diff --git a/tests/duarouter/person/scale_3/alts.duarouter b/tests/duarouter/person/scale_3/alts.duarouter new file mode 100644 index 000000000000..d136555b07f6 --- /dev/null +++ b/tests/duarouter/person/scale_3/alts.duarouter @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/duarouter/person/scale_3/errors.duarouter b/tests/duarouter/person/scale_3/errors.duarouter new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/duarouter/person/scale_3/input_routes.rou.xml b/tests/duarouter/person/scale_3/input_routes.rou.xml new file mode 100644 index 000000000000..bdb1816ff297 --- /dev/null +++ b/tests/duarouter/person/scale_3/input_routes.rou.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/duarouter/person/scale_3/options.duarouter b/tests/duarouter/person/scale_3/options.duarouter new file mode 100644 index 000000000000..876985705f95 --- /dev/null +++ b/tests/duarouter/person/scale_3/options.duarouter @@ -0,0 +1,2 @@ +--net-file=input_net.net.xml --route-files=input_routes.rou.xml -o routes.rou.xml +--scale 3 diff --git a/tests/duarouter/person/scale_3/output.duarouter b/tests/duarouter/person/scale_3/output.duarouter new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/duarouter/person/scale_3/output.duarouter @@ -0,0 +1 @@ +Success. diff --git a/tests/duarouter/person/scale_3/routes.duarouter b/tests/duarouter/person/scale_3/routes.duarouter new file mode 100644 index 000000000000..7ddf12c4255d --- /dev/null +++ b/tests/duarouter/person/scale_3/routes.duarouter @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/duarouter/person/testsuite.duarouter b/tests/duarouter/person/testsuite.duarouter index 375ad9663c10..c3bac6b89d75 100644 --- a/tests/duarouter/person/testsuite.duarouter +++ b/tests/duarouter/person/testsuite.duarouter @@ -40,3 +40,6 @@ stoppingPlace # mismatch between vehicle stoppingPlace and ride stoppingPlace stoppingPlace_mismatch + +# Copy of basic +scale_3 diff --git a/tests/duarouter/trips/scale_0.5/alts.duarouter b/tests/duarouter/trips/scale_0.5/alts.duarouter new file mode 100644 index 000000000000..2fe0acc587f4 --- /dev/null +++ b/tests/duarouter/trips/scale_0.5/alts.duarouter @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/duarouter/trips/scale_0.5/errors.duarouter b/tests/duarouter/trips/scale_0.5/errors.duarouter new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/duarouter/trips/scale_0.5/input_trips.trips.xml b/tests/duarouter/trips/scale_0.5/input_trips.trips.xml new file mode 100644 index 000000000000..c12092f3da8a --- /dev/null +++ b/tests/duarouter/trips/scale_0.5/input_trips.trips.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/duarouter/trips/scale_0.5/options.duarouter b/tests/duarouter/trips/scale_0.5/options.duarouter new file mode 100644 index 000000000000..ca7fabc735e0 --- /dev/null +++ b/tests/duarouter/trips/scale_0.5/options.duarouter @@ -0,0 +1,2 @@ +--net-file=input_net.net.xml --route-files=input_trips.trips.xml -o routes.rou.xml +--scale 0.5 --scale-suffix # diff --git a/tests/duarouter/trips/scale_0.5/output.duarouter b/tests/duarouter/trips/scale_0.5/output.duarouter new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/duarouter/trips/scale_0.5/output.duarouter @@ -0,0 +1 @@ +Success. diff --git a/tests/duarouter/trips/scale_0.5/routes.duarouter b/tests/duarouter/trips/scale_0.5/routes.duarouter new file mode 100644 index 000000000000..500edc3e7e3d --- /dev/null +++ b/tests/duarouter/trips/scale_0.5/routes.duarouter @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/duarouter/trips/scale_2.5/alts.duarouter b/tests/duarouter/trips/scale_2.5/alts.duarouter new file mode 100644 index 000000000000..94f7fef63084 --- /dev/null +++ b/tests/duarouter/trips/scale_2.5/alts.duarouter @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/duarouter/trips/scale_2.5/errors.duarouter b/tests/duarouter/trips/scale_2.5/errors.duarouter new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/duarouter/trips/scale_2.5/input_trips.trips.xml b/tests/duarouter/trips/scale_2.5/input_trips.trips.xml new file mode 100644 index 000000000000..c12092f3da8a --- /dev/null +++ b/tests/duarouter/trips/scale_2.5/input_trips.trips.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/duarouter/trips/scale_2.5/options.duarouter b/tests/duarouter/trips/scale_2.5/options.duarouter new file mode 100644 index 000000000000..58d34f892ab6 --- /dev/null +++ b/tests/duarouter/trips/scale_2.5/options.duarouter @@ -0,0 +1,2 @@ +--net-file=input_net.net.xml --route-files=input_trips.trips.xml -o routes.rou.xml +--scale 2.5 diff --git a/tests/duarouter/trips/scale_2.5/output.duarouter b/tests/duarouter/trips/scale_2.5/output.duarouter new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/duarouter/trips/scale_2.5/output.duarouter @@ -0,0 +1 @@ +Success. diff --git a/tests/duarouter/trips/scale_2.5/routes.duarouter b/tests/duarouter/trips/scale_2.5/routes.duarouter new file mode 100644 index 000000000000..34e8f986340b --- /dev/null +++ b/tests/duarouter/trips/scale_2.5/routes.duarouter @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/duarouter/trips/testsuite.duarouter b/tests/duarouter/trips/testsuite.duarouter index 5242c8562f98..1d395e97fb54 100644 --- a/tests/duarouter/trips/testsuite.duarouter +++ b/tests/duarouter/trips/testsuite.duarouter @@ -125,3 +125,9 @@ departSpeed # test handling of depart time "begin" depart_begin + +# test option scale +scale_0.5 + +# test option scale +scale_2.5