Skip to content

Commit faf85c1

Browse files
committed
Merge remote-tracking branch 'entur/simply_equal_in_trip_pattern_for_date' into v2
2 parents bcc6fb1 + c9d451c commit faf85c1

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ public int hashCode() {
168168

169169
/**
170170
* The natural key of a TripPatternForDate is the pair (routing trip pattern id, service date).
171-
* TODO: align equals and hashcode to use only the pair (routing trip pattern id, service date)
172171
*/
173172
@Override
174173
public boolean equals(Object o) {
@@ -180,12 +179,7 @@ public boolean equals(Object o) {
180179
}
181180
TripPatternForDate that = (TripPatternForDate) o;
182181

183-
return (
184-
tripPattern.equals(that.tripPattern) &&
185-
serviceDate.equals(that.serviceDate) &&
186-
Arrays.equals(tripTimes, that.tripTimes) &&
187-
Arrays.equals(frequencies, that.frequencies)
188-
);
182+
return (tripPattern.equals(that.tripPattern) && serviceDate.equals(that.serviceDate));
189183
}
190184

191185
@Override

0 commit comments

Comments
 (0)