Skip to content

Commit 80cbfa7

Browse files
committed
No more access for buildRandomGraph
1 parent dc127a7 commit 80cbfa7

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

core/src/main/java/com/graphhopper/util/GHUtility.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -192,17 +192,11 @@ private static void printUnitTestEdge(DecimalEncodedValue speedEnc, EdgeIterator
192192
edge.getEdge());
193193
}
194194

195-
public static void buildRandomGraph(Graph graph, Random random, int numNodes, double meanDegree,
196-
boolean allowZeroDistance, DecimalEncodedValue speedEnc, Double speed,
197-
double pBothDir, double pRandomDistanceOffset) {
198-
buildRandomGraph(graph, random, numNodes, meanDegree, allowZeroDistance, null, speedEnc, speed, pBothDir, pRandomDistanceOffset);
199-
}
200-
201195
/**
202196
* @param speed if null a random speed will be assigned to every edge
203197
*/
204198
public static void buildRandomGraph(Graph graph, Random random, int numNodes, double meanDegree,
205-
boolean allowZeroDistance, BooleanEncodedValue accessEnc, DecimalEncodedValue speedEnc, Double speed,
199+
boolean allowZeroDistance, DecimalEncodedValue speedEnc, Double speed,
206200
double pBothDir, double pRandomDistanceOffset) {
207201
if (numNodes < 2 || meanDegree < 1) {
208202
throw new IllegalArgumentException("numNodes must be >= 2, meanDegree >= 1");
@@ -233,10 +227,6 @@ public static void buildRandomGraph(Graph graph, Random random, int numNodes, do
233227
// using bidirectional edges will increase mean degree of graph above given value
234228
boolean bothDirections = random.nextDouble() < pBothDir;
235229
EdgeIteratorState edge = graph.edge(from, to).setDistance(distance);
236-
if (accessEnc != null) {
237-
edge.set(accessEnc, true);
238-
if (bothDirections) edge.setReverse(accessEnc, true);
239-
}
240230
double fwdSpeed = 10 + random.nextDouble() * 110;
241231
double bwdSpeed = 10 + random.nextDouble() * 110;
242232
// if an explicit speed is given we discard the random speeds and use the given one instead
@@ -246,11 +236,7 @@ public static void buildRandomGraph(Graph graph, Random random, int numNodes, do
246236
if (speedEnc != null) {
247237
edge.set(speedEnc, fwdSpeed);
248238
if (speedEnc.isStoreTwoDirections())
249-
edge.setReverse(speedEnc, bwdSpeed);
250-
}
251-
if (accessEnc == null && speedEnc != null) {
252-
if (!bothDirections)
253-
edge.setReverse(speedEnc, 0);
239+
edge.setReverse(speedEnc, !bothDirections ? 0 : bwdSpeed);
254240
}
255241
numEdges++;
256242
}

0 commit comments

Comments
 (0)