Commit 53acd8e2 authored by Alexander Schiewe's avatar Alexander Schiewe

Prepare release 2020.02

parent 28d93f5a
......@@ -25,7 +25,6 @@ ConvertTTF
ConvertTTFSP
saucy
plot-PTN
statistic
solution.txt
temp.xml
Release
......@@ -65,7 +64,7 @@ Vehicle_Flow.vs
Vehicle_Schedules.vs
Vehicles.vs
data_vehicle_flow
statistic
statistic.sta
Evaluation.txt
Line-Concept.lin
Delays-Events.giv
......
#!/usr/bin/env bash
set -e
# Set environment variables for usage on c7
if [ -z "$XPRESSDIR" ]; then
export XPRESSDIR=/opt/xpressmp
fi
if [ -z "$XPRESS" ]; then
export XPRESS=/opt/xpressmp/bin
fi
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XPRESSDIR}/lib
export DYLD_LIBRARY_PATH=${XPRESSDIR}/lib:${DYLD_LIBRARY_PATH}
export SHLIB_PATH=${XPRESSDIR}/lib:${SHLIB_PATH}
export LIBPATH=${XPRESSDIR}/lib:${LIBPATH}
export PYTHONPATH=${XPRESSDIR}/lib:${PYTHONPATH}
export CLASSPATH=${XPRESSDIR}/lib/xprs.jar:${CLASSPATH}
export CLASSPATH=${XPRESSDIR}/lib/xprb.jar:${CLASSPATH}
export CLASSPATH=${XPRESSDIR}/lib/xprm.jar:${CLASSPATH}
export PATH=${XPRESSDIR}/bin:${PATH}
lc_average_distance; 236.9267361936697
lc_average_edges; 4.535714285714286
lc_average_length; 9.071428571428571
lc_cost; 5193.5
lc_cost; 5548
lc_feasible; true
lc_min_distance; 100.0
lc_min_edges; 1.0
lc_min_length; 2.0
lc_obj_direct_travellers_sp; 1892
lc_obj_game; 4096
lc_obj_game; 4450
lc_prop_directed_lines; 56
lc_prop_freq_max; 15
lc_prop_freq_max; 16
lc_time_average; 21.44776119402985
lc_var_distance; 12080.007390900952
lc_var_edges; 3.8201530612244916
......
......@@ -4,17 +4,17 @@ ean_prop_activities_change; 4918
ean_prop_activities_drive; 694
ean_prop_activities_feas; 1736
ean_prop_activities_headway; 0
ean_prop_activities_objective; 2325
ean_prop_activities_od; 1794
ean_prop_activities_od_change; 589
ean_prop_activities_od_drive; 656
ean_prop_activities_objective; 2311
ean_prop_activities_od; 1777
ean_prop_activities_od_change; 575
ean_prop_activities_od_drive; 653
ean_prop_activities_od_wait; 549
ean_prop_activities_wait; 592
ean_prop_change_od_max; 1220
ean_prop_change_od_min; 172.38
ean_prop_change_od_max; 1205
ean_prop_change_od_min; 157.38
ean_prop_events; 1388
ean_prop_events_arrival; 694
ean_prop_events_departure; 694
ean_prop_headways_dep; true
ean_prop_headways_interstation; false
ean_time_average; 36.41
ean_time_average; 35.37
# link-id; load; frequency
17; 5166.0; 4
18; 4670.0; 4
20; 3314.0; 3
23; 1169.0; 1
30; 13245.0; 12
40; 7711.0; 7
49; 4111.0; 2
50; 3111.0; 2
ro_prop_stations_at_begin_or_end; 11
ro_prop_trips; 153
ro_prop_stations_at_begin_or_end; 10
ro_prop_trips; 146
ro_trips_feasible; true
vs_average_waiting_time; 7.27
vs_circulations; 3
vs_cost; 3368211.68
vs_empty_cost; 2929134.69
vs_empty_distance; 640.4
vs_empty_distance_with_depot; 418970.35
vs_empty_duration_driving; 150
vs_empty_duration_standing; 800
vs_empty_duration_with_depot; 1630
vs_empty_trips; 20
vs_empty_trips_depot; 63
vs_average_waiting_time; 10.3
vs_circulations; 7
vs_cost; 3568761.16
vs_empty_cost; 3143497.45
vs_empty_distance; 264.28
vs_empty_distance_with_depot; 428458.58
vs_empty_duration_driving; 96
vs_empty_duration_standing; 1123
vs_empty_duration_with_depot; 1943
vs_empty_trips; 12
vs_empty_trips_depot; 56
vs_feasible; true
vs_full_distance; 291654.93
vs_full_duration; 3827
vs_maximal_waiting_time; 33
vs_full_distance; 282429.7
vs_full_duration; 3886
vs_maximal_waiting_time; 35
vs_minimal_waiting_time; 0
vs_vehicles; 23
vs_vehicles; 25
lpool_cost; 2654.236176
lpool_cost; 2107.259797
lpool_feasible_circles; true
lpool_feasible_od; true
lpool_prop_directed_lines; 44
lpool_prop_directed_lines; 42
lpool_time_average; 20.981381363139352
tim_model; MATCH
\ No newline at end of file
tim_feasible; true
tim_obj_ptt1; 63691
tim_obj_slack_average; 21
tim_perceived_time_average; 20.96
tim_time_average; 19.42
#!/usr/bin/env bash
set -e
# Enter your data here
TARGET_DATASET=grid
COMMANDS_TO_RUN="make tim-timetable && make tim-timetable-evaluate"
ADDITIONAL_FILES_TO_COMPARE=()
# STATIC PART OF THE SCRIPT
SCRIPT_LOCATION=`dirname $(readlink -f ${BASH_SOURCE[0]})`
echo ------------------------Executing test `basename ${SCRIPT_LOCATION}`
TIMESTAMP=`date +"%Y-%m-%d_%H-%M-%S"`
TARGET_LOCATION=../../datasets/${TARGET_DATASET}_${TIMESTAMP}
BASE_TARGET_LOCATION=../../datasets/${TARGET_DATASET}
cp -r ${BASE_TARGET_LOCATION} ${TARGET_LOCATION}
cp -r * ${TARGET_LOCATION}
cd ${TARGET_LOCATION}
eval ${COMMANDS_TO_RUN}
python3 ${SCRIPT_LOCATION}/../util/evaluate_statistics.py ${SCRIPT_LOCATION}/expected-statistic.sta statistic/statistic.sta
for file in "${ADDITIONAL_FILES_TO_COMPARE}"
do
if [ ${file} ]; then
python3 ${SCRIPT_LOCATION}/../util/compare_files.py ${SCRIPT_LOCATION}/$file $file
fi
done
echo "File comparison successful"
cd ${SCRIPT_LOCATION}
rm -rf ${TARGET_LOCATION}
# link_index; load; minimal_frequency; maximal_frequency
1;258;4;20
2;296;5;20
3;103;2;20
4;50;1;20
5;61;1;20
6;179;3;20
7;175;3;20
8;59;1;20
9;64;1;20
10;124;2;20
11;189;3;20
12;63;1;20
13;63;1;20
14;184;3;20
15;167;3;20
16;57;1;20
17;54;1;20
18;110;2;20
19;192;3;20
20;168;3;20
21;0;0;20
22;0;0;20
23;0;0;20
24;0;0;20
25;0;0;20
26;0;0;20
27;0;0;20
28;0;0;20
29;419;6;20
30;725;11;20
31;525;8;20
32;263;4;20
33;0;0;20
34;0;0;20
35;0;0;20
36;0;0;20
37;0;0;20
38;0;0;20
39;0;0;20
40;0;0;20
# line-id; length; cost
1;14.0;51.050000
2;14.0;51.050000
3;14.0;51.050000
4;12.0;50.900000
5;12.0;50.900000
6;12.0;50.900000
7;12.0;50.900000
8;12.0;50.900000
9;10.0;50.750000
10;10.0;50.750000
11;10.0;50.750000
12;10.0;50.750000
13;10.0;50.750000
14;10.0;50.750000
15;10.0;50.750000
16;10.0;50.750000
17;10.0;50.750000
18;10.0;50.750000
19;10.0;50.750000
20;10.0;50.750000
21;10.0;50.750000
22;10.0;50.750000
23;10.0;50.750000
24;10.0;50.750000
25;8.0;50.600000
26;4.0;50.300000
27;2.0;50.150000
28;2.0;50.150000
29;2.0;50.150000
30;2.0;50.150000
31;2.0;50.150000
32;2.0;50.150000
# line-id; edge-order; edge-id
1;1;20
1;2;19
1;3;32
1;4;14
1;5;13
1;6;23
1;7;9
2;1;17
2;2;18
2;3;32
2;4;14
2;5;13
2;6;23
2;7;9
3;1;14
3;2;31
3;3;10
3;4;9
3;5;22
3;6;5
3;7;6
4;1;31
4;2;10
4;3;9
4;4;22
4;5;21
4;6;1
5;1;31
5;2;10
5;3;9
5;4;22
5;5;5
5;6;6
6;1;20
6;2;19
6;3;18
6;4;17
6;5;24
6;6;13
7;1;16
7;2;15
7;3;14
7;4;13
7;5;23
7;6;9
8;1;5
8;2;21
8;3;1
8;4;2
8;5;3
8;6;4
9;1;19
9;2;32
9;3;14
9;4;27
9;5;26
10;1;19
10;2;32
10;3;14
10;4;27
10;5;10
11;1;16
11;2;15
11;3;31
11;4;11
11;5;12
12;1;16
12;2;15
12;3;14
12;4;27
12;5;26
13;1;16
13;2;15
13;3;14
13;4;27
13;5;10
14;1;14
14;2;27
14;3;10
14;4;30
14;5;29
15;1;14
15;2;27
15;3;10
15;4;30
15;5;7
16;1;14
16;2;27
16;3;10
16;4;11
16;5;12
17;1;14
17;2;13
17;3;23
17;4;9
17;5;10
18;1;12
18;2;11
18;3;30
18;4;29
18;5;3
19;1;12
19;2;11
19;3;30
19;4;29
19;5;2
20;1;12
20;2;11
20;3;30
20;4;7
20;5;8
21;1;12
21;2;11
21;3;10
21;4;26
21;5;5
22;1;11
22;2;30
22;3;29
22;4;2
22;5;1
23;1;9
23;2;10
23;3;30
23;4;29
23;5;2
24;1;8
24;2;7
24;3;29
24;4;2
24;5;1
25;1;1
25;2;2
25;3;29
25;4;30
26;1;26
26;2;10
27;1;31
28;1;30
29;1;27
30;1;15
31;1;11
32;1;7
lc_model; "mult-cost-direct"
\ No newline at end of file
lc_average_distance; 256.86759338275846
lc_average_edges; 4.947368421052632
lc_average_length; 9.894736842105264
lc_cost; 1319.35
lc_feasible; true
lc_min_distance; 100.0
lc_min_edges; 1.0
lc_min_length; 2.0
lc_obj_direct_travellers_sp; 1762
lc_obj_game; 749
lc_prop_directed_lines; 38
lc_prop_freq_max; 3
lc_time_average; 21.44776119402985
lc_var_distance; 9808.51315396039
lc_var_edges; 2.3656509695290815
lc_var_length; 9.462603878116326
#!/usr/bin/env bash
set -e
# Enter your data here
TARGET_DATASET=grid
COMMANDS_TO_RUN="make lc-line-concept && make lc-line-concept-evaluate"
ADDITIONAL_FILES_TO_COMPARE=()
# STATIC PART OF THE SCRIPT
SCRIPT_LOCATION=`dirname $(readlink -f ${BASH_SOURCE[0]})`
echo ------------------------Executing test `basename ${SCRIPT_LOCATION}`
TIMESTAMP=`date +"%Y-%m-%d_%H-%M-%S"`
TARGET_LOCATION=../../datasets/${TARGET_DATASET}_${TIMESTAMP}
BASE_TARGET_LOCATION=../../datasets/${TARGET_DATASET}
cp -r ${BASE_TARGET_LOCATION} ${TARGET_LOCATION}
cp -r * ${TARGET_LOCATION}
cd ${TARGET_LOCATION}
eval ${COMMANDS_TO_RUN}
python3 ${SCRIPT_LOCATION}/../util/evaluate_statistics.py ${SCRIPT_LOCATION}/expected-statistic.sta statistic/statistic.sta
for file in "${ADDITIONAL_FILES_TO_COMPARE}"
do
if [ ${file} ]; then
python3 ${SCRIPT_LOCATION}/../util/compare_files.py ${SCRIPT_LOCATION}/$file $file
fi
done
echo "File comparison successful"
cd ${SCRIPT_LOCATION}
rm -rf ${TARGET_LOCATION}
......@@ -5,9 +5,15 @@ cd "$(dirname "$0")"
# First, run the unit tests
bash run_unit_tests.sh
# Now run every test in this directory
count=0
for test_directory in `find . -maxdepth 1 -type d ! -name template ! -name util ! -name .`
do
cd ${test_directory}
./run.sh
if test -f "DISABLE"; then
count=$((count+1))
else
./run.sh
fi
cd ..
done
\ No newline at end of file
done
echo "Skipped ${count} tests"
\ No newline at end of file
#!/usr/bin/env bash
set -e
cd "$(dirname "$0")"
exec nix-shell -p gurobi python3Packages.gurobipy python3Packages.numpy --run "source ../src/nix-env.sh;source c7-env.sh;bash run_all_tests.sh"
\ No newline at end of file
......@@ -2,7 +2,7 @@
set -e
echo "Running python core unit tests"
cd ../src/core/python
nix-shell -p python3 python3Packages.numpy --run "python3 -m unittest"
python3 -m unittest
echo "Running java core unit tests"
cd ../java
ant -q build-tests
......
tim_feasible; true
tim_obj_ptt1; 19154
tim_obj_slack_average; 22
tim_perceived_time_average; 9.54
tim_perceived_time_average; 7.47
tim_pesp_gap; 0
tim_time_average; 6.37
tim_time_average; 6.33
......@@ -17,6 +17,8 @@ gen_vehicle_speed; 120
gen_conversion_length; 1
# conversion factor to convert the distance between two stations from coordinates to meters
gen_conversion_coordinates; 1
# Additional penalty for each transfer
ean_change_penalty; 5
#lower bound on wait activities in the ean
ean_default_minimal_waiting_time; 1
# upper bound on wait acitivies in the ean
......
......@@ -152,7 +152,7 @@ ean-add-simple-vs:
# -----------------------------------------------------------------------------
tim-timetable:
${SRC_DIR}/timetabling/timetabling.sh
${SRC_DIR}/timetabling/timetabling.sh ${FILENAME_CONFIG}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
......@@ -219,6 +219,8 @@ dm-disposition-timetable-evaluate:
dm-disposition-timetable-batch-evaluate:
${SRC_DIR}/tools/delay-batch-eval/batch-eval.sh
dm-robustness-check:
bash ${SRC_DIR}/timetabling/aperiodic/robustness-evaluation/run_execute.sh
# -----------------------------------------------------------------------------
# === Vehicle Scheduling ======================================================
......@@ -235,6 +237,26 @@ vs-add-circulations-to-ean:
vs-vehicle-schedules-evaluate:
bash ${SRC_DIR}/vehicle-scheduling/evaluation/evaluate_vs.sh
# -----------------------------------------------------------------------------
# === Integrated Models =======================================================
# -----------------------------------------------------------------------------
int-lin-tim-pass:
bash ${SRC_DIR}/integrated_models/lin_tim_pass/run.sh ${FILENAME_CONFIG}
int-lin-tim-pass-veh:
bash ${SRC_DIR}/integrated_models/lin_tim_pass_veh/run.sh ${FILENAME_CONFIG}
int-tim-pass:
bash ${SRC_DIR}/integrated_models/tim_pass/run.sh ${FILENAME_CONFIG}
int-tim-veh:
bash ${SRC_DIR}/integrated_models/tim_veh/run.sh ${FILENAME_CONFIG}
# -----------------------------------------------------------------------------
# === Eigenmodel =============================================================