Merge branch 'release_2020.02' into 'master'

Release 2020.02 See merge request lintim/StagingOpenLinTim!4

Merge branch 'release_2020.02' into 'master'
Release 2020.02 See merge request lintim/StagingOpenLinTim!4
ce5ad5bd · Alexander Schiewe · 28d93f5a · b218e0d8 · ce5ad5bd · ce5ad5bd
Commit ce5ad5bd authored Feb 28, 2020 by Alexander Schiewe
20 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -25,17 +25,22 @@ ConvertTTF
 ConvertTTFSP
 saucy
 plot-PTN
-statistic
 solution.txt
 temp.xml
 Release
 thirdparty
 conprop
 evaluation
-!evaluation/
 shortest_paths_cc
 shortest_paths_sh

+# file to commit
+!makefile
+!Makefile
+!Release/Makefile
+!evaluation/
+!FILES_TO_CLEAN
+
 # LinTim specific data files #
 ##############################
 After-Config.cnf
@@ -65,7 +70,7 @@ Vehicle_Flow.vs
 Vehicle_Schedules.vs
 Vehicles.vs
 data_vehicle_flow
-statistic
+statistic.sta
 Evaluation.txt
 Line-Concept.lin
 Delays-Events.giv

--- a/ci/.gitignore
+++ b/ci/.gitignore
-!Private-Config.cnf
\ No newline at end of file
+!Private-Config.cnf
+!Line-Concept.lin
+!Activities-periodic.giv
+!Events-periodic.giv
+!Timetable-periodic.tim
+!Timetable-visum.tim
+!Activities-expanded.giv
+!Events-expanded.giv
+!Timetable-expanded.tim
+!Trips.giv
+!Vehicle_Schedules.vs
+!Line-Concept.lin
+!Invalid-Loads.sta
+!ptn-graph.dot
+!Timetable-visum-nodes.tim
+!Event-activity-network.dot
\ No newline at end of file
--- a/ci/c7-env.sh
+++ b/ci/c7-env.sh
-#!/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}
--- a/ci/direct/expected-statistic.sta
+++ b/ci/direct/expected-statistic.sta
 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

--- a/ci/ean-add-simple-vs/timetabling/Activities-periodic.giv
+++ b/ci/ean-add-simple-vs/timetabling/Activities-periodic.giv
--- a/ci/ean-add-simple-vs/timetabling/Events-periodic.giv
+++ b/ci/ean-add-simple-vs/timetabling/Events-periodic.giv
+# event_id; type; stop-id; line-id; passengers; line-direction; line-freq-repetition
+1; "departure"; 1; 1; 0; >; 1
+2; "arrival"; 2; 1; 0; >; 1
+3; "departure"; 2; 1; 0; >; 1
+4; "arrival"; 5; 1; 0; >; 1
+5; "departure"; 5; 1; 0; >; 1
+6; "arrival"; 6; 1; 0; >; 1
+7; "departure"; 6; 1; 0; >; 1
+8; "arrival"; 7; 1; 0; >; 1
+9; "departure"; 7; 1; 0; >; 1
+10; "arrival"; 8; 1; 0; >; 1
+11; "departure"; 8; 1; 0; >; 1
+12; "arrival"; 9; 1; 0; >; 1
+13; "departure"; 1; 1; 0; >; 2
+14; "arrival"; 2; 1; 0; >; 2
+15; "departure"; 2; 1; 0; >; 2
+16; "arrival"; 5; 1; 0; >; 2
+17; "departure"; 5; 1; 0; >; 2
+18; "arrival"; 6; 1; 0; >; 2
+19; "departure"; 6; 1; 0; >; 2
+20; "arrival"; 7; 1; 0; >; 2
+21; "departure"; 7; 1; 0; >; 2
+22; "arrival"; 8; 1; 0; >; 2
+23; "departure"; 8; 1; 0; >; 2
+24; "arrival"; 9; 1; 0; >; 2
+25; "departure"; 1; 1; 0; >; 3
+26; "arrival"; 2; 1; 0; >; 3
+27; "departure"; 2; 1; 0; >; 3
+28; "arrival"; 5; 1; 0; >; 3
+29; "departure"; 5; 1; 0; >; 3
+30; "arrival"; 6; 1; 0; >; 3
+31; "departure"; 6; 1; 0; >; 3
+32; "arrival"; 7; 1; 0; >; 3
+33; "departure"; 7; 1; 0; >; 3
+34; "arrival"; 8; 1; 0; >; 3
+35; "departure"; 8; 1; 0; >; 3
+36; "arrival"; 9; 1; 0; >; 3
+37; "departure"; 1; 1; 0; >; 4
+38; "arrival"; 2; 1; 0; >; 4
+39; "departure"; 2; 1; 0; >; 4
+40; "arrival"; 5; 1; 0; >; 4
+41; "departure"; 5; 1; 0; >; 4
+42; "arrival"; 6; 1; 0; >; 4
+43; "departure"; 6; 1; 0; >; 4
+44; "arrival"; 7; 1; 0; >; 4
+45; "departure"; 7; 1; 0; >; 4
+46; "arrival"; 8; 1; 0; >; 4
+47; "departure"; 8; 1; 0; >; 4
+48; "arrival"; 9; 1; 0; >; 4
+49; "departure"; 1; 1; 0; >; 5
+50; "arrival"; 2; 1; 0; >; 5
+51; "departure"; 2; 1; 0; >; 5
+52; "arrival"; 5; 1; 0; >; 5
+53; "departure"; 5; 1; 0; >; 5
+54; "arrival"; 6; 1; 0; >; 5
+55; "departure"; 6; 1; 0; >; 5
+56; "arrival"; 7; 1; 0; >; 5
+57; "departure"; 7; 1; 0; >; 5
+58; "arrival"; 8; 1; 0; >; 5
+59; "departure"; 8; 1; 0; >; 5
+60; "arrival"; 9; 1; 0; >; 5
+61; "departure"; 9; 1; 0; <; 1
+62; "arrival"; 8; 1; 0; <; 1
+63; "departure"; 8; 1; 0; <; 1
+64; "arrival"; 7; 1; 0; <; 1
+65; "departure"; 7; 1; 0; <; 1
+66; "arrival"; 6; 1; 0; <; 1
+67; "departure"; 6; 1; 0; <; 1
+68; "arrival"; 5; 1; 0; <; 1
+69; "departure"; 5; 1; 0; <; 1
+70; "arrival"; 2; 1; 0; <; 1
+71; "departure"; 2; 1; 0; <; 1
+72; "arrival"; 1; 1; 0; <; 1
+73; "departure"; 9; 1; 0; <; 2
+74; "arrival"; 8; 1; 0; <; 2
+75; "departure"; 8; 1; 0; <; 2
+76; "arrival"; 7; 1; 0; <; 2
+77; "departure"; 7; 1; 0; <; 2
+78; "arrival"; 6; 1; 0; <; 2
+79; "departure"; 6; 1; 0; <; 2
+80; "arrival"; 5; 1; 0; <; 2
+81; "departure"; 5; 1; 0; <; 2
+82; "arrival"; 2; 1; 0; <; 2
+83; "departure"; 2; 1; 0; <; 2
+84; "arrival"; 1; 1; 0; <; 2
+85; "departure"; 9; 1; 0; <; 3
+86; "arrival"; 8; 1; 0; <; 3
+87; "departure"; 8; 1; 0; <; 3
+88; "arrival"; 7; 1; 0; <; 3
+89; "departure"; 7; 1; 0; <; 3
+90; "arrival"; 6; 1; 0; <; 3
+91; "departure"; 6; 1; 0; <; 3
+92; "arrival"; 5; 1; 0; <; 3
+93; "departure"; 5; 1; 0; <; 3
+94; "arrival"; 2; 1; 0; <; 3
+95; "departure"; 2; 1; 0; <; 3
+96; "arrival"; 1; 1; 0; <; 3
+97; "departure"; 9; 1; 0; <; 4
+98; "arrival"; 8; 1; 0; <; 4
+99; "departure"; 8; 1; 0; <; 4
+100; "arrival"; 7; 1; 0; <; 4
+101; "departure"; 7; 1; 0; <; 4
+102; "arrival"; 6; 1; 0; <; 4
+103; "departure"; 6; 1; 0; <; 4
+104; "arrival"; 5; 1; 0; <; 4
+105; "departure"; 5; 1; 0; <; 4
+106; "arrival"; 2; 1; 0; <; 4
+107; "departure"; 2; 1; 0; <; 4
+108; "arrival"; 1; 1; 0; <; 4
+109; "departure"; 9; 1; 0; <; 5
+110; "arrival"; 8; 1; 0; <; 5
+111; "departure"; 8; 1; 0; <; 5
+112; "arrival"; 7; 1; 0; <; 5
+113; "departure"; 7; 1; 0; <; 5
+114; "arrival"; 6; 1; 0; <; 5
+115; "departure"; 6; 1; 0; <; 5
+116; "arrival"; 5; 1; 0; <; 5
+117; "departure"; 5; 1; 0; <; 5
+118; "arrival"; 2; 1; 0; <; 5
+119; "departure"; 2; 1; 0; <; 5
+120; "arrival"; 1; 1; 0; <; 5
+121; "departure"; 1; 2; 0; >; 1
+122; "arrival"; 2; 2; 0; >; 1
+123; "departure"; 2; 2; 0; >; 1
+124; "arrival"; 5; 2; 0; >; 1
+125; "departure"; 5; 2; 0; >; 1
+126; "arrival"; 6; 2; 0; >; 1
+127; "departure"; 6; 2; 0; >; 1
+128; "arrival"; 7; 2; 0; >; 1
+129; "departure"; 7; 2; 0; >; 1
+130; "arrival"; 8; 2; 0; >; 1
+131; "departure"; 1; 2; 0; >; 2
+132; "arrival"; 2; 2; 0; >; 2
+133; "departure"; 2; 2; 0; >; 2
+134; "arrival"; 5; 2; 0; >; 2
+135; "departure"; 5; 2; 0; >; 2
+136; "arrival"; 6; 2; 0; >; 2
+137; "departure"; 6; 2; 0; >; 2
+138; "arrival"; 7; 2; 0; >; 2
+139; "departure"; 7; 2; 0; >; 2
+140; "arrival"; 8; 2; 0; >; 2
+141; "departure"; 1; 2; 0; >; 3
+142; "arrival"; 2; 2; 0; >; 3
+143; "departure"; 2; 2; 0; >; 3
+144; "arrival"; 5; 2; 0; >; 3
+145; "departure"; 5; 2; 0; >; 3
+146; "arrival"; 6; 2; 0; >; 3
+147; "departure"; 6; 2; 0; >; 3
+148; "arrival"; 7; 2; 0; >; 3
+149; "departure"; 7; 2; 0; >; 3
+150; "arrival"; 8; 2; 0; >; 3
+151; "departure"; 8; 2; 0; <; 1
+152; "arrival"; 7; 2; 0; <; 1
+153; "departure"; 7; 2; 0; <; 1
+154; "arrival"; 6; 2; 0; <; 1
+155; "departure"; 6; 2; 0; <; 1
+156; "arrival"; 5; 2; 0; <; 1
+157; "departure"; 5; 2; 0; <; 1
+158; "arrival"; 2; 2; 0; <; 1
+159; "departure"; 2; 2; 0; <; 1
+160; "arrival"; 1; 2; 0; <; 1
+161; "departure"; 8; 2; 0; <; 2
+162; "arrival"; 7; 2; 0; <; 2
+163; "departure"; 7; 2; 0; <; 2
+164; "arrival"; 6; 2; 0; <; 2
+165; "departure"; 6; 2; 0; <; 2
+166; "arrival"; 5; 2; 0; <; 2
+167; "departure"; 5; 2; 0; <; 2
+168; "arrival"; 2; 2; 0; <; 2
+169; "departure"; 2; 2; 0; <; 2
+170; "arrival"; 1; 2; 0; <; 2
+171; "departure"; 8; 2; 0; <; 3
+172; "arrival"; 7; 2; 0; <; 3
+173; "departure"; 7; 2; 0; <; 3
+174; "arrival"; 6; 2; 0; <; 3
+175; "departure"; 6; 2; 0; <; 3
+176; "arrival"; 5; 2; 0; <; 3
+177; "departure"; 5; 2; 0; <; 3
+178; "arrival"; 2; 2; 0; <; 3
+179; "departure"; 2; 2; 0; <; 3
+180; "arrival"; 1; 2; 0; <; 3
+181; "departure"; 1; 3; 0; >; 1
+182; "arrival"; 2; 3; 0; >; 1
+183; "departure"; 2; 3; 0; >; 1
+184; "arrival"; 5; 3; 0; >; 1
+185; "departure"; 5; 3; 0; >; 1
+186; "arrival"; 6; 3; 0; >; 1
+187; "departure"; 6; 3; 0; >; 1
+188; "arrival"; 7; 3; 0; >; 1
+189; "departure"; 1; 3; 0; >; 2
+190; "arrival"; 2; 3; 0; >; 2
+191; "departure"; 2; 3; 0; >; 2
+192; "arrival"; 5; 3; 0; >; 2
+193; "departure"; 5; 3; 0; >; 2
+194; "arrival"; 6; 3; 0; >; 2
+195; "departure"; 6; 3; 0; >; 2
+196; "arrival"; 7; 3; 0; >; 2
+197; "departure"; 7; 3; 0; <; 1
+198; "arrival"; 6; 3; 0; <; 1
+199; "departure"; 6; 3; 0; <; 1
+200; "arrival"; 5; 3; 0; <; 1
+201; "departure"; 5; 3; 0; <; 1
+202; "arrival"; 2; 3; 0; <; 1
+203; "departure"; 2; 3; 0; <; 1
+204; "arrival"; 1; 3; 0; <; 1
+205; "departure"; 7; 3; 0; <; 2
+206; "arrival"; 6; 3; 0; <; 2
+207; "departure"; 6; 3; 0; <; 2
+208; "arrival"; 5; 3; 0; <; 2
+209; "departure"; 5; 3; 0; <; 2
+210; "arrival"; 2; 3; 0; <; 2
+211; "departure"; 2; 3; 0; <; 2
+212; "arrival"; 1; 3; 0; <; 2
+213; "departure"; 1; 4; 0; >; 1
+214; "arrival"; 2; 4; 0; >; 1
+215; "departure"; 2; 4; 0; >; 1
+216; "arrival"; 10; 4; 0; >; 1
+217; "departure"; 10; 4; 0; >; 1
+218; "arrival"; 11; 4; 0; >; 1
+219; "departure"; 1; 4; 0; >; 2
+220; "arrival"; 2; 4; 0; >; 2
+221; "departure"; 2; 4; 0; >; 2
+222; "arrival"; 10; 4; 0; >; 2
+223; "departure"; 10; 4; 0; >; 2
+224; "arrival"; 11; 4; 0; >; 2
+225; "departure"; 1; 4; 0; >; 3
+226; "arrival"; 2; 4; 0; >; 3
+227; "departure"; 2; 4; 0; >; 3
+228; "arrival"; 10; 4; 0; >; 3
+229; "departure"; 10; 4; 0; >; 3
+230; "arrival"; 11; 4; 0; >; 3
+231; "departure"; 11; 4; 0; <; 1
+232; "arrival"; 10; 4; 0; <; 1
+233; "departure"; 10; 4; 0; <; 1
+234; "arrival"; 2; 4; 0; <; 1
+235; "departure"; 2; 4; 0; <; 1
+236; "arrival"; 1; 4; 0; <; 1
+237; "departure"; 11; 4; 0; <; 2
+238; "arrival"; 10; 4; 0; <; 2
+239; "departure"; 10; 4; 0; <; 2
+240; "arrival"; 2; 4; 0; <; 2
+241; "departure"; 2; 4; 0; <; 2
+242; "arrival"; 1; 4; 0; <; 2
+243; "departure"; 11; 4; 0; <; 3
+244; "arrival"; 10; 4; 0; <; 3
+245; "departure"; 10; 4; 0; <; 3
+246; "arrival"; 2; 4; 0; <; 3
+247; "departure"; 2; 4; 0; <; 3
+248; "arrival"; 1; 4; 0; <; 3
+249; "departure"; 1; 5; 0; >; 1
+250; "arrival"; 2; 5; 0; >; 1
+251; "departure"; 2; 5; 0; >; 1
+252; "arrival"; 10; 5; 0; >; 1
+253; "departure"; 1; 5; 0; >; 2
+254; "arrival"; 2; 5; 0; >; 2
+255; "departure"; 2; 5; 0; >; 2
+256; "arrival"; 10; 5; 0; >; 2
+257; "departure"; 10; 5; 0; <; 1
+258; "arrival"; 2; 5; 0; <; 1
+259; "departure"; 2; 5; 0; <; 1
+260; "arrival"; 1; 5; 0; <; 1
+261; "departure"; 10; 5; 0; <; 2
+262; "arrival"; 2; 5; 0; <; 2
+263; "departure"; 2; 5; 0; <; 2
+264; "arrival"; 1; 5; 0; <; 2
+265; "departure"; 9; 6; 0; >; 1
+266; "arrival"; 8; 6; 0; >; 1
+267; "departure"; 8; 6; 0; >; 1
+268; "arrival"; 7; 6; 0; >; 1
+269; "departure"; 7; 6; 0; >; 1
+270; "arrival"; 6; 6; 0; >; 1
+271; "departure"; 6; 6; 0; >; 1
+272; "arrival"; 5; 6; 0; >; 1
+273; "departure"; 5; 6; 0; >; 1
+274; "arrival"; 2; 6; 0; >; 1
+275; "departure"; 2; 6; 0; >; 1
+276; "arrival"; 10; 6; 0; >; 1
+277; "departure"; 10; 6; 0; >; 1
+278; "arrival"; 11; 6; 0; >; 1
+279; "departure"; 11; 6; 0; <; 1
+280; "arrival"; 10; 6; 0; <; 1
+281; "departure"; 10; 6; 0; <; 1
+282; "arrival"; 2; 6; 0; <; 1
+283; "departure"; 2; 6; 0; <; 1
+284; "arrival"; 5; 6; 0; <; 1
+285; "departure"; 5; 6; 0; <; 1
+286; "arrival"; 6; 6; 0; <; 1
+287; "departure"; 6; 6; 0; <; 1
+288; "arrival"; 7; 6; 0; <; 1
+289; "departure"; 7; 6; 0; <; 1
+290; "arrival"; 8; 6; 0; <; 1
+291; "departure"; 8; 6; 0; <; 1
+292; "arrival"; 9; 6; 0; <; 1
+293; "departure"; 2; 7; 0; >; 1
+294; "arrival"; 5; 7; 0; >; 1
+295; "departure"; 5; 7; 0; >; 1
+296; "arrival"; 6; 7; 0; >; 1
+297; "departure"; 6; 7; 0; >; 1
+298; "arrival"; 7; 7; 0; >; 1
+299; "departure"; 7; 7; 0; >; 1
+300; "arrival"; 8; 7; 0; >; 1
+301; "departure"; 8; 7; 0; >; 1
+302; "arrival"; 9; 7; 0; >; 1
+303; "departure"; 2; 7; 0; >; 2
+304; "arrival"; 5; 7; 0; >; 2
+305; "departure"; 5; 7; 0; >; 2
+306; "arrival"; 6; 7; 0; >; 2
+307; "departure"; 6; 7; 0; >; 2
+308; "arrival"; 7; 7; 0; >; 2
+309; "departure"; 7; 7; 0; >; 2
+310; "arrival"; 8; 7; 0; >; 2
+311; "departure"; 8; 7; 0; >; 2
+312; "arrival"; 9; 7; 0; >; 2
+313; "departure"; 9; 7; 0; <; 1
+314; "arrival"; 8; 7; 0; <; 1
+315; "departure"; 8; 7; 0; <; 1
+316; "arrival"; 7; 7; 0; <; 1
+317; "departure"; 7; 7; 0; <; 1
+318; "arrival"; 6; 7; 0; <; 1
+319; "departure"; 6; 7; 0; <; 1
+320; "arrival"; 5; 7; 0; <; 1
+321; "departure"; 5; 7; 0; <; 1
+322; "arrival"; 2; 7; 0; <; 1
+323; "departure"; 9; 7; 0; <; 2
+324; "arrival"; 8; 7; 0; <; 2
+325; "departure"; 8; 7; 0; <; 2
+326; "arrival"; 7; 7; 0; <; 2
+327; "departure"; 7; 7; 0; <; 2
+328; "arrival"; 6; 7; 0; <; 2
+329; "departure"; 6; 7; 0; <; 2
+330; "arrival"; 5; 7; 0; <; 2
+331; "departure"; 5; 7; 0; <; 2
+332; "arrival"; 2; 7; 0; <; 2
+333; "departure"; 2; 8; 0; >; 1
+334; "arrival"; 5; 8; 0; >; 1
+335; "departure"; 5; 8; 0; >; 1
+336; "arrival"; 6; 8; 0; >; 1
+337; "departure"; 6; 8; 0; >; 1
+338; "arrival"; 7; 8; 0; >; 1
+339; "departure"; 7; 8; 0; >; 1
+340; "arrival"; 8; 8; 0; >; 1
+341; "departure"; 8; 8; 0; <; 1
+342; "arrival"; 7; 8; 0; <; 1
+343; "departure"; 7; 8; 0; <; 1
+344; "arrival"; 6; 8; 0; <; 1
+345; "departure"; 6; 8; 0; <; 1
+346; "arrival"; 5; 8; 0; <; 1
+347; "departure"; 5; 8; 0; <; 1
+348; "arrival"; 2; 8; 0; <; 1
+349; "departure"; 2; 9; 0; >; 1
+350; "arrival"; 5; 9; 0; >; 1
+351; "departure"; 5; 9; 0; >; 1
+352; "arrival"; 6; 9; 0; >; 1
+353; "departure"; 6; 9; 0; >; 1
+354; "arrival"; 7; 9; 0; >; 1
+355; "departure"; 7; 9; 0; <; 1
+356; "arrival"; 6; 9; 0; <; 1
+357; "departure"; 6; 9; 0; <; 1
+358; "arrival"; 5; 9; 0; <; 1
+359; "departure"; 5; 9; 0; <; 1
+360; "arrival"; 2; 9; 0; <; 1
+361; "departure"; 3; 10; 0; >; 1
+362; "arrival"; 4; 10; 0; >; 1
+363; "departure"; 4; 10; 0; >; 1
+364; "arrival"; 7; 10; 0; >; 1
+365; "departure"; 7; 10; 0; >; 1
+366; "arrival"; 8; 10; 0; >; 1
+367; "departure"; 8; 10; 0; >; 1
+368; "arrival"; 9; 10; 0; >; 1
+369; "departure"; 3; 10; 0; >; 2
+370; "arrival"; 4; 10; 0; >; 2
+371; "departure"; 4; 10; 0; >; 2
+372; "arrival"; 7; 10; 0; >; 2
+373; "departure"; 7; 10; 0; >; 2
+374; "arrival"; 8; 10; 0; >; 2
+375; "departure"; 8; 10; 0; >; 2
+376; "arrival"; 9; 10; 0; >; 2
+377; "departure"; 9; 10; 0; <; 1
+378; "arrival"; 8; 10; 0; <; 1
+379; "departure"; 8; 10; 0; <; 1
+380; "arrival"; 7; 10; 0; <; 1
+381; "departure"; 7; 10; 0; <; 1
+382; "arrival"; 4; 10; 0; <; 1
+383; "departure"; 4; 10; 0; <; 1
+384; "arrival"; 3; 10; 0; <; 1
+385; "departure"; 9; 10; 0; <; 2
+386; "arrival"; 8; 10; 0; <; 2
+387; "departure"; 8; 10; 0; <; 2
+388; "arrival"; 7; 10; 0; <; 2
+389; "departure"; 7; 10; 0; <; 2
+390; "arrival"; 4; 10; 0; <; 2
+391; "departure"; 4; 10; 0; <; 2
+392; "arrival"; 3; 10; 0; <; 2
+393; "departure"; 3; 11; 0; >; 1
+394; "arrival"; 4; 11; 0; >; 1
+395; "departure"; 4; 11; 0; >; 1
+396; "arrival"; 7; 11; 0; >; 1
+397; "departure"; 3; 11; 0; >; 2
+398; "arrival"; 4; 11; 0; >; 2
+399; "departure"; 4; 11; 0; >; 2
+400; "arrival"; 7; 11; 0; >; 2
+401; "departure"; 3; 11; 0; >; 3
+402; "arrival"; 4; 11; 0; >; 3
+403; "departure"; 4; 11; 0; >; 3
+404; "arrival"; 7; 11; 0; >; 3
+405; "departure"; 7; 11; 0; <; 1
+406; "arrival"; 4; 11; 0; <; 1
+407; "departure"; 4; 11; 0; <; 1
+408; "arrival"; 3; 11; 0; <; 1
+409; "departure"; 7; 11; 0; <; 2
+410; "arrival"; 4; 11; 0; <; 2
+411; "departure"; 4; 11; 0; <; 2
+412; "arrival"; 3; 11; 0; <; 2
+413; "departure"; 7; 11; 0; <; 3
+414; "arrival"; 4; 11; 0; <; 3
+415; "departure"; 4; 11; 0; <; 3
+416; "arrival"; 3; 11; 0; <; 3
+417; "departure"; 3; 12; 0; >; 1
+418; "arrival"; 4; 12; 0; >; 1
+419; "departure"; 4; 12; 0; >; 1
+420; "arrival"; 6; 12; 0; >; 1
+421; "departure"; 3; 12; 0; >; 2
+422; "arrival"; 4; 12; 0; >; 2
+423; "departure"; 4; 12; 0; >; 2
+424; "arrival"; 6; 12; 0; >; 2
+425; "departure"; 3; 12; 0; >; 3
+426; "arrival"; 4; 12; 0; >; 3
+427; "departure"; 4; 12; 0; >; 3
+428; "arrival"; 6; 12; 0; >; 3
+429; "departure"; 3; 12; 0; >; 4
+430; "arrival"; 4; 12; 0; >; 4
+431; "departure"; 4; 12; 0; >; 4
+432; "arrival"; 6; 12; 0; >; 4
+433; "departure"; 3; 12; 0; >; 5
+434; "arrival"; 4; 12; 0; >; 5
+435; "departure"; 4; 12; 0; >; 5
+436; "arrival"; 6; 12; 0; >; 5
+437; "departure"; 6; 12; 0; <; 1
+438; "arrival"; 4; 12; 0; <; 1
+439; "departure"; 4; 12; 0; <; 1
+440; "arrival"; 3; 12; 0; <; 1
+441; "departure"; 6; 12; 0; <; 2
+442; "arrival"; 4; 12; 0; <; 2
+443; "departure"; 4; 12; 0; <; 2
+444; "arrival"; 3; 12; 0; <; 2
+445; "departure"; 6; 12; 0; <; 3
+446; "arrival"; 4; 12; 0; <; 3
+447; "departure"; 4; 12; 0; <; 3
+448; "arrival"; 3; 12; 0; <; 3
+449; "departure"; 6; 12; 0; <; 4
+450; "arrival"; 4; 12; 0; <; 4
+451; "departure"; 4; 12; 0; <; 4
+452; "arrival"; 3; 12; 0; <; 4
+453; "departure"; 6; 12; 0; <; 5
+454; "arrival"; 4; 12; 0; <; 5
+455; "departure"; 4; 12; 0; <; 5
+456; "arrival"; 3; 12; 0; <; 5
--- a/ci/evaluate-passenger-load/expected-statistic.sta
+++ b/ci/evaluate-passenger-load/expected-statistic.sta
@@ -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
--- a/ci/evaluate-passenger-load/line-planning/Line-Concept.lin
+++ b/ci/evaluate-passenger-load/line-planning/Line-Concept.lin
+# line-id; edge-order; edge-id; frequency
+1; 1; 1; 3
+1; 2; 2; 3
+1; 3; 3; 3
+1; 4; 4; 3
+1; 5; 5; 3
+2; 1; 1; 0
+2; 2; 2; 0
+2; 3; 3; 0
+2; 4; 4; 0
+2; 5; 5; 0
+2; 6; 6; 0
+3; 1; 1; 0
+3; 2; 2; 0
+3; 3; 3; 0
+3; 4; 4; 0
+3; 5; 5; 0
+3; 6; 6; 0
+3; 7; 7; 0
+3; 8; 8; 0
+3; 9; 9; 0
+4; 1; 1; 0
+4; 2; 2; 0
+4; 3; 3; 0
+4; 4; 4; 0
+4; 5; 5; 0
+4; 6; 6; 0
+4; 7; 7; 0
+4; 8; 8; 0
+4; 9; 9; 0
+4; 10; 10; 0
+4; 11; 11; 0
+4; 12; 12; 0
+4; 13; 13; 0
+5; 1; 1; 0
+5; 2; 2; 0
+5; 3; 3; 0
+5; 4; 4; 0
+5; 5; 5; 0
+5; 6; 6; 0
+5; 7; 7; 0
+5; 8; 8; 0
+5; 9; 9; 0
+5; 10; 10; 0
+5; 11; 11; 0