Skip to content

Commit

Permalink
Reduce code duplication in AbstractGraphStorageTester
Browse files Browse the repository at this point in the history
  • Loading branch information
@easbar
easbar committed Jan 4, 2020
1 parent 4cbba82 commit bc257ff
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 80 deletions.
3 changes: 0 additions & 3 deletions core/src/main/java/com/graphhopper/routing/ch/PrepareCHGraph.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package com.graphhopper.routing.ch;

import com.graphhopper.routing.util.AllCHEdgesIterator;
import com.graphhopper.routing.util.FlagEncoder;
import com.graphhopper.routing.weighting.TurnWeighting;
import com.graphhopper.routing.weighting.Weighting;
import com.graphhopper.storage.CHGraph;
Expand All @@ -33,7 +32,6 @@ public class PrepareCHGraph {
private final CHGraph chGraph;
private final Weighting weighting;
private final TurnWeighting turnWeighting;
private final FlagEncoder encoder;

public static PrepareCHGraph nodeBased(CHGraph chGraph, Weighting weighting) {
if (chGraph.getCHProfile().isEdgeBased()) {
Expand All @@ -51,7 +49,6 @@ public static PrepareCHGraph edgeBased(CHGraph chGraph, Weighting weighting, Tur

private PrepareCHGraph(CHGraph chGraph, Weighting weighting, TurnWeighting turnWeighting) {
this.chGraph = chGraph;
this.encoder = weighting.getFlagEncoder();
this.weighting = weighting;
this.turnWeighting = turnWeighting;
}
Expand Down
165 changes: 88 additions & 77 deletions core/src/test/java/com/graphhopper/storage/AbstractGraphStorageTester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
import java.io.Closeable;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static com.graphhopper.routing.util.EncodingManager.getKey;
Expand Down Expand Up @@ -137,7 +135,7 @@ public void testSetNodes() {
}
graph.edge(defaultSize + 1, defaultSize + 2, 10, true);
graph.edge(defaultSize + 1, defaultSize + 3, 10, true);
assertEquals(2, GHUtility.count(carAllExplorer.setBaseNode(defaultSize + 1)));
assertEquals(2, getCountAll(defaultSize + 1));
}

@Test
Expand All @@ -151,22 +149,22 @@ public void testPropertiesWithNoInit() {
public void testCreateLocation() {
graph = createGHStorage();
graph.edge(3, 1, 50, true);
assertEquals(1, count(carOutExplorer.setBaseNode(1)));
assertEquals(1, getCountOut(1));

graph.edge(1, 2, 100, true);
assertEquals(2, count(carOutExplorer.setBaseNode(1)));
assertEquals(2, getCountOut(1));
}

@Test
public void testEdges() {
graph = createGHStorage();
graph.edge(2, 1, 12, true);
assertEquals(1, count(carOutExplorer.setBaseNode(2)));
assertEquals(1, getCountOut(2));

graph.edge(2, 3, 12, true);
assertEquals(1, count(carOutExplorer.setBaseNode(1)));
assertEquals(2, count(carOutExplorer.setBaseNode(2)));
assertEquals(1, count(carOutExplorer.setBaseNode(3)));
assertEquals(1, getCountOut(1));
assertEquals(2, getCountOut(2));
assertEquals(1, getCountOut(3));
}

@Test
Expand All @@ -181,13 +179,13 @@ public void testUnidirectional() {
EdgeIterator i = carOutExplorer.setBaseNode(2);
assertFalse(i.next());

assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(1)));
assertEquals(2, GHUtility.count(carInExplorer.setBaseNode(2)));
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(3)));
assertEquals(1, getCountIn(1));
assertEquals(2, getCountIn(2));
assertEquals(0, getCountIn(3));

assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(1)));
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(2)));
assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(3)));
assertEquals(3, getCountOut(1));
assertEquals(0, getCountOut(2));
assertEquals(1, getCountOut(3));
i = carOutExplorer.setBaseNode(3);
i.next();
assertEquals(2, i.getAdjNode());
Expand All @@ -214,15 +212,15 @@ public void testUnidirectionalEdgeFilter() {
EdgeIterator i = carOutExplorer.setBaseNode(2);
assertFalse(i.next());

assertEquals(4, GHUtility.count(carAllExplorer.setBaseNode(1)));
assertEquals(4, getCountAll(1));

assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(1)));
assertEquals(2, GHUtility.count(carInExplorer.setBaseNode(2)));
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(3)));
assertEquals(1, getCountIn(1));
assertEquals(2, getCountIn(2));
assertEquals(0, getCountIn(3));

assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(1)));
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(2)));
assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(3)));
assertEquals(3, getCountOut(1));
assertEquals(0, getCountOut(2));
assertEquals(1, getCountOut(3));
i = carOutExplorer.setBaseNode(3);
i.next();
assertEquals(2, i.getAdjNode());
Expand Down Expand Up @@ -273,7 +271,7 @@ public void testClone() {

Graph cloneGraph = graph.copyTo(AbstractGraphStorageTester.this.createGHStorage(locationParent + "/clone", false));
assertEquals(graph.getNodes(), cloneGraph.getNodes());
assertEquals(count(carOutExplorer.setBaseNode(1)), count(cloneGraph.createEdgeExplorer(carOutFilter).setBaseNode(1)));
assertEquals(getCountOut(1), count(cloneGraph.createEdgeExplorer(carOutFilter).setBaseNode(1)));
cloneGraph.edge(1, 4, 10, true);
assertEquals(3, count(cloneGraph.createEdgeExplorer(carOutFilter).setBaseNode(1)));
assertEquals(graph.getBounds(), cloneGraph.getBounds());
Expand Down Expand Up @@ -306,7 +304,7 @@ public void testGetLocations() {

graph.edge(0, 2, 10, true);
assertEquals(3, graph.getNodes());
Helper.close((Closeable) graph);
Helper.close(graph);

graph = createGHStorage();
assertEquals(0, graph.getNodes());
Expand Down Expand Up @@ -366,7 +364,7 @@ private void checkExampleGraph(Graph graph) {
assertEquals(GHUtility.asSet(0), GHUtility.getNeighbors(carOutExplorer.setBaseNode((1))));
assertEquals(GHUtility.asSet(5, 4, 3, 2, 1), GHUtility.getNeighbors(carOutExplorer.setBaseNode(0)));
try {
assertEquals(0, count(carOutExplorer.setBaseNode(6)));
assertEquals(0, getCountOut(6));
// for now return empty iterator
// assertFalse(true);
} catch (Exception ex) {
Expand All @@ -382,66 +380,67 @@ public void testDirectional() {
graph.edge(3, 5, 12, true);
graph.edge(6, 3, 12, false);

assertEquals(1, count(carAllExplorer.setBaseNode(1)));
assertEquals(1, count(carInExplorer.setBaseNode(1)));
assertEquals(1, count(carOutExplorer.setBaseNode(1)));
assertEquals(1, getCountAll(1));
assertEquals(1, getCountIn(1));
assertEquals(1, getCountOut(1));

assertEquals(2, count(carAllExplorer.setBaseNode(2)));
assertEquals(1, count(carInExplorer.setBaseNode(2)));
assertEquals(2, count(carOutExplorer.setBaseNode(2)));
assertEquals(2, getCountAll(2));
assertEquals(1, getCountIn(2));
assertEquals(2, getCountOut(2));

assertEquals(4, count(carAllExplorer.setBaseNode(3)));
assertEquals(3, count(carInExplorer.setBaseNode(3)));
assertEquals(2, count(carOutExplorer.setBaseNode(3)));
assertEquals(4, getCountAll(3));
assertEquals(3, getCountIn(3));
assertEquals(2, getCountOut(3));

assertEquals(1, count(carAllExplorer.setBaseNode(4)));
assertEquals(1, count(carInExplorer.setBaseNode(4)));
assertEquals(0, count(carOutExplorer.setBaseNode(4)));
assertEquals(1, getCountAll(4));
assertEquals(1, getCountIn(4));
assertEquals(0, getCountOut(4));

assertEquals(1, count(carAllExplorer.setBaseNode(5)));
assertEquals(1, count(carInExplorer.setBaseNode(5)));
assertEquals(1, count(carOutExplorer.setBaseNode(5)));
assertEquals(1, getCountAll(5));
assertEquals(1, getCountIn(5));
assertEquals(1, getCountOut(5));
}

@Test
public void testDozendEdges() {
graph = createGHStorage();
graph.edge(1, 2, 12, true);
assertEquals(1, count(carAllExplorer.setBaseNode(1)));
int nn = 1;
assertEquals(1, getCountAll(nn));

graph.edge(1, 3, 13, false);
assertEquals(2, count(carAllExplorer.setBaseNode(1)));
assertEquals(2, getCountAll(1));

graph.edge(1, 4, 14, false);
assertEquals(3, count(carAllExplorer.setBaseNode(1)));
assertEquals(3, getCountAll(1));

graph.edge(1, 5, 15, false);
assertEquals(4, count(carAllExplorer.setBaseNode(1)));
assertEquals(4, getCountAll(1));

graph.edge(1, 6, 16, false);
assertEquals(5, count(carAllExplorer.setBaseNode(1)));
assertEquals(5, getCountAll(1));

graph.edge(1, 7, 16, false);
assertEquals(6, count(carAllExplorer.setBaseNode(1)));
assertEquals(6, getCountAll(1));

graph.edge(1, 8, 16, false);
assertEquals(7, count(carAllExplorer.setBaseNode(1)));
assertEquals(7, getCountAll(1));

graph.edge(1, 9, 16, false);
assertEquals(8, count(carAllExplorer.setBaseNode(1)));
assertEquals(8, count(carOutExplorer.setBaseNode(1)));
assertEquals(8, getCountAll(1));
assertEquals(8, getCountOut(1));

assertEquals(1, count(carInExplorer.setBaseNode(1)));
assertEquals(1, count(carInExplorer.setBaseNode(2)));
assertEquals(1, getCountIn(1));
assertEquals(1, getCountIn(2));
}

@Test
public void testCheckFirstNode() {
graph = createGHStorage();

assertEquals(0, count(carAllExplorer.setBaseNode(1)));
assertEquals(0, getCountAll(1));
graph.edge(0, 1, 12, true);
assertEquals(1, count(carAllExplorer.setBaseNode(1)));
assertEquals(1, getCountAll(1));
}

@Test
Expand All @@ -462,17 +461,17 @@ public void testDeleteNodeForUnidir() {
graph.optimize();
assertEquals(20, graph.getNodes());

assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 20))));
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 20))));
assertEquals(1, getCountIn(getIdOf(graph, 20)));
assertEquals(0, getCountOut(getIdOf(graph, 20)));

assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 10))));
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 10))));
assertEquals(1, getCountOut(getIdOf(graph, 10)));
assertEquals(0, getCountIn(getIdOf(graph, 10)));

assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 6))));
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 6))));
assertEquals(1, getCountIn(getIdOf(graph, 6)));
assertEquals(0, getCountOut(getIdOf(graph, 6)));

assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 21))));
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 21))));
assertEquals(1, getCountOut(getIdOf(graph, 21)));
assertEquals(0, getCountIn(getIdOf(graph, 21)));
}

@Test
Expand Down Expand Up @@ -522,12 +521,12 @@ public void testDeleteNodes(int fillToSize) {
// no deletion happend
assertEquals(fillToSize, graph.getNodes());

assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());

// now actually perform deletion
graph.optimize();

assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());

assertEquals(fillToSize - deleted, graph.getNodes());
int id1 = getIdOf(graph, 38.33f);
Expand Down Expand Up @@ -567,17 +566,17 @@ public void testSimpleDelete() {
graph.markNodeRemoved(3);

assertEquals(6, graph.getNodes());
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());

// now actually perform deletion
graph.optimize();

assertEquals(4, graph.getNodes());
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());
// shouldn't change anything
graph.optimize();
assertEquals(4, graph.getNodes());
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());
}

@Test
Expand All @@ -603,13 +602,13 @@ public void testSimpleDelete2() {
graph.edge(9, 12, 912, true).setWayGeometry(pl);

assertEquals(13, graph.getNodes());
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());

// perform deletion
graph.optimize();

assertEquals(11, graph.getNodes());
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());

int id11 = getIdOf(graph, 11); // is now 10
int id12 = getIdOf(graph, 12); // is now 5
Expand Down Expand Up @@ -651,12 +650,12 @@ public void testSimpleDelete3() {
// perform deletion
graph.optimize();

assertEquals(Arrays.<String>asList(), GHUtility.getProblems(graph));
assertTrue(GHUtility.getProblems(graph).isEmpty());

assertEquals(3, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 9))));
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 7))));
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 8))));
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 11))));
assertEquals(3, getCountAll(getIdOf(graph, 9)));
assertEquals(1, getCountAll(getIdOf(graph, 7)));
assertEquals(1, getCountAll(getIdOf(graph, 8)));
assertEquals(1, getCountAll(getIdOf(graph, 11)));
}

@Test
Expand Down Expand Up @@ -759,7 +758,7 @@ public void testCreateDuplicateEdges() {
graph.edge(2, 1, 12, true);
graph.edge(2, 3, 12, true);
graph.edge(2, 3, 13, false);
assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(2)));
assertEquals(3, getCountOut(2));

// no exception
graph.getEdgeIteratorState(1, 3);
Expand Down Expand Up @@ -791,22 +790,22 @@ public void testCreateDuplicateEdges() {
assertTrue(oneIter.getReverse(carAccessEnc));

graph.edge(3, 2, 14, true);
assertEquals(4, GHUtility.count(carOutExplorer.setBaseNode(2)));
assertEquals(4, getCountOut(2));
}

@Test
public void testIdenticalNodes() {
graph = createGHStorage();
graph.edge(0, 0, 100, true);
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(0)));
assertEquals(1, getCountAll(0));
}

@Test
public void testIdenticalNodes2() {
graph = createGHStorage();
graph.edge(0, 0, 100, false);
graph.edge(0, 0, 100, false);
assertEquals(2, GHUtility.count(carAllExplorer.setBaseNode(0)));
assertEquals(2, getCountAll(0));
}

@Test
Expand Down Expand Up @@ -1123,6 +1122,18 @@ public void testDetachEdge() {
assertEquals(edgeState20.getFlags(), edgeState33.detach(true).getFlags());
}

private int getCountOut(int node) {
return GHUtility.count(carOutExplorer.setBaseNode(node));
}

private int getCountIn(int node) {
return GHUtility.count(carInExplorer.setBaseNode(node));
}

private int getCountAll(int node) {
return GHUtility.count(carAllExplorer.setBaseNode(node));
}

static class TmpCarFlagEncoder extends CarFlagEncoder {
public TmpCarFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts) {
super(speedBits, speedFactor, maxTurnCosts);
Expand Down

0 comments on commit bc257ff

Please sign in to comment.