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.

Sign up for GitHub

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

PT Use Weights #58

Merged
merged 13 commits into from
Apr 19, 2022
Merged

PT Use Weights #58

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4ee5000
First pass at using weight for MCLS instead of time
abhumbla Apr 6, 2022
d74e8a4
reduce max nodes
abhumbla Apr 12, 2022
c2792e3
fix weight in legs
abhumbla Apr 13, 2022
8898efc
comment out transfer leg interp
abhumbla Apr 13, 2022
b682d03
Merge branch 'master' into pt-router-use-weights
abhumbla Apr 13, 2022
65b1902
consistent times (milliseconds)
abhumbla Apr 13, 2022
145085f
add interpolated flag
abhumbla Apr 14, 2022
e474d02
fix merge conflict
abhumbla Apr 14, 2022
e5473c7
Merge branch 'master' into pt-router-use-weights
abhumbla Apr 14, 2022
22f7180
transfer penalty
abhumbla Apr 14, 2022
839af6a
remove ptweighting
abhumbla Apr 19, 2022
88e47ad
fix compile errors
abhumbla Apr 19, 2022
acc5bcf
rename variable
abhumbla Apr 19, 2022
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
Prev Previous commit
Next Next commit
fix compile errors
  • Loading branch information
@abhumbla
abhumbla committed Apr 19, 2022
commit 88e47ad304ddca7d65d114daccf6adef2c9668b7
1 change: 1 addition & 0 deletions core/src/main/java/com/graphhopper/routing/weighting/AbstractWeighting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public long calcEdgeMillis(EdgeIteratorState edgeState, boolean reverse) {
reverse = false;
}

// TODO: find out why this is triggering on interpolated legs
// if (reverse && !edgeState.getReverse(accessEnc) || !reverse && !edgeState.get(accessEnc))
// throw new IllegalStateException("Calculating time should not require to read speed from edge in wrong direction. " +
// "(" + edgeState.getBaseNode() + " - " + edgeState.getAdjNode() + ") "
Expand Down
3 changes: 1 addition & 2 deletions web-bundle/src/main/java/com/graphhopper/resources/PtIsochroneResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,12 @@ public Response doGet(
GeometryFactory geometryFactory = new GeometryFactory();
final FlagEncoder footEncoder = encodingManager.getEncoder(connectingProfileName);
final Weighting weighting = new FastestWeighting(footEncoder);
final PtWeighting ptWeighting = new PtWeighting(PtWeighting.DEFAULT_BETA_PT_EDGE_TIME);
DefaultSnapFilter snapFilter = new DefaultSnapFilter(weighting, graphHopperStorage.getEncodingManager().getBooleanEncodedValue(Subnetwork.key(connectingProfileName)));

boolean isBike = connectingProfileName.contains("bike");

PtLocationSnapper.Result snapResult = new PtLocationSnapper(graphHopperStorage, locationIndex, gtfsStorage).snapAll(Arrays.asList(location), Arrays.asList(snapFilter));
GraphExplorer graphExplorer = new GraphExplorer(snapResult.queryGraph, gtfsStorage.getPtGraph(), weighting, ptWeighting, gtfsStorage, RealtimeFeed.empty(), reverseFlow, false, false, isBike, reverseFlow, blockedRouteTypes);
GraphExplorer graphExplorer = new GraphExplorer(snapResult.queryGraph, gtfsStorage.getPtGraph(), weighting, gtfsStorage, RealtimeFeed.empty(), reverseFlow, false, false, isBike, reverseFlow, blockedRouteTypes);
MultiCriteriaLabelSetting router = new MultiCriteriaLabelSetting(graphExplorer, reverseFlow, false, false, 0, Collections.emptyList());

Map<Coordinate, Double> z1 = new HashMap<>();
Expand Down
1 change: 0 additions & 1 deletion web-bundle/src/main/java/com/graphhopper/resources/PtRouteResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ public ObjectNode route(@QueryParam("point") @Size(min=2,max=2) List<GHLocationP
Optional.ofNullable(connectingProfile).ifPresent(request::setConnectingProfile);
Optional.ofNullable(betaTransfers).ifPresent(request::setBetaTransfers);
Optional.ofNullable(betaStreetTime).ifPresent(request::setBetaStreetTime);
Optional.ofNullable(betaPtEdgeTime).ifPresent(request::setBetaPtEdgeTime);
Optional.ofNullable(enableElevation).ifPresent(request::setEnableElevation);
Optional.ofNullable(pathDetails).ifPresent(request::setPathDetails);

Expand Down