Commit 609bff6a authored by Alexander Schiewe's avatar Alexander Schiewe

Merge branch 'initial-version' into 'master'

Initial version

See merge request LinTim/StagingOpenLinTim!3
parents 0c664eae ac5f5efd

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
# top-most EditorConfig file
root = true
# Unix-style newlines without a newline ending every file
[*]
end_of_line = lf
insert_final_newline = false
# Set default charset
charset = utf-8
# 4 space indentation
indent_style = space
indent_size = 4
# remove whitespaces after last character and before newline
trim_trailing_whitespace = true
spaces_around_operators = true
# Tab indentation (no size specified)
[Makefile]
indent_style = tab
[Base-Makefile]
indent_style = tab
\ No newline at end of file
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
out/
build/
# LinTim Specific Compiled #
# ##########################
config_cmd
statistic_cmd
Conv_Game
Convert
H6
H7
SolConf
SolConv
lineplan
ConvertTT
ConvertTTF
ConvertTTFSP
saucy
plot-PTN
statistic
solution.txt
temp.xml
Release
thirdparty
conprop
evaluation
!evaluation/
shortest_paths_cc
shortest_paths_sh
# LinTim specific data files #
##############################
After-Config.cnf
State-Config.cnf
Private-Config.cnf
datasets/lowersaxony/basis/CoveringMatrix-file.dat
datasets/lowersaxony/basis/Edge.giv
datasets/lowersaxony/basis/Load.giv
datasets/lowersaxony/basis/OD.giv
datasets/lowersaxony/basis/Pool-Cost.giv
datasets/lowersaxony/basis/Pool.giv
datasets/lowersaxony/basis/Stop.giv
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
end-events-of-trips.giv
Station_Distances.vs
Canal_Network.vs
VS_Evaluation.vs
Vehicle_Flow.vs
Vehicle_Schedules.vs
Vehicles.vs
data_vehicle_flow
statistic
Evaluation.txt
Line-Concept.lin
Delays-Events.giv
Delays-Activities.giv
*.dot
*.ps
*.png
# Cmake files #
###############
CMakeCache.txt
CMakeFiles/
CMakeList.txt
cmake_install.cmake
# MIP Files #
# ###########
*.lp
*.ilp
# IDEs #
# #####
.idea
*.iml
# C++ #
# #####
# Prerequisites
*.d
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
# Java #
# ######
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# Python #
# ########
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/
# Translations
*.mo
*.pot
# Django stuff:
*.log
local_settings.py
# Flask stuff:
instance/
.webassets-cache
# Scrapy stuff:
.scrapy
# Sphinx documentation
docs/_build/
# PyBuilder
target/
# IPython Notebook
.ipynb_checkpoints
# pyenv
.python-version
# celery beat schedule file
celerybeat-schedule
# dotenv
.env
# virtualenv
.venv/
venv/
ENV/
# Spyder project settings
.spyderproject
# Rope project settings
.ropeproject
# Gradle #
#########
.gradle
/build/
# Ignore Gradle GUI config
gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Cache of project
.gradletasknamecache
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties
\ No newline at end of file
before_script:
- source /opt/xpressmp/bin/xpvars.sh
run_tests:
only:
- web
- schedules
script:
- bash ci/run_tests.sh
## Readme
You find everything in the [docs](doc/documentation.pdf)
\ No newline at end of file
!Private-Config.cnf
\ No newline at end of file
# How to create new CI tests
- Copy the content of the `template` folder into a new folder in `/ci/`
- Modify the run.sh file
- Name the `TARGET_DATASET` variable
- Enter the commands to run into the `COMMANDS_TO_RUN` variable
- Enter the necessary config data into basis/Private-Config.cnf
- Enter the expected outcome into expected-statistic.sta
\ No newline at end of file
#!/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_common_frequency_divisor; 2
\ No newline at end of file
lc_average_distance; 172.15873793431686
lc_average_edges; 2.75
lc_average_length; 2.5999999999999996
lc_cost; 54
lc_feasible; true
lc_min_distance; 100.0
lc_min_edges; 1.0
lc_min_length; 0.8
lc_obj_direct_travellers_sp; 1580
lc_obj_game; 260
lc_prop_directed_lines; 8
lc_prop_freq_max; 4
lc_time_average; 5.55301296720061
lc_var_distance; 2861.3689528632094
lc_var_edges; 2.1875
lc_var_length; 2.2200000000000024
\ No newline at end of file
#!/usr/bin/env bash
set -e
# Enter your data here
TARGET_DATASET=toy
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}
lc_model; "cost_restricting_frequencies"
\ No newline at end of file
lc_average_distance; 172.15873793431686
lc_average_edges; 2.75
lc_average_length; 2.5999999999999996
lc_cost; 54
lc_feasible; true
lc_min_distance; 100.0
lc_min_edges; 1.0
lc_min_length; 0.8
lc_obj_direct_travellers_sp; 1580
lc_obj_game; 260
lc_prop_directed_lines; 8
lc_prop_freq_max; 4
lc_time_average; 5.55301296720061
lc_var_distance; 2861.3689528632094
lc_var_edges; 2.1875
lc_var_length; 2.2200000000000024
\ No newline at end of file
#!/usr/bin/env bash
set -e
# Enter your data here
TARGET_DATASET=toy
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}
lc_model; "direct_restricting_frequencies"
\ No newline at end of file
lc_average_distance; 4278.691937220739
lc_average_edges; 16.274725274725274
lc_average_length; 6.663526073690003
lc_cost; 6934
lc_feasible; true
lc_min_distance; 148.74772066473318
lc_min_edges; 1.0
lc_min_length; 0.373518900016
lc_obj_direct_travellers_sp; 47616
lc_obj_game; 47205
lc_prop_directed_lines; 91
lc_prop_freq_max; 4
lc_time_average; 26.142859956764315
lc_var_distance; 5505189.573452916
lc_var_edges; 101.14430624320738
lc_var_length; 15.905016874383051
#!/usr/bin/env bash
set -e
# Enter your data here
TARGET_DATASET=goevb
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}
# 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