Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle zero hops separately if all travel times in feed are rounded #145

Merged
merged 5 commits into from
Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public enum NewGTFSErrorType {
TABLE_TOO_LONG(Priority.MEDIUM, "Table is too long to record line numbers with a 32-bit integer, overflow will occur."),
TIME_ZONE_FORMAT(Priority.MEDIUM, "Time zone format should be X."),
REQUIRED_TABLE_EMPTY(Priority.MEDIUM, "This table is required by the GTFS specification but is empty."),
FEED_TRAVEL_TIMES_ROUNDED(Priority.LOW, "All travel times in the feed are rounded to the minute, which may cause unexpected results in routing applications where travel times are zero."),
ROUTE_DESCRIPTION_SAME_AS_NAME(Priority.LOW, "The description of a route is identical to its name, so does not add any information."),
ROUTE_LONG_NAME_CONTAINS_SHORT_NAME(Priority.LOW, "The long name of a route should complement the short name, not include it."),
ROUTE_SHORT_AND_LONG_NAME_MISSING(Priority.MEDIUM, "A route has neither a long nor a short name."),
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/conveyal/gtfs/error/SQLErrorStorage.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Map;
import java.util.Set;

import static com.conveyal.gtfs.util.Util.ensureValidNamespace;

Expand Down Expand Up @@ -86,6 +87,12 @@ public void storeError (NewGTFSError error) {
}
}

public void storeErrors (Set<NewGTFSError> errors) {
for (NewGTFSError error : errors) {
storeError(error);
}
}

/**
* Commits any outstanding error inserts and returns the error count via a SQL query.
*/
Expand Down
41 changes: 36 additions & 5 deletions src/main/java/com/conveyal/gtfs/validator/SpeedTripValidator.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package com.conveyal.gtfs.validator;

import com.conveyal.gtfs.error.NewGTFSError;
import com.conveyal.gtfs.error.SQLErrorStorage;
import com.conveyal.gtfs.loader.Feed;
import com.conveyal.gtfs.model.Route;
import com.conveyal.gtfs.model.ShapePoint;
import com.conveyal.gtfs.model.Stop;
import com.conveyal.gtfs.model.StopTime;
import com.conveyal.gtfs.model.Trip;

import java.util.HashSet;
import java.util.List;
import java.util.Set;

import static com.conveyal.gtfs.error.NewGTFSErrorType.*;
import static com.conveyal.gtfs.util.Util.fastDistance;
Expand All @@ -20,6 +22,8 @@
public class SpeedTripValidator extends TripValidator {

public static final double MIN_SPEED_KPH = 0.5;
private boolean allTravelTimesAreRounded = true;
private Set<NewGTFSError> travelTimeZeroErrors = new HashSet<>();

public SpeedTripValidator(Feed feed, SQLErrorStorage errorStorage) {
super(feed, errorStorage);
Expand Down Expand Up @@ -53,9 +57,13 @@ public void validateTrip(Trip trip, Route route, List<StopTime> stopTimes, List<
if (currStopTime.departure_time < currStopTime.arrival_time) {
registerError(currStopTime, DEPARTURE_BEFORE_ARRIVAL);
}
// TODO detect the case where all travel times are rounded off to minutes (i.e. tt % 60 == 0)
// In that case determine the maximum and minimum possible speed by adding/removing one minute of slack.
// Detect if travel times are rounded off to minutes.
boolean bothTravelTimesRounded = areTravelTimesRounded(prevStopTime);
double travelTimeSeconds = currStopTime.arrival_time - prevStopTime.departure_time;
// If travel times are rounded and travel time is zero, determine the maximum and minimum possible speed
// by adding/removing one minute of slack.
if (bothTravelTimesRounded && travelTimeSeconds == 0)
travelTimeSeconds += 60;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put brackets around conditional bodies unless there's no line break.

if (checkDistanceAndTime(distanceMeters, travelTimeSeconds, currStopTime)) {
// If distance and time are OK, we've got valid numbers to calculate a travel speed.
double kph = (distanceMeters / 1000D) / (travelTimeSeconds / 60D / 60D);
Expand All @@ -73,6 +81,26 @@ public void validateTrip(Trip trip, Route route, List<StopTime> stopTimes, List<
}
}

/**
* Completing this feed validator means checking if there were any unrounded travel times in the feed and (if so)
* registering any zero travel time errors that were passed over before the first unrounded travel time was
* encountered. If in fact all travel times are rounded to the minute, store a special feed-wide error in this case.
*/
public void complete (ValidationResult validationResult) {
if (!allTravelTimesAreRounded) storeErrors(travelTimeZeroErrors);
else registerError(NewGTFSError.forFeed(FEED_TRAVEL_TIMES_ROUNDED, null));
}

/**
* Check that arrival and departure time for a stop time are rounded to the minute and update
* {@link #allTravelTimesAreRounded} accordingly.
*/
private boolean areTravelTimesRounded(StopTime stopTime) {
boolean bothTravelTimesAreRounded = stopTime.departure_time % 60 == 0 && stopTime.arrival_time % 60 == 0;
if (!bothTravelTimesAreRounded) this.allTravelTimesAreRounded = false;
return bothTravelTimesAreRounded;
}

/**
* This just pulls some of the range checking logic out of the main trip checking loop so it's more readable.
* @return true if all values are OK
Expand All @@ -88,7 +116,10 @@ private boolean checkDistanceAndTime (double distanceMeters, double travelTimeSe
registerError(stopTime, TRAVEL_TIME_NEGATIVE, travelTimeSeconds);
good = false;
} else if (travelTimeSeconds == 0) {
registerError(stopTime, TRAVEL_TIME_ZERO);
// Only register the travel time zero error if not all travel times are rounded. Otherwise, hold onto the
// error in the travelTimeZeroErrors collection until the completion of this validator.
if (!allTravelTimesAreRounded) registerError(stopTime, TRAVEL_TIME_ZERO);
else travelTimeZeroErrors.add(createUnregisteredError(stopTime, TRAVEL_TIME_ZERO));
good = false;
}
return good;
Expand All @@ -97,7 +128,7 @@ private boolean checkDistanceAndTime (double distanceMeters, double travelTimeSe
/**
* @return max speed in km/hour.
*/
private double getMaxSpeedKph (Route route) {
private static double getMaxSpeedKph (Route route) {
int type = -1;
if (route != null) type = route.route_type;
switch (type) {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/conveyal/gtfs/validator/TripValidator.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.conveyal.gtfs.validator;

import com.conveyal.gtfs.error.NewGTFSError;
import com.conveyal.gtfs.error.SQLErrorStorage;
import com.conveyal.gtfs.loader.Feed;
import com.conveyal.gtfs.model.Route;
import com.conveyal.gtfs.model.ShapePoint;
import com.conveyal.gtfs.model.Stop;
import com.conveyal.gtfs.model.StopTime;
import com.conveyal.gtfs.model.Trip;
Expand Down
20 changes: 17 additions & 3 deletions src/main/java/com/conveyal/gtfs/validator/Validator.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
import com.conveyal.gtfs.loader.Feed;
import com.conveyal.gtfs.model.Entity;

import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

/**
* A Validator examines a whole GTFS feed or a single trip within a GTFS feed. It accumulates error messages for
Expand Down Expand Up @@ -39,6 +37,22 @@ public void registerError(Entity entity, NewGTFSErrorType errorType) {
errorStorage.storeError(NewGTFSError.forEntity(entity, errorType));
}

/**
* Stores a set of errors.
*/
public void storeErrors(Set<NewGTFSError> errors) {
errorStorage.storeErrors(errors);
}

/**
* WARNING: this method creates but DOES NOT STORE a new GTFS error. It should only be used in cases where a
* collection of errors need to be temporarily held before storing in batch (e.g., waiting to store travel time zero
* errors before it is determined that the entire feed uses travel times rounded to the minute).
*/
NewGTFSError createUnregisteredError (Entity entity, NewGTFSErrorType errorType) {
return NewGTFSError.forEntity(entity, errorType);
}

// /**
// * Store an error that affects a single line of a single table. Add a single key-value pair to it. Wraps the
// * underlying error constructor.
Expand Down