From 64b08dec610fd7ba715ca1879e71b39556e9ba1f Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Fri, 20 Dec 2024 15:11:23 +0100 Subject: [PATCH] patching expected results refs #21, #12791 --- .../persons/pedestrians_flow/errors.tools | 1 - .../persons/pedestrians_flow/trips.tools | 44 +++ .../pedestrians_flow_binomial/errors.tools | 0 .../pedestrians_flow_binomial/net.net.xml | 106 ++++++ .../pedestrians_flow_binomial/options.tools | 3 + .../pedestrians_flow_binomial/output.tools | 0 .../pedestrians_flow_binomial/trips.tools | 105 ++++++ .../persons/persontrips_flow/errors.tools | 0 .../persons/persontrips_flow/net.net.xml | 106 ++++++ .../persons/persontrips_flow/options.tools | 4 + .../persons/persontrips_flow/output.tools | 2 + .../persons/persontrips_flow/routes.tools | 343 +++++++++++++++++ .../persons/persontrips_flow/trips.tools | 46 +++ .../persontrips_junctionTaz_flow/errors.tools | 0 .../persontrips_junctionTaz_flow/net.net.xml | 106 ++++++ .../options.tools | 5 + .../persontrips_junctionTaz_flow/output.tools | 2 + .../persontrips_junctionTaz_flow/routes.tools | 345 ++++++++++++++++++ .../persontrips_junctionTaz_flow/trips.tools | 47 +++ .../trip/randomTrips/persons/testsuite.tools | 9 + 20 files changed, 1273 insertions(+), 1 deletion(-) create mode 100644 tests/tools/trip/randomTrips/persons/pedestrians_flow/trips.tools create mode 100644 tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/errors.tools create mode 100644 tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/net.net.xml create mode 100644 tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/options.tools create mode 100644 tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/output.tools create mode 100644 tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/trips.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_flow/errors.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_flow/net.net.xml create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_flow/options.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_flow/output.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_flow/routes.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_flow/trips.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/errors.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/net.net.xml create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/options.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/output.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/routes.tools create mode 100644 tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/trips.tools diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow/errors.tools b/tests/tools/trip/randomTrips/persons/pedestrians_flow/errors.tools index 3c9dd5208edc..e69de29bb2d1 100644 --- a/tests/tools/trip/randomTrips/persons/pedestrians_flow/errors.tools +++ b/tests/tools/trip/randomTrips/persons/pedestrians_flow/errors.tools @@ -1 +0,0 @@ -Error: Person flows are not supported yet. diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow/trips.tools b/tests/tools/trip/randomTrips/persons/pedestrians_flow/trips.tools new file mode 100644 index 000000000000..c79e965b0dc4 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/pedestrians_flow/trips.tools @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/errors.tools b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/errors.tools new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/net.net.xml b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/net.net.xml new file mode 100644 index 000000000000..f4ee03df2b32 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/net.net.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/options.tools b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/options.tools new file mode 100644 index 000000000000..0e8d3c218b0b --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/options.tools @@ -0,0 +1,3 @@ +-n net.net.xml -s 42 --pedestrians -e 100 --min-distance 1 +--flows 10 +--binomial 3 diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/output.tools b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/output.tools new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/trips.tools b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/trips.tools new file mode 100644 index 000000000000..e270100e9969 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/pedestrians_flow_binomial/trips.tools @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/persontrips_flow/errors.tools b/tests/tools/trip/randomTrips/persons/persontrips_flow/errors.tools new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/tools/trip/randomTrips/persons/persontrips_flow/net.net.xml b/tests/tools/trip/randomTrips/persons/persontrips_flow/net.net.xml new file mode 100644 index 000000000000..f4ee03df2b32 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_flow/net.net.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/persontrips_flow/options.tools b/tests/tools/trip/randomTrips/persons/persontrips_flow/options.tools new file mode 100644 index 000000000000..4d0a013586ec --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_flow/options.tools @@ -0,0 +1,4 @@ +-n net.net.xml -s 42 --persontrips -e 100 --min-distance 1 --trip-attributes +'departPos="random" color="red" modes="car public"' +--route-file out.rou.xml +--flows 10 diff --git a/tests/tools/trip/randomTrips/persons/persontrips_flow/output.tools b/tests/tools/trip/randomTrips/persons/persontrips_flow/output.tools new file mode 100644 index 000000000000..1db79a7a4f62 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_flow/output.tools @@ -0,0 +1,2 @@ +Success. +calling /scr1/sumoI/sumo/bin/duarouter -n net.net.xml -r trips.trips.xml -o routes.rou.xml --ignore-errors --begin 0 --end 100.0 --no-step-log --no-warnings diff --git a/tests/tools/trip/randomTrips/persons/persontrips_flow/routes.tools b/tests/tools/trip/randomTrips/persons/persontrips_flow/routes.tools new file mode 100644 index 000000000000..0aa6e0e17812 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_flow/routes.tools @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/persontrips_flow/trips.tools b/tests/tools/trip/randomTrips/persons/persontrips_flow/trips.tools new file mode 100644 index 000000000000..196b97949f9d --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_flow/trips.tools @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/errors.tools b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/errors.tools new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/net.net.xml b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/net.net.xml new file mode 100644 index 000000000000..f4ee03df2b32 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/net.net.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/options.tools b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/options.tools new file mode 100644 index 000000000000..293ebdf1113f --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/options.tools @@ -0,0 +1,5 @@ +-n net.net.xml -s 42 --persontrips -e 100 --min-distance 1 --trip-attributes +'departPos="random" color="red" modes="car public"' +--route-file out.rou.xml +--junction-taz +--flows 10 diff --git a/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/output.tools b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/output.tools new file mode 100644 index 000000000000..1db79a7a4f62 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/output.tools @@ -0,0 +1,2 @@ +Success. +calling /scr1/sumoI/sumo/bin/duarouter -n net.net.xml -r trips.trips.xml -o routes.rou.xml --ignore-errors --begin 0 --end 100.0 --no-step-log --no-warnings diff --git a/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/routes.tools b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/routes.tools new file mode 100644 index 000000000000..8e83ed812258 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/routes.tools @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/trips.tools b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/trips.tools new file mode 100644 index 000000000000..e4188f1d0f11 --- /dev/null +++ b/tests/tools/trip/randomTrips/persons/persontrips_junctionTaz_flow/trips.tools @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/tools/trip/randomTrips/persons/testsuite.tools b/tests/tools/trip/randomTrips/persons/testsuite.tools index a4da946a13f5..85d39693b5c4 100644 --- a/tests/tools/trip/randomTrips/persons/testsuite.tools +++ b/tests/tools/trip/randomTrips/persons/testsuite.tools @@ -9,15 +9,24 @@ intermediate_pedestrians pedestrians pedestrians_flow +# Copy of pedestrians_flow +pedestrians_flow_binomial + # generate random persontrips persontrips +# generate random flows of persontrips +persontrips_flow + # walks between junctions pedestrians_junctionTaz # generate random persontrips between junctions persontrips_junctionTaz +# generate random persontrips between junctions +persontrips_junctionTaz_flow + # generate random taxi rides taxirides fringeFactor