Skip to content

Commit ac0930b

Browse files
committed
Merge branch 'remove-safety-normalizer' into safest-street
2 parents d2b259a + 1dd473b commit ac0930b

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

application/src/test/java/org/opentripplanner/street/model/_data/SimpleConcreteEdge.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ public State[] traverse(State s0) {
2828
TraverseMode mode = s0.currentMode();
2929
RoutingPreferences preferences = s0.getPreferences();
3030
double t = d / preferences.getSpeed(mode, false);
31-
double w =
32-
t *
33-
switch (mode) {
34-
case WALK -> preferences.walk().reluctance();
35-
case BICYCLE -> preferences.bike().reluctance();
36-
case SCOOTER -> preferences.scooter().reluctance();
37-
default -> 1;
38-
};
31+
double reluctance = switch (mode) {
32+
case WALK -> preferences.walk().reluctance();
33+
case BICYCLE -> preferences.bike().reluctance();
34+
case SCOOTER -> preferences.scooter().reluctance();
35+
default -> 1;
36+
};
37+
double w = t * reluctance;
3938
StateEditor s1 = s0.edit(this);
4039
s1.incrementTimeInMilliseconds((int) (t * 1000));
4140
s1.incrementWeight(w);

0 commit comments

Comments
 (0)