Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
LinTim
OpenLinTim
Commits
ac5f5efd
Commit
ac5f5efd
authored
Jun 27, 2018
by
Alexander Schiewe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add last bugfixes for initial release
parent
7f0d940c
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
135 additions
and
131 deletions
+135
-131
ci/direct-restricting-frequencies/expected-statistic.sta
ci/direct-restricting-frequencies/expected-statistic.sta
+10
-10
ci/direct/expected-statistic.sta
ci/direct/expected-statistic.sta
+10
-10
ci/evaluate-passenger-load/expected-statistic.sta
ci/evaluate-passenger-load/expected-statistic.sta
+3
-3
ci/grid_basics_dm/expected-statistic.sta
ci/grid_basics_dm/expected-statistic.sta
+33
-33
ci/grid_basics_vs/expected-statistic.sta
ci/grid_basics_vs/expected-statistic.sta
+18
-18
ci/java_core_test_1/expected-statistic.sta
ci/java_core_test_1/expected-statistic.sta
+17
-17
ci/lp-tree-based-restrictions/expected-statistic.sta
ci/lp-tree-based-restrictions/expected-statistic.sta
+2
-2
ci/timetabling-ip/expected-statistic.sta
ci/timetabling-ip/expected-statistic.sta
+3
-3
ci/vehicle-scheduling-ip/expected-statistic.sta
ci/vehicle-scheduling-ip/expected-statistic.sta
+11
-11
ci/vehicle-scheduling-simple/expected-statistic.sta
ci/vehicle-scheduling-simple/expected-statistic.sta
+10
-10
src/core/java/src/net/lintim/io/CsvWriter.java
src/core/java/src/net/lintim/io/CsvWriter.java
+1
-1
src/core/java/src/net/lintim/model/Stop.java
src/core/java/src/net/lintim/model/Stop.java
+2
-4
src/core/java/test/resources/dataset/basis/Stop.giv
src/core/java/test/resources/dataset/basis/Stop.giv
+8
-8
src/core/java/test/src/net/lintim/main/TestRunner.java
src/core/java/test/src/net/lintim/main/TestRunner.java
+6
-0
src/core/python/core/io/lines.py
src/core/python/core/io/lines.py
+1
-1
No files found.
ci/direct-restricting-frequencies/expected-statistic.sta
View file @
ac5f5efd
lc_average_distance; 4
390.974510112171
lc_average_edges; 16.
554347826086957
lc_average_length; 6.
741054748612596
lc_cost; 6
883
lc_average_distance; 4
278.691937220739
lc_average_edges; 16.
274725274725274
lc_average_length; 6.
663526073690003
lc_cost; 6
934
lc_feasible; true
lc_min_distance; 148.74772066473318
lc_min_edges; 1.0
lc_min_length; 0.373518900016
lc_obj_direct_travellers_sp; 4
8545
lc_obj_game; 4
8262
lc_prop_directed_lines; 9
2
lc_obj_direct_travellers_sp; 4
7616
lc_obj_game; 4
7205
lc_prop_directed_lines; 9
1
lc_prop_freq_max; 4
lc_time_average; 26.142859956764315
lc_var_distance; 5
663182.617455538
lc_var_edges; 10
2
.1
6008979206049
lc_var_length; 15.
758873321190748
lc_var_distance; 5
505189.573452916
lc_var_edges; 10
1
.1
4430624320738
lc_var_length; 15.
905016874383051
ci/direct/expected-statistic.sta
View file @
ac5f5efd
lc_average_distance; 23
4.54457117608246
lc_average_edges; 4.
46875
lc_average_length;
8.9375
lc_cost; 5
239.9
lc_average_distance; 23
6.9267361936697
lc_average_edges; 4.
535714285714286
lc_average_length;
9.071428571428571
lc_cost; 5
193.5
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;
3662
lc_prop_directed_lines; 6
4
lc_prop_freq_max; 1
4
lc_obj_game;
4096
lc_prop_directed_lines;
5
6
lc_prop_freq_max; 1
5
lc_time_average; 21.44776119402985
lc_var_distance; 10926.344131827587
lc_var_edges; 3.5615234375
lc_var_length; 14.24609375
\ No newline at end of file
lc_var_distance; 12080.007390900952
lc_var_edges; 3.8201530612244916
lc_var_length; 15.280612244897966
ci/evaluate-passenger-load/expected-statistic.sta
View file @
ac5f5efd
...
...
@@ -10,11 +10,11 @@ ean_prop_activities_od_change; 589
ean_prop_activities_od_drive; 656
ean_prop_activities_od_wait; 549
ean_prop_activities_wait; 592
ean_prop_change_od_max; 1220
.0
ean_prop_change_od_min; 172.38
095238095238
ean_prop_change_od_max; 1220
ean_prop_change_od_min; 172.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.41232944009028
\ No newline at end of file
ean_time_average; 36.41
ci/grid_basics_dm/expected-statistic.sta
View file @
ac5f5efd
ean_prop_activities; 17
0
4
ean_prop_activities_change; 13
1
0
ean_prop_activities; 17
3
4
ean_prop_activities_change; 13
5
0
ean_prop_activities_drive; 182
ean_prop_activities_headway; 0
ean_prop_activities_od; 5
17
ean_prop_activities_od_change; 20
6
ean_prop_activities_od_drive; 17
6
ean_prop_activities_od_wait; 13
5
ean_prop_activities_od; 5
06
ean_prop_activities_od_change; 20
1
ean_prop_activities_od_drive; 17
5
ean_prop_activities_od_wait; 13
0
ean_prop_activities_wait; 144
ean_prop_events; 364
ean_prop_events_arrival; 182
ean_prop_events_departure; 182
ean_time_average; 10.
03612838178457
3
lc_average_distance; 3
16.4926892214381
lc_average_edges; 4.7
5
lc_average_length; 9.5
ean_time_average; 10.
2
3
lc_average_distance; 3
09.35
lc_average_edges; 4.7
7
lc_average_length; 9.5
4
lc_cost; 963.65
lc_feasible; true
lc_min_distance; 100
.0
lc_min_edges; 1
.0
lc_min_length; 2
.0
lc_obj_direct_travellers_sp; 168
3
lc_obj_game; 4
81
lc_prop_directed_lines; 2
4
lc_min_distance; 100
lc_min_edges; 1
lc_min_length; 2
lc_obj_direct_travellers_sp; 168
2
lc_obj_game; 4
67
lc_prop_directed_lines; 2
6
lc_prop_freq_max; 3
lc_time_average; 22.16
1822466614296
lc_var_distance; 1
2332.37766938218
6
lc_var_edges; 1.
687
5
lc_var_length; 6.
7
5
lpool_cost; 1620.85
00000000004
lc_time_average; 22.16
lc_var_distance; 1
1996.3
6
lc_var_edges; 1.5
6
lc_var_length; 6.
2
5
lpool_cost; 1620.85
lpool_feasible_circles; true
lpool_feasible_od; true
lpool_prop_directed_lines; 64
lpool_time_average; 21.67
3998428908092
lpool_time_average; 21.67
od_prop_entries_greater_zero; 567
od_prop_overall_sum; 2546
.0
od_prop_overall_sum; 2546
ptn_feasible_od; true
ptn_obj_stops; 25
ptn_prop_edges; 40
ptn_time_average; 8.70
2499584431566
ptn_time_average; 8.70
tim_feasible; true
tim_obj_ptt1; 60
709
tim_obj_ptt1; 60
442
tim_obj_slack_average; 22
tim_perceived_time_average; 20.
5455
62
tim_time_average; 18.
766300
tim_perceived_time_average; 20.62
tim_time_average; 18.
91
dm_feasible; true
dm_obj_changes_missed_od;
3
dm_obj_delay_events_average; 44.
06579849211789
dm_obj_dm2; 4
02387
dm_obj_dm2_average; 1
58.04673998428
908
dm_prop_events_delayed; 1
24
dm_obj_changes_missed_od;
6
dm_obj_delay_events_average; 44.
23750855578371
dm_obj_dm2; 4
59689
dm_obj_dm2_average; 1
80.553417124
90
1
8
dm_prop_events_delayed; 1
33
dm_prop_headways_swapped; 0
dm_time_average; 3
631.5563629222315
dm_time_average; 3
870.6658811207126
ci/grid_basics_vs/expected-statistic.sta
View file @
ac5f5efd
ro_prop_stations_at_begin_or_end; 1
6
ro_prop_trips; 13
5
ro_prop_stations_at_begin_or_end; 1
7
ro_prop_trips; 13
6
ro_trips_feasible; true
vs_average_waiting_time; 1
5.57
vs_circulations;
9
vs_cost; 2
9
05
583.8333333335
vs_empty_cost; 2
902058.3333333335
vs_empty_distance;
30.0
vs_empty_distance_with_depot; 5
10.
0
vs_empty_duration_driving;
107.0
vs_empty_duration_standing; 1
557.0
vs_empty_duration_with_depot;
3104.0
vs_empty_trips;
6
vs_empty_trips_depot;
59
vs_average_waiting_time; 1
3.2
vs_circulations;
28
vs_cost; 2
8
05
489.33
vs_empty_cost; 2
801925.33
vs_empty_distance;
94
vs_empty_distance_with_depot; 50
8
vs_empty_duration_driving;
547
vs_empty_duration_standing; 1
003
vs_empty_duration_with_depot;
2792
vs_empty_trips;
32
vs_empty_trips_depot;
82
vs_feasible; true
vs_full_distance; 12
82.0
vs_full_duration; 38
46.0
vs_maximal_waiting_time; 56
.0
vs_minimal_waiting_time;
2.
0
vs_vehicles; 2
9
vs_full_distance; 12
96
vs_full_duration; 38
88
vs_maximal_waiting_time; 56
vs_minimal_waiting_time; 0
vs_vehicles; 2
8
ci/java_core_test_1/expected-statistic.sta
View file @
ac5f5efd
ro_prop_stations_at_begin_or_end;
9
ro_prop_trips; 1
4
5
ro_prop_stations_at_begin_or_end;
11
ro_prop_trips; 15
3
ro_trips_feasible; true
vs_average_waiting_time;
9
.2
68041237113403
vs_circulations;
6
vs_cost; 33
38524.782559462
vs_empty_cost; 29
14105.095868647
vs_empty_distance;
275.602246125692
vs_empty_distance_with_depot; 4
0
89
45.06391243153
vs_empty_duration_driving;
81.
0
vs_empty_duration_standing; 8
99.
0
vs_empty_duration_with_depot; 16
50.
0
vs_empty_trips; 2
5
vs_empty_trips_depot; 6
7
vs_average_waiting_time;
7
.2
7
vs_circulations;
3
vs_cost; 33
68211.68
vs_empty_cost; 29
29134.69
vs_empty_distance;
640.4
vs_empty_distance_with_depot; 4
1
89
70.35
vs_empty_duration_driving;
15
0
vs_empty_duration_standing; 8
0
0
vs_empty_duration_with_depot; 16
3
0
vs_empty_trips; 2
0
vs_empty_trips_depot; 6
3
vs_feasible; true
vs_full_distance; 2
81901.73557
1654
2
vs_full_duration; 3
761.0
vs_maximal_waiting_time; 3
5.0
vs_minimal_waiting_time; 0
.0
vs_full_distance; 2
9
1654
.93
vs_full_duration; 3
827
vs_maximal_waiting_time; 3
3
vs_minimal_waiting_time; 0
vs_vehicles; 23
ci/lp-tree-based-restrictions/expected-statistic.sta
View file @
ac5f5efd
lpool_cost;
1998.3779430000002
lpool_cost;
2654.236176
lpool_feasible_circles; true
lpool_feasible_od; true
lpool_prop_directed_lines;
38
lpool_prop_directed_lines;
44
lpool_time_average; 20.981381363139352
ci/timetabling-ip/expected-statistic.sta
View file @
ac5f5efd
tim_feasible; true
tim_obj_ptt1; 19154
tim_obj_slack_average; 22
tim_perceived_time_average; 9.54
3860
tim_pesp_gap; 0
.0
tim_time_average; 6.37
0709
tim_perceived_time_average; 9.54
tim_pesp_gap; 0
tim_time_average; 6.37
ci/vehicle-scheduling-ip/expected-statistic.sta
View file @
ac5f5efd
vs_average_waiting_time; 13.
870967741935484
vs_average_waiting_time; 13.
9
vs_circulations; 12
vs_cost; 1207375.18
3333333
vs_empty_cost; 1201504.53
33333332
vs_cost; 1207375.18
vs_empty_cost; 1201504.53
vs_empty_distance; 129.6
vs_empty_distance_with_depot; 580.8
000000000001
vs_empty_duration_driving; 8
7.0
vs_empty_duration_standing; 129
0.0
vs_empty_duration_with_depot; 1520
.0
vs_empty_distance_with_depot; 580.8
vs_empty_duration_driving; 8
4
vs_empty_duration_standing; 129
3
vs_empty_duration_with_depot; 1520
vs_empty_trips; 8
vs_empty_trips_depot; 27
vs_feasible; true
vs_full_distance; 3609.
599999999995
vs_full_duration; 1095
.0
vs_maximal_waiting_time; 52
.0
vs_minimal_waiting_time; 1
.0
vs_full_distance; 3609.
6
vs_full_duration; 1095
vs_maximal_waiting_time; 52
vs_minimal_waiting_time; 1
vs_vehicles; 12
ci/vehicle-scheduling-simple/expected-statistic.sta
View file @
ac5f5efd
vs_average_waiting_time; 10.67
122507122508
vs_average_waiting_time; 10.67
vs_circulations; 1
vs_cost; 4019154.69
03885696
vs_empty_cost; 4012904.4
45815768
vs_empty_distance; 0
.0
vs_empty_distance_with_depot; 1373.35
27660676966
vs_empty_duration_driving; 0
.0
vs_empty_duration_standing; 3745.6
000000000035
vs_empty_duration_with_depot; 26026.6
00000000002
vs_cost; 4019154.69
vs_empty_cost; 4012904.4
5
vs_empty_distance; 0
vs_empty_distance_with_depot; 1373.35
vs_empty_duration_driving; 0
vs_empty_duration_standing; 3745.6
vs_empty_duration_with_depot; 26026.6
vs_empty_trips; 0
vs_empty_trips_depot; 78
vs_feasible; true
vs_full_distance; 2847.05
19374234295
vs_full_duration; 4751.2
000000000035
vs_full_distance; 2847.05
vs_full_duration; 4751.2
vs_maximal_waiting_time; 57.3
vs_minimal_waiting_time; 0.4
vs_vehicles; 40
src/core/java/src/net/lintim/io/CsvWriter.java
View file @
ac5f5efd
...
...
@@ -34,7 +34,7 @@ public class CsvWriter {
private
static
DecimalFormat
decimalFormat
=
provideDecimalFormat
();
private
static
DecimalFormat
provideDecimalFormat
()
{
DecimalFormat
result
=
new
DecimalFormat
(
".##"
);
DecimalFormat
result
=
new
DecimalFormat
(
"
0
.##"
);
result
.
setRoundingMode
(
RoundingMode
.
HALF_UP
);
return
result
;
}
...
...
src/core/java/src/net/lintim/model/Stop.java
View file @
ac5f5efd
package
net.lintim.model
;
import
net.lintim.io.CsvWriter
;
import
java.util.Arrays
;
/**
...
...
@@ -139,8 +137,8 @@ public class Stop implements Node {
String
.
valueOf
(
getId
()),
getShortName
(),
getLongName
(),
getxCoordinate
(),
getyCoordinate
()
String
.
valueOf
(
getxCoordinate
()
)
,
String
.
valueOf
(
getyCoordinate
()
)
};
}
}
src/core/java/test/resources/dataset/basis/Stop.giv
View file @
ac5f5efd
# stop-id; short-name; long-name; x-coordinate; y-coordinate
1; 1; Eins; 100; 200
2; 2; Zwei; 200; 300
3; 3; Drei; 200; 200
4; 4; Vier; 200; 100
5; 5; Fuenf; 300; 100
6; 6; Sechs; 300; 200
7; 7; Sieben; 300; 300
8; 8; Acht; 400; 200
1; 1; Eins; 100
.0
; 200
.0
2; 2; Zwei; 200
.0
; 300
.0
3; 3; Drei; 200
.0
; 200
.0
4; 4; Vier; 200
.0
; 100
.0
5; 5; Fuenf; 300
.0
; 100
.0
6; 6; Sechs; 300
.0
; 200
.0
7; 7; Sieben; 300
.0
; 300
.0
8; 8; Acht; 400
.0
; 200
.0
src/core/java/test/src/net/lintim/main/TestRunner.java
View file @
ac5f5efd
...
...
@@ -23,9 +23,15 @@ import org.junit.runners.Suite;
public
class
TestRunner
{
public
static
void
main
(
String
[]
args
)
{
Result
result
=
JUnitCore
.
runClasses
(
TestRunner
.
class
);
if
(
result
.
getFailures
().
size
()
>
0
)
{
System
.
out
.
println
(
"Failures:"
);
}
for
(
Failure
failure
:
result
.
getFailures
())
{
System
.
out
.
println
(
failure
);
}
System
.
out
.
println
(
"Successfull: "
+
result
.
wasSuccessful
()
+
", ran "
+
result
.
getRunCount
()
+
" tests."
);
if
(!
result
.
wasSuccessful
())
{
System
.
exit
(
1
);
}
}
}
src/core/python/core/io/lines.py
View file @
ac5f5efd
...
...
@@ -108,7 +108,7 @@ class LineReader:
raise
DataIndexNotFoundException
(
"Line"
,
line_id
)
line
.
setLength
(
length
)
line
.
setCost
(
cost
)
self
.
read_lines
.
a
ppen
d
(
line
)
self
.
read_lines
.
a
d
d
(
line
)
@
staticmethod
def
read
(
ptn
:
Graph
[
Stop
,
Link
],
read_lines
:
bool
=
True
,
read_costs
:
bool
=
True
,
read_frequencies
:
bool
=
True
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment