@@ -192,17 +192,11 @@ private static void printUnitTestEdge(DecimalEncodedValue speedEnc, EdgeIterator
192
192
edge .getEdge ());
193
193
}
194
194
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
-
201
195
/**
202
196
* @param speed if null a random speed will be assigned to every edge
203
197
*/
204
198
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 ,
206
200
double pBothDir , double pRandomDistanceOffset ) {
207
201
if (numNodes < 2 || meanDegree < 1 ) {
208
202
throw new IllegalArgumentException ("numNodes must be >= 2, meanDegree >= 1" );
@@ -233,10 +227,6 @@ public static void buildRandomGraph(Graph graph, Random random, int numNodes, do
233
227
// using bidirectional edges will increase mean degree of graph above given value
234
228
boolean bothDirections = random .nextDouble () < pBothDir ;
235
229
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
- }
240
230
double fwdSpeed = 10 + random .nextDouble () * 110 ;
241
231
double bwdSpeed = 10 + random .nextDouble () * 110 ;
242
232
// 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
246
236
if (speedEnc != null ) {
247
237
edge .set (speedEnc , fwdSpeed );
248
238
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 );
254
240
}
255
241
numEdges ++;
256
242
}
0 commit comments