Commit 374a122 1 parent 650963b commit 374a122 Copy full SHA for 374a122
File tree 1 file changed +11
-6
lines changed
1 file changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -112,19 +112,24 @@ impl Timetable {
112
112
113
113
let result_train = & simulation_output. base_simulation . 0 ;
114
114
let result_train_eco = & simulation_output. eco_simulation ;
115
- let arrival_time = result_train
116
- . head_positions
117
- . last ( )
118
- . expect ( "Train should have at least one position" )
119
- . time
120
- + train_schedule. departure_time ;
115
+
121
116
let eco = result_train_eco
122
117
. as_ref ( )
123
118
. map ( |eco| eco. 0 . mechanical_energy_consumed ) ;
124
119
let mechanical_energy_consumed = MechanicalEnergyConsumedBaseEco {
125
120
base : result_train. mechanical_energy_consumed ,
126
121
eco,
127
122
} ;
123
+
124
+ let arrival_time = if let Some ( eco) = result_train_eco {
125
+ eco. 0 . head_positions . last ( )
126
+ } else {
127
+ result_train. head_positions . last ( )
128
+ }
129
+ . expect ( "Train should have at least one position" )
130
+ . time
131
+ + train_schedule. departure_time ;
132
+
128
133
let path_length = result_train. stops . last ( ) . unwrap ( ) . position ;
129
134
let stops_count = result_train
130
135
. stops
You can’t perform that action at this time.
0 commit comments