Skip to content

Commit

Permalink
rename getEdgeProps to getEdgeIteratorState, fix #468
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter committed Jul 20, 2015
1 parent 8684016 commit f70c695
Show file tree
Hide file tree
Showing 17 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion core/files/changelog.txt
View file
@@ -1,5 +1,5 @@
0.5
Several names have changed see #467
Several names have changed see #466, #467, #468
GraphHopper.optimize removed use postProcessing instead
method GraphHopper.getGraph() changed to getGraphHopperStorage()
the interface GraphStorage does no longer extend from the Graph interface. Use GraphHopperStorage (which implements the Graph interface via the base graph) or only Graph instead
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/com/graphhopper/routing/Path.java
View file
Expand Up @@ -200,7 +200,7 @@ public Path extract()
*/
public EdgeIteratorState getFinalEdge()
{
return graph.getEdgeProps(edgeIds.get(edgeIds.size() - 1), endNode);
return graph.getEdgeIteratorState(edgeIds.get(edgeIds.size() - 1), endNode);
}

/**
Expand All @@ -221,7 +221,7 @@ public String getDebugInfo()
*/
protected void processEdge( int edgeId, int adjNode )
{
EdgeIteratorState iter = graph.getEdgeProps(edgeId, adjNode);
EdgeIteratorState iter = graph.getEdgeIteratorState(edgeId, adjNode);
double dist = iter.getDistance();
distance += dist;
time += calcMillis(dist, iter.getFlags(), false);
Expand Down Expand Up @@ -270,14 +270,14 @@ private void forEveryEdge( EdgeVisitor visitor )
int len = edgeIds.size();
for (int i = 0; i < len; i++)
{
EdgeIteratorState edgeBase = graph.getEdgeProps(edgeIds.get(i), tmpNode);
EdgeIteratorState edgeBase = graph.getEdgeIteratorState(edgeIds.get(i), tmpNode);
if (edgeBase == null)
throw new IllegalStateException("Edge " + edgeIds.get(i) + " was empty when requested with node " + tmpNode
+ ", array index:" + i + ", edges:" + edgeIds.size());

tmpNode = edgeBase.getBaseNode();
// more efficient swap, currently not implemented for virtual edges: visitor.next(edgeBase.detach(true), i);
edgeBase = graph.getEdgeProps(edgeBase.getEdge(), tmpNode);
edgeBase = graph.getEdgeIteratorState(edgeBase.getEdge(), tmpNode);
visitor.next(edgeBase, i);
}
}
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/com/graphhopper/routing/QueryGraph.java
View file
Expand Up @@ -433,8 +433,8 @@ public boolean enforceHeadingByEdgeId( int nodeId, int edgeId, boolean incoming
if (!isVirtualNode(nodeId))
return false;

VirtualEdgeIteratorState incomingEdge = (VirtualEdgeIteratorState) getEdgeProps(edgeId, nodeId);
VirtualEdgeIteratorState reverseEdge = (VirtualEdgeIteratorState) getEdgeProps(edgeId, incomingEdge.getBaseNode());
VirtualEdgeIteratorState incomingEdge = (VirtualEdgeIteratorState) getEdgeIteratorState(edgeId, nodeId);
VirtualEdgeIteratorState reverseEdge = (VirtualEdgeIteratorState) getEdgeIteratorState(edgeId, incomingEdge.getBaseNode());
incomingEdge.setVirtualEdgePreference(true, !incoming);
modifiedEdges.add(incomingEdge);
reverseEdge.setVirtualEdgePreference(true, incoming);
Expand Down Expand Up @@ -563,10 +563,10 @@ public BBox getBounds()
}

@Override
public EdgeIteratorState getEdgeProps( int origEdgeId, int adjNode )
public EdgeIteratorState getEdgeIteratorState( int origEdgeId, int adjNode )
{
if (!isVirtualEdge(origEdgeId))
return mainGraph.getEdgeProps(origEdgeId, adjNode);
return mainGraph.getEdgeIteratorState(origEdgeId, adjNode);

int edgeId = origEdgeId - mainEdges;
EdgeIteratorState eis = virtualEdges.get(edgeId);
Expand Down
18 changes: 9 additions & 9 deletions core/src/main/java/com/graphhopper/routing/ch/Path4CH.java
View file
Expand Up @@ -43,7 +43,7 @@ protected final void processEdge( int tmpEdge, int endNode )
{
// Shortcuts do only contain valid weight so first expand before adding
// to distance and time
expandEdge((CHEdgeIteratorState) routingGraph.getEdgeProps(tmpEdge, endNode), false);
expandEdge((CHEdgeIteratorState) routingGraph.getEdgeIteratorState(tmpEdge, endNode), false);
}

private void expandEdge( CHEdgeIteratorState mainEdgeState, boolean reverse )
Expand Down Expand Up @@ -73,32 +73,32 @@ private void expandEdge( CHEdgeIteratorState mainEdgeState, boolean reverse )
// getEdgeProps could possibly return an empty edge if the shortcut is available for both directions
if (reverseOrder)
{
CHEdgeIteratorState edgeState = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge1, to);
CHEdgeIteratorState edgeState = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge1, to);
boolean empty = edgeState == null;
if (empty)
edgeState = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge2, to);
edgeState = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge2, to);

expandEdge(edgeState, false);

if (empty)
edgeState = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge1, from);
edgeState = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge1, from);
else
edgeState = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge2, from);
edgeState = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge2, from);

expandEdge(edgeState, true);
} else
{
CHEdgeIteratorState iter = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge1, from);
CHEdgeIteratorState iter = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge1, from);
boolean empty = iter == null;
if (empty)
iter = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge2, from);
iter = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge2, from);

expandEdge(iter, true);

if (empty)
iter = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge1, to);
iter = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge1, to);
else
iter = (CHEdgeIteratorState) routingGraph.getEdgeProps(skippedEdge2, to);
iter = (CHEdgeIteratorState) routingGraph.getEdgeIteratorState(skippedEdge2, to);

expandEdge(iter, false);
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/graphhopper/routing/ch/PrepareContractionHierarchies.java
View file
Expand Up @@ -673,8 +673,8 @@ int addShortcuts( int v )
+ ", skipEdge1:" + sc.skippedEdge1 + ", skipEdge2:" + sc.skippedEdge2
+ ", edge " + iter + ":" + getCoords(iter, prepareGraph)
+ ", sc:" + sc
+ ", skippedEdge1: " + getCoords(prepareGraph.getEdgeProps(sc.skippedEdge1, sc.from), prepareGraph)
+ ", skippedEdge2: " + getCoords(prepareGraph.getEdgeProps(sc.skippedEdge2, sc.to), prepareGraph)
+ ", skippedEdge1: " + getCoords(prepareGraph.getEdgeIteratorState(sc.skippedEdge1, sc.from), prepareGraph)
+ ", skippedEdge2: " + getCoords(prepareGraph.getEdgeIteratorState(sc.skippedEdge2, sc.to), prepareGraph)
+ ", neighbors:" + GHUtility.getNeighbors(iter));
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/graphhopper/storage/BaseGraph.java
View file
Expand Up @@ -800,7 +800,7 @@ protected int nextEdgeId()
}

@Override
public EdgeIteratorState getEdgeProps( int edgeId, int adjNode )
public EdgeIteratorState getEdgeIteratorState( int edgeId, int adjNode )
{
if (!edgeAccess.isInBounds(edgeId))
throw new IllegalStateException("edgeId " + edgeId + " out of bounds");
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/graphhopper/storage/CHGraph.java
View file
Expand Up @@ -50,7 +50,7 @@ public interface CHGraph extends Graph
CHEdgeIteratorState shortcut( int a, int b );

@Override
CHEdgeIteratorState getEdgeProps( int edgeId, int endNode );
CHEdgeIteratorState getEdgeIteratorState( int edgeId, int endNode );

@Override
CHEdgeExplorer createEdgeExplorer();
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/graphhopper/storage/CHGraphImpl.java
View file
Expand Up @@ -206,7 +206,7 @@ public CHEdgeExplorer createEdgeExplorer( EdgeFilter filter )
}

@Override
public final CHEdgeIteratorState getEdgeProps( int edgeId, int endNode )
public final CHEdgeIteratorState getEdgeIteratorState( int edgeId, int endNode )
{
if (isShortcut(edgeId))
{
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/graphhopper/storage/Graph.java
View file
Expand Up @@ -76,7 +76,7 @@ public interface Graph
* @return an edge iterator state or potentially null if adjNode does not match
* @throws IllegalStateException if edgeId is not valid
*/
EdgeIteratorState getEdgeProps( int edgeId, int adjNode );
EdgeIteratorState getEdgeIteratorState( int edgeId, int adjNode );

/**
* @return all edges in this graph, where baseNode will be the smaller node.
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java
View file
Expand Up @@ -357,9 +357,9 @@ public final EdgeIteratorState edge( int a, int b, double distance, boolean both
}

@Override
public final EdgeIteratorState getEdgeProps( int edgeId, int adjNode )
public final EdgeIteratorState getEdgeIteratorState( int edgeId, int adjNode )
{
return baseGraph.getEdgeProps(edgeId, adjNode);
return baseGraph.getEdgeIteratorState(edgeId, adjNode);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/graphhopper/util/GHUtility.java
View file
Expand Up @@ -330,7 +330,7 @@ public static int getAdjNode( Graph g, int edge, int adjNode )
{
if (EdgeIterator.Edge.isValid(edge))
{
EdgeIteratorState iterTo = g.getEdgeProps(edge, adjNode);
EdgeIteratorState iterTo = g.getEdgeIteratorState(edge, adjNode);
return iterTo.getAdjNode();
}
return adjNode;
Expand Down
18 changes: 9 additions & 9 deletions core/src/test/java/com/graphhopper/routing/QueryGraphTest.java
View file
Expand Up @@ -202,12 +202,12 @@ public void testMultipleVirtualNodes()
assertEquals(new GHPoint(1, 2.5), pl.toGHPoint(1));

EdgeIteratorState edge = GHUtility.getEdge(queryGraph, 3, 1);
assertNotNull(queryGraph.getEdgeProps(edge.getEdge(), 3));
assertNotNull(queryGraph.getEdgeProps(edge.getEdge(), 1));
assertNotNull(queryGraph.getEdgeIteratorState(edge.getEdge(), 3));
assertNotNull(queryGraph.getEdgeIteratorState(edge.getEdge(), 1));

edge = GHUtility.getEdge(queryGraph, 3, 0);
assertNotNull(queryGraph.getEdgeProps(edge.getEdge(), 3));
assertNotNull(queryGraph.getEdgeProps(edge.getEdge(), 0));
assertNotNull(queryGraph.getEdgeIteratorState(edge.getEdge(), 3));
assertNotNull(queryGraph.getEdgeIteratorState(edge.getEdge(), 0));

// snap again => new virtual node on same edge!
iter = g.createEdgeExplorer().setBaseNode(1);
Expand Down Expand Up @@ -420,7 +420,7 @@ public void testGetEdgeProps()
queryGraph.lookup(Arrays.asList(res1));
// get virtual edge
e1 = GHUtility.getEdge(queryGraph, res1.getClosestNode(), 0);
EdgeIteratorState e2 = queryGraph.getEdgeProps(e1.getEdge(), Integer.MIN_VALUE);
EdgeIteratorState e2 = queryGraph.getEdgeIteratorState(e1.getEdge(), Integer.MIN_VALUE);
assertEquals(e1.getEdge(), e2.getEdge());
}

Expand Down Expand Up @@ -646,9 +646,9 @@ public void testEnforceHeadingByEdgeId()
queryGraph.enforceHeadingByEdgeId(2, 1, false);
// test penalized south
boolean expect = true;
VirtualEdgeIteratorState incomingEdge = (VirtualEdgeIteratorState) queryGraph.getEdgeProps(1, 2);
VirtualEdgeIteratorState incomingEdge = (VirtualEdgeIteratorState) queryGraph.getEdgeIteratorState(1, 2);

VirtualEdgeIteratorState incomingEdgeReverse = (VirtualEdgeIteratorState) queryGraph.getEdgeProps(1, incomingEdge.getBaseNode());
VirtualEdgeIteratorState incomingEdgeReverse = (VirtualEdgeIteratorState) queryGraph.getEdgeIteratorState(1, incomingEdge.getBaseNode());
// expect incoming edge in reverse direction to be unfavored
assertEquals(expect, incomingEdge.getBoolean(EdgeIteratorState.K_UNFAVORED_EDGE, true, !expect));
// expect reverse incoming edge to be unfavored
Expand Down Expand Up @@ -682,11 +682,11 @@ public void testInternalAPIOriginalTraversalKey()
assertTrue(iter.next());
assertEquals(0, iter.getAdjNode());
assertEquals(GHUtility.createEdgeKey(1, 0, origEdgeId, false),
((VirtualEdgeIteratorState) queryGraph.getEdgeProps(iter.getEdge(), 0)).getOriginalTraversalKey());
((VirtualEdgeIteratorState) queryGraph.getEdgeIteratorState(iter.getEdge(), 0)).getOriginalTraversalKey());

assertTrue(iter.next());
assertEquals(1, iter.getAdjNode());
assertEquals(GHUtility.createEdgeKey(0, 1, origEdgeId, false),
((VirtualEdgeIteratorState) queryGraph.getEdgeProps(iter.getEdge(), 1)).getOriginalTraversalKey());
((VirtualEdgeIteratorState) queryGraph.getEdgeIteratorState(iter.getEdge(), 1)).getOriginalTraversalKey());
}
}
26 changes: 13 additions & 13 deletions core/src/test/java/com/graphhopper/storage/AbstractGraphStorageTester.java
View file
Expand Up @@ -735,25 +735,25 @@ public void testEdgeProperties()
EdgeIteratorState iter2 = graph.edge(0, 2, 20, true);

int edgeId = iter1.getEdge();
EdgeIteratorState iter = graph.getEdgeProps(edgeId, 0);
EdgeIteratorState iter = graph.getEdgeIteratorState(edgeId, 0);
assertEquals(10, iter.getDistance(), 1e-5);

edgeId = iter2.getEdge();
iter = graph.getEdgeProps(edgeId, 0);
iter = graph.getEdgeIteratorState(edgeId, 0);
assertEquals(2, iter.getBaseNode());
assertEquals(0, iter.getAdjNode());
assertEquals(20, iter.getDistance(), 1e-5);

iter = graph.getEdgeProps(edgeId, 2);
iter = graph.getEdgeIteratorState(edgeId, 2);
assertEquals(0, iter.getBaseNode());
assertEquals(2, iter.getAdjNode());
assertEquals(20, iter.getDistance(), 1e-5);

iter = graph.getEdgeProps(edgeId, Integer.MIN_VALUE);
iter = graph.getEdgeIteratorState(edgeId, Integer.MIN_VALUE);
assertFalse(iter == null);
assertEquals(0, iter.getBaseNode());
assertEquals(2, iter.getAdjNode());
iter = graph.getEdgeProps(edgeId, 1);
iter = graph.getEdgeIteratorState(edgeId, 1);
assertTrue(iter == null);

// delete
Expand All @@ -763,7 +763,7 @@ public void testEdgeProperties()
// throw exception if accessing deleted edge
try
{
graph.getEdgeProps(iter1.getEdge(), -1);
graph.getEdgeIteratorState(iter1.getEdge(), -1);
assertTrue(false);
} catch (Exception ex)
{
Expand All @@ -780,33 +780,33 @@ public void testCreateDuplicateEdges()
assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(2)));

// no exception
graph.getEdgeProps(1, 3);
graph.getEdgeIteratorState(1, 3);

// raise exception
try
{
graph.getEdgeProps(4, 3);
graph.getEdgeIteratorState(4, 3);
assertTrue(false);
} catch (Exception ex)
{
}
try
{
graph.getEdgeProps(-1, 3);
graph.getEdgeIteratorState(-1, 3);
assertTrue(false);
} catch (Exception ex)
{
}

EdgeIterator iter = carOutExplorer.setBaseNode(2);
assertTrue(iter.next());
EdgeIteratorState oneIter = graph.getEdgeProps(iter.getEdge(), 3);
EdgeIteratorState oneIter = graph.getEdgeIteratorState(iter.getEdge(), 3);
assertEquals(13, oneIter.getDistance(), 1e-6);
assertEquals(2, oneIter.getBaseNode());
assertTrue(carEncoder.isForward(oneIter.getFlags()));
assertFalse(carEncoder.isBackward(oneIter.getFlags()));

oneIter = graph.getEdgeProps(iter.getEdge(), 2);
oneIter = graph.getEdgeIteratorState(iter.getEdge(), 2);
assertEquals(13, oneIter.getDistance(), 1e-6);
assertEquals(3, oneIter.getBaseNode());
assertFalse(carEncoder.isForward(oneIter.getFlags()));
Expand Down Expand Up @@ -1020,8 +1020,8 @@ public void testNameIndex()
EdgeIteratorState iter2 = graph.edge(0, 1, 10, true);
iter2.setName("named street2");

assertEquals("named street1", graph.getEdgeProps(iter1.getEdge(), iter1.getAdjNode()).getName());
assertEquals("named street2", graph.getEdgeProps(iter2.getEdge(), iter2.getAdjNode()).getName());
assertEquals("named street1", graph.getEdgeIteratorState(iter1.getEdge(), iter1.getAdjNode()).getName());
assertEquals("named street2", graph.getEdgeIteratorState(iter2.getEdge(), iter2.getAdjNode()).getName());
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/com/graphhopper/storage/GraphHopperStorageCHTest.java
View file
Expand Up @@ -216,8 +216,8 @@ public void testGetWeightIfAdvancedEncoder()
sc1.setFlags(flags);
sc1.setWeight(100.123);

assertEquals(100.123, lg.getEdgeProps(sc1.getEdge(), sc1.getAdjNode()).getWeight(), 1e-3);
assertEquals(100.123, lg.getEdgeProps(sc1.getEdge(), sc1.getBaseNode()).getWeight(), 1e-3);
assertEquals(100.123, lg.getEdgeIteratorState(sc1.getEdge(), sc1.getAdjNode()).getWeight(), 1e-3);
assertEquals(100.123, lg.getEdgeIteratorState(sc1.getEdge(), sc1.getBaseNode()).getWeight(), 1e-3);
assertEquals(100.123, ((CHEdgeIteratorState) GHUtility.getEdge(lg, sc1.getBaseNode(), sc1.getAdjNode())).getWeight(), 1e-3);
assertEquals(100.123, ((CHEdgeIteratorState) GHUtility.getEdge(lg, sc1.getAdjNode(), sc1.getBaseNode())).getWeight(), 1e-3);

Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/com/graphhopper/storage/GraphHopperStorageTest.java
View file
Expand Up @@ -97,8 +97,8 @@ public void testSave_and_fileFormat() throws IOException
assertEquals(12, graph.getNodes());
checkGraph(graph);

assertEquals("named street1", graph.getEdgeProps(iter1.getEdge(), iter1.getAdjNode()).getName());
assertEquals("named street2", graph.getEdgeProps(iter2.getEdge(), iter2.getAdjNode()).getName());
assertEquals("named street1", graph.getEdgeIteratorState(iter1.getEdge(), iter1.getAdjNode()).getName());
assertEquals("named street2", graph.getEdgeIteratorState(iter2.getEdge(), iter2.getAdjNode()).getName());
graph.edge(3, 4, 123, true).setWayGeometry(Helper.createPointList3D(4.4, 5.5, 0, 6.6, 7.7, 0));
checkGraph(graph);
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/com/graphhopper/storage/GraphHopperStorageWithTurnCostsTest.java
View file
Expand Up @@ -77,8 +77,8 @@ public void testSave_and_fileFormat() throws IOException
assertEquals(12, graph.getNodes());
checkGraph(graph);

assertEquals("named street1", graph.getEdgeProps(iter1.getEdge(), iter1.getAdjNode()).getName());
assertEquals("named street2", graph.getEdgeProps(iter2.getEdge(), iter2.getAdjNode()).getName());
assertEquals("named street1", graph.getEdgeIteratorState(iter1.getEdge(), iter1.getAdjNode()).getName());
assertEquals("named street2", graph.getEdgeIteratorState(iter2.getEdge(), iter2.getAdjNode()).getName());

assertEquals(1337, turnCostStorage.getTurnCostFlags(iter1.getEdge(), 0, iter2.getEdge()));
assertEquals(666, turnCostStorage.getTurnCostFlags(iter2.getEdge(), 0, iter1.getEdge()));
Expand Down
2 changes: 1 addition & 1 deletion tools/src/main/java/com/graphhopper/tools/Measurement.java
View file
Expand Up @@ -288,7 +288,7 @@ public int doCalc( boolean warmup, int run )
{
int edgeId = rand.nextInt(maxEdgesId);
if (allowedEdges.contains(edgeId))
return graph.getEdgeProps(edgeId, Integer.MIN_VALUE).getEdge();
return graph.getEdgeIteratorState(edgeId, Integer.MIN_VALUE).getEdge();
}
}
}.setIterations(count).start();
Expand Down

0 comments on commit f70c695

Please sign in to comment.