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

Rebase road property speeds #1225

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Rebase road property speeds #1225

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1db3ac8
Reimplement Properties as enums
HendrikLeuschner Jan 7, 2021
6760a8e
feat: Add road property speed limits
TheGreatRefrigerator Nov 8, 2022
5427ee1
Compare scaled speed values
aoles Nov 4, 2022
17114af
tests: Add RoadPropertyTest
TheGreatRefrigerator Nov 8, 2022
357fe82
feat: enhance RoadPropertySpeedParser
koebi Feb 12, 2021
747475f
tests: Add user_speed_limits test
TheGreatRefrigerator Nov 8, 2022
c6762b6
feat: Add user_speed_limits parameter to isochrones endpoint
TheGreatRefrigerator Nov 21, 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
tests: Add RoadPropertyTest 
Co-authored-by: Hendrik Leuschner <[email protected]>
  • Loading branch information
@TheGreatRefrigerator @HendrikLeuschner
TheGreatRefrigerator and HendrikLeuschner committed Nov 8, 2022
commit 17114afb26619e81d0f1b8da733efb0c7d8de3c5
142 changes: 142 additions & 0 deletions ...est/java/org/heigit/ors/routing/graphhopper/extensions/roadproperty/RoadPropertyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
package org.heigit.ors.routing.graphhopper.extensions.roadproperty;

import com.graphhopper.routing.Dijkstra;
import com.graphhopper.routing.Path;
import com.graphhopper.routing.util.CarFlagEncoder;
import com.graphhopper.routing.util.EncodingManager;
import com.graphhopper.routing.util.TraversalMode;
import com.graphhopper.routing.weighting.FastestWeighting;
import com.graphhopper.routing.weighting.ShortestWeighting;
import com.graphhopper.routing.weighting.Weighting;
import com.graphhopper.storage.Graph;
import com.graphhopper.storage.GraphHopperStorage;
import com.graphhopper.storage.RAMDirectory;
import com.graphhopper.util.PMap;
import org.heigit.ors.routing.graphhopper.extensions.storages.WaySurfaceTypeGraphStorage;
import org.heigit.ors.routing.graphhopper.extensions.userspeed.RoadPropertySpeedCalculator;
import org.heigit.ors.routing.graphhopper.extensions.userspeed.RoadPropertySpeedMap;
import org.heigit.ors.routing.util.WaySurfaceDescription;
import org.heigit.ors.util.ToyGraphCreationUtil;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class RoadPropertyTest {
private final CarFlagEncoder carEncoder = new CarFlagEncoder();
private final EncodingManager encodingManager = EncodingManager.create(carEncoder);

@Test
public void testWeightAndTimeFastest() {
GraphHopperStorage graph = ToyGraphCreationUtil.createSimpleGraph(encodingManager);

WaySurfaceTypeGraphStorage storage = new WaySurfaceTypeGraphStorage();
storage.init(graph, new RAMDirectory());
storage.create(10);
WaySurfaceDescription waySurfaceDesc = new WaySurfaceDescription();
waySurfaceDesc.setSurfaceType(1);
storage.setEdgeValue(6, waySurfaceDesc);
RoadPropertySpeedMap roadPropertySpeedMap = new RoadPropertySpeedMap();
roadPropertySpeedMap.addRoadPropertySpeed("paved", 30);
Weighting weighting = new FastestWeighting(carEncoder, new PMap());
RoadPropertySpeedCalculator roadPropertySpeedCalculator = new RoadPropertySpeedCalculator(weighting.getSpeedCalculator(), graph, carEncoder);
roadPropertySpeedCalculator.setRoadPropertySpeedMap(roadPropertySpeedMap);
roadPropertySpeedCalculator.setWaySurfaceTypeGraphStorage(storage);
weighting.setSpeedCalculator(roadPropertySpeedCalculator);

Path path = calcPath(5, 1, graph, weighting);
roadPropertySpeedMap.addRoadPropertySpeed("paved", 20);
Path path0 = calcPath(5, 1, graph, weighting);
assertTrue(path.getWeight() < path0.getWeight());
assertTrue(path.getTime() < path0.getTime());
assertEquals(path.getDistance(), path0.getDistance(), 0);
}

@Test
public void testWeightAndTimeShortest() {
GraphHopperStorage graph = ToyGraphCreationUtil.createSimpleGraph(encodingManager);

WaySurfaceTypeGraphStorage storage = new WaySurfaceTypeGraphStorage();
storage.init(graph, new RAMDirectory());
storage.create(10);
WaySurfaceDescription waySurfaceDesc = new WaySurfaceDescription();
waySurfaceDesc.setSurfaceType(1);
storage.setEdgeValue(6, waySurfaceDesc);
RoadPropertySpeedMap roadPropertySpeedMap = new RoadPropertySpeedMap();
roadPropertySpeedMap.addRoadPropertySpeed("paved", 30);
Weighting weighting = new ShortestWeighting(carEncoder);
RoadPropertySpeedCalculator roadPropertySpeedCalculator = new RoadPropertySpeedCalculator(weighting.getSpeedCalculator(), graph, carEncoder);
roadPropertySpeedCalculator.setRoadPropertySpeedMap(roadPropertySpeedMap);
roadPropertySpeedCalculator.setWaySurfaceTypeGraphStorage(storage);
weighting.setSpeedCalculator(roadPropertySpeedCalculator);

Path path = calcPath(5, 1, graph, weighting);
roadPropertySpeedMap.addRoadPropertySpeed("paved", 20);
Path path0 = calcPath(5, 1, graph, weighting);
assertEquals(path.getWeight(), path0.getWeight(), 0);
assertTrue(path.getTime() < path0.getTime());
assertEquals(path.getDistance(), path0.getDistance(), 0);
}

@Test
public void testTooLargeValue() {
GraphHopperStorage graph = ToyGraphCreationUtil.createSimpleGraph(encodingManager);

WaySurfaceTypeGraphStorage storage = new WaySurfaceTypeGraphStorage();
storage.init(graph, new RAMDirectory());
storage.create(10);
WaySurfaceDescription waySurfaceDesc = new WaySurfaceDescription();
waySurfaceDesc.setSurfaceType(1);
storage.setEdgeValue(6, waySurfaceDesc);
RoadPropertySpeedMap roadPropertySpeedMap = new RoadPropertySpeedMap();
Weighting weighting = new FastestWeighting(carEncoder, new PMap());
RoadPropertySpeedCalculator roadPropertySpeedCalculator = new RoadPropertySpeedCalculator(weighting.getSpeedCalculator(), graph, carEncoder);
roadPropertySpeedCalculator.setRoadPropertySpeedMap(roadPropertySpeedMap);
roadPropertySpeedCalculator.setWaySurfaceTypeGraphStorage(storage);
weighting.setSpeedCalculator(roadPropertySpeedCalculator);

Path path = calcPath(5, 1, graph, weighting);
roadPropertySpeedMap.addRoadPropertySpeed("paved", 3000);
Path path0 = calcPath(5, 1, graph, weighting);
assertEquals(path.getWeight(), path0.getWeight(), 0);
assertEquals(path.getTime(), path0.getTime(), 0);
assertEquals(path.getDistance(), path0.getDistance(), 0);
}

@Test(expected = IllegalArgumentException.class)
public void testTooSmallValue() {
GraphHopperStorage graph = ToyGraphCreationUtil.createSimpleGraph(encodingManager);

WaySurfaceTypeGraphStorage storage = new WaySurfaceTypeGraphStorage();
storage.init(graph, new RAMDirectory());
storage.create(10);
WaySurfaceDescription waySurfaceDesc = new WaySurfaceDescription();
waySurfaceDesc.setSurfaceType(1);
storage.setEdgeValue(6, waySurfaceDesc);
RoadPropertySpeedMap roadPropertySpeedMap = new RoadPropertySpeedMap();
roadPropertySpeedMap.addRoadPropertySpeed("paved", -10);
}

@Test(expected = IllegalArgumentException.class)
public void testUnknownValue() {
GraphHopperStorage graph = ToyGraphCreationUtil.createSimpleGraph(encodingManager);

WaySurfaceTypeGraphStorage storage = new WaySurfaceTypeGraphStorage();
storage.init(graph, new RAMDirectory());
storage.create(10);
WaySurfaceDescription waySurfaceDesc = new WaySurfaceDescription();
waySurfaceDesc.setSurfaceType(1);
storage.setEdgeValue(6, waySurfaceDesc);
RoadPropertySpeedMap roadPropertySpeedMap = new RoadPropertySpeedMap();
roadPropertySpeedMap.addRoadPropertySpeed("pavedD", 50);
}

private Path calcPath(int source, int target, Graph graph, Weighting w) {
Dijkstra algo = createAlgo(graph, w);
return algo.calcPath(source, target);
}

private Dijkstra createAlgo(Graph graph, Weighting weighting) {
return new Dijkstra(graph, weighting, TraversalMode.EDGE_BASED);
}
}