Skip to content

Commit afb5a4b

Browse files
easbareasbar
committed
Fixes some unnecessary explicit array creations.
Signed-off-by: easbar <[email protected]>
1 parent 4ea7713 commit afb5a4b

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎core/src/test/java/com/graphhopper/routing/AbstractRoutingAlgorithmTester.java

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void testCalcShortestPath() {
189189
GraphHopperStorage ghStorage = createTestStorage();
190190
RoutingAlgorithm algo = createAlgo(ghStorage);
191191
Path p = algo.calcPath(0, 7);
192-
assertEquals(p.toString(), IntArrayList.from(new int[]{0, 4, 5, 7}), p.calcNodes());
192+
assertEquals(p.toString(), IntArrayList.from(0, 4, 5, 7), p.calcNodes());
193193
assertEquals(p.toString(), 62.1, p.getDistance(), .1);
194194
}
195195

@@ -218,7 +218,7 @@ public void testSimpleAlternative() {
218218
graph.edge(4, 1, 9, true);
219219
Path p = createAlgo(graph).calcPath(0, 4);
220220
assertEquals(p.toString(), 20, p.getDistance(), 1e-4);
221-
assertEquals(IntArrayList.from(new int[]{0, 2, 1, 4}), p.calcNodes());
221+
assertEquals(IntArrayList.from(0, 2, 1, 4), p.calcNodes());
222222
}
223223

224224
@Test
@@ -231,7 +231,7 @@ public void testBidirectionalLinear() {
231231
graph.edge(4, 1, 9, true);
232232
Path p = createAlgo(graph).calcPath(3, 5);
233233
assertEquals(p.toString(), 28, p.getDistance(), 1e-4);
234-
assertEquals(IntArrayList.from(new int[]{3, 2, 1, 4, 5}), p.calcNodes());
234+
assertEquals(IntArrayList.from(3, 2, 1, 4, 5), p.calcNodes());
235235
}
236236

237237
// see calc-fastest-graph.svg
@@ -241,7 +241,7 @@ public void testCalcFastestPath() {
241241
initDirectedAndDiffSpeed(graphShortest, carEncoder);
242242
Path p1 = createAlgo(graphShortest, defaultOpts).
243243
calcPath(0, 3);
244-
assertEquals(IntArrayList.from(new int[]{0, 1, 5, 2, 3}), p1.calcNodes());
244+
assertEquals(IntArrayList.from(0, 1, 5, 2, 3), p1.calcNodes());
245245
assertEquals(p1.toString(), 402.3, p1.getDistance(), .1);
246246
assertEquals(p1.toString(), 144823, p1.getTime());
247247

@@ -251,7 +251,7 @@ public void testCalcFastestPath() {
251251
initDirectedAndDiffSpeed(graphFastest, carEncoder);
252252
Path p2 = createAlgo(graphFastest, opts).
253253
calcPath(0, 3);
254-
assertEquals(IntArrayList.from(new int[]{0, 4, 6, 7, 5, 3}), p2.calcNodes());
254+
assertEquals(IntArrayList.from(0, 4, 6, 7, 5, 3), p2.calcNodes());
255255
assertEquals(p2.toString(), 1261.7, p2.getDistance(), 0.1);
256256
assertEquals(p2.toString(), 111442, p2.getTime());
257257
}
@@ -306,7 +306,7 @@ public void testCalcFootPath() {
306306
calcPath(0, 7);
307307
assertEquals(p1.toString(), 17000, p1.getDistance(), 1e-6);
308308
assertEquals(p1.toString(), 12240 * 1000, p1.getTime());
309-
assertEquals(IntArrayList.from(new int[]{0, 4, 5, 7}), p1.calcNodes());
309+
assertEquals(IntArrayList.from(0, 4, 5, 7), p1.calcNodes());
310310
}
311311

312312
protected void initFootVsCar(Graph graph) {
@@ -415,14 +415,14 @@ public void testNoPathFound() {
415415
public void testWikipediaShortestPath() {
416416
GraphHopperStorage ghStorage = createWikipediaTestGraph();
417417
Path p = createAlgo(ghStorage).calcPath(0, 4);
418-
assertEquals(p.toString(), IntArrayList.from(new int[]{0, 2, 5, 4}), p.calcNodes());
418+
assertEquals(p.toString(), IntArrayList.from(0, 2, 5, 4), p.calcNodes());
419419
assertEquals(p.toString(), 20, p.getDistance(), 1e-4);
420420
}
421421

422422
@Test
423423
public void testCalcIf1EdgeAway() {
424424
Path p = createAlgo(createTestStorage()).calcPath(1, 2);
425-
assertEquals(IntArrayList.from(new int[]{1, 2}), p.calcNodes());
425+
assertEquals(IntArrayList.from(1, 2), p.calcNodes());
426426
assertEquals(p.toString(), 35.1, p.getDistance(), .1);
427427
}
428428

@@ -449,12 +449,12 @@ public void testBidirectional() {
449449
// PrepareTowerNodesShortcutsTest.printEdges((CHGraph) graph);
450450
Path p = createAlgo(graph).calcPath(0, 4);
451451
// PrepareTowerNodesShortcutsTest.printEdges((CHGraph) graph);
452-
assertEquals(p.toString(), IntArrayList.from(new int[]{0, 7, 6, 8, 3, 4}), p.calcNodes());
452+
assertEquals(p.toString(), IntArrayList.from(0, 7, 6, 8, 3, 4), p.calcNodes());
453453
assertEquals(p.toString(), 335.8, p.getDistance(), .1);
454454

455455
p = createAlgo(graph).calcPath(1, 2);
456456
// the other way around is even larger as 0-1 is already 11008.452
457-
assertEquals(p.toString(), IntArrayList.from(new int[]{1, 2}), p.calcNodes());
457+
assertEquals(p.toString(), IntArrayList.from(1, 2), p.calcNodes());
458458
assertEquals(p.toString(), 10007.7, p.getDistance(), .1);
459459
}
460460

@@ -518,7 +518,7 @@ public void testBidirectional2() {
518518
Path p = createAlgo(graph).calcPath(0, 4);
519519
assertEquals(p.toString(), 40, p.getDistance(), 1e-4);
520520
assertEquals(p.toString(), 5, p.calcNodes().size());
521-
assertEquals(IntArrayList.from(new int[]{0, 7, 6, 5, 4}), p.calcNodes());
521+
assertEquals(IntArrayList.from(0, 7, 6, 5, 4), p.calcNodes());
522522
}
523523

524524
@Test
@@ -529,9 +529,9 @@ public void testRekeyBugOfIntBinHeap() {
529529
assertEquals(12, p.calcNodes().size());
530530

531531
IntIndexedContainer list = p.calcNodes();
532-
if (!IntArrayList.from(new int[]{36, 46, 56, 66, 76, 86, 85, 84, 94, 93, 92, 91}).equals(list)
533-
&& !IntArrayList.from(new int[]{36, 46, 56, 66, 76, 86, 85, 84, 83, 82, 92, 91}).equals(list)) {
534-
assertTrue("wrong locations: " + list.toString(), false);
532+
if (!IntArrayList.from(36, 46, 56, 66, 76, 86, 85, 84, 94, 93, 92, 91).equals(list)
533+
&& !IntArrayList.from(36, 46, 56, 66, 76, 86, 85, 84, 83, 82, 92, 91).equals(list)) {
534+
fail("wrong locations: " + list.toString());
535535
}
536536
assertEquals(66f, p.getDistance(), 1e-3);
537537

@@ -541,14 +541,14 @@ public void testRekeyBugOfIntBinHeap() {
541541

542542
public void testBug1(GraphHopperStorage g) {
543543
Path p = createAlgo(g).calcPath(34, 36);
544-
assertEquals(IntArrayList.from(new int[]{34, 35, 36}), p.calcNodes());
544+
assertEquals(IntArrayList.from(34, 35, 36), p.calcNodes());
545545
assertEquals(3, p.calcNodes().size());
546546
assertEquals(17, p.getDistance(), 1e-5);
547547
}
548548

549549
public void testCorrectWeight(GraphHopperStorage g) {
550550
Path p = createAlgo(g).calcPath(45, 72);
551-
assertEquals(IntArrayList.from(new int[]{45, 44, 54, 64, 74, 73, 72}), p.calcNodes());
551+
assertEquals(IntArrayList.from(45, 44, 54, 64, 74, 73, 72), p.calcNodes());
552552
assertEquals(38f, p.getDistance(), 1e-3);
553553
}
554554

@@ -573,7 +573,7 @@ public void testDirectedGraphBug1() {
573573
graph.edge(4, 2, 1, false);
574574

575575
Path p = createAlgo(graph).calcPath(0, 2);
576-
assertEquals(IntArrayList.from(new int[]{0, 1, 2}), p.calcNodes());
576+
assertEquals(IntArrayList.from(0, 1, 2), p.calcNodes());
577577
assertEquals(p.toString(), 5.99, p.getDistance(), 1e-4);
578578
assertEquals(p.toString(), 3, p.calcNodes().size());
579579
}
@@ -588,7 +588,7 @@ public void testDirectedGraphBug2() {
588588
graph.edge(3, 1, 4, true);
589589

590590
Path p = createAlgo(graph).calcPath(0, 3);
591-
assertEquals(IntArrayList.from(new int[]{0, 1, 2, 3}), p.calcNodes());
591+
assertEquals(IntArrayList.from(0, 1, 2, 3), p.calcNodes());
592592
}
593593

594594
// a-b-0-c-1
@@ -620,12 +620,12 @@ public void testWithCoordinates() {
620620
AlgorithmOptions opts = new AlgorithmOptions(DIJKSTRA_BI, weighting);
621621
RoutingAlgorithmFactory prepare = createFactory(graph, opts);
622622
Path p = prepare.createAlgo(getGraph(graph, opts.getWeighting()), opts).calcPath(4, 0);
623-
assertEquals(IntArrayList.from(new int[]{4, 1, 0}), p.calcNodes());
623+
assertEquals(IntArrayList.from(4, 1, 0), p.calcNodes());
624624
assertEquals(Helper.createPointList(0, 2, 1, 1.5, 1.5, 1, 1, 0.6), p.calcPoints());
625625
assertEquals(274128, p.calcPoints().calcDistance(new DistanceCalcEarth()), 1);
626626

627627
p = prepare.createAlgo(getGraph(graph, opts.getWeighting()), opts).calcPath(2, 1);
628-
assertEquals(IntArrayList.from(new int[]{2, 0, 1}), p.calcNodes());
628+
assertEquals(IntArrayList.from(2, 0, 1), p.calcNodes());
629629
assertEquals(Helper.createPointList(0, 0, 1, 0.6, 1.5, 1, 1, 1.5), p.calcPoints());
630630
assertEquals(279482, p.calcPoints().calcDistance(new DistanceCalcEarth()), 1);
631631
}
@@ -643,20 +643,20 @@ public void testViaEdges_FromEqualsTo() {
643643
// identical tower nodes
644644
Path p = calcPathViaQuery(ghStorage, 0.001, 0.000, 0.001, 0.000);
645645
assertTrue(p.isFound());
646-
assertEquals(IntArrayList.from(new int[]{0}), p.calcNodes());
646+
assertEquals(IntArrayList.from(0), p.calcNodes());
647647
// assertEquals(1, p.calcPoints().size());
648648
assertEquals(p.toString(), 0, p.getDistance(), 1e-4);
649649

650650
// identical query points on edge
651651
p = calcPath(ghStorage, 0, 1, 0, 1);
652652
assertTrue(p.isFound());
653-
assertEquals(IntArrayList.from(new int[]{8}), p.calcNodes());
653+
assertEquals(IntArrayList.from(8), p.calcNodes());
654654
// assertEquals(1, p.calcPoints().size());
655655
assertEquals(p.toString(), 0, p.getDistance(), 1e-4);
656656

657657
// very close
658658
p = calcPathViaQuery(ghStorage, 0.00092, 0, 0.00091, 0);
659-
assertEquals(IntArrayList.from(new int[]{8, 9}), p.calcNodes());
659+
assertEquals(IntArrayList.from(8, 9), p.calcNodes());
660660
assertEquals(p.toString(), 1.11, p.getDistance(), .1);
661661
}
662662

@@ -667,20 +667,20 @@ public void testViaEdges_BiGraph() {
667667

668668
// 0-7 to 4-3
669669
Path p = calcPathViaQuery(graph, 0.0009, 0, 0.001, 0.001105);
670-
assertEquals(p.toString(), IntArrayList.from(new int[]{10, 7, 6, 8, 3, 9}), p.calcNodes());
670+
assertEquals(p.toString(), IntArrayList.from(10, 7, 6, 8, 3, 9), p.calcNodes());
671671
assertEquals(p.toString(), 324.11, p.getDistance(), 0.01);
672672

673673
// 0-1 to 2-3
674674
p = calcPathViaQuery(graph, 0.001, 0.0001, 0.010, 0.0011);
675-
assertEquals(p.toString(), IntArrayList.from(new int[]{0, 7, 6, 8, 3, 9}), p.calcNodes());
675+
assertEquals(p.toString(), IntArrayList.from(0, 7, 6, 8, 3, 9), p.calcNodes());
676676
assertEquals(p.toString(), 1335.35, p.getDistance(), 0.01);
677677
}
678678

679679
@Test
680680
public void testViaEdges_WithCoordinates() {
681681
GraphHopperStorage ghStorage = createTestStorage();
682682
Path p = calcPath(ghStorage, 0, 1, 2, 3);
683-
assertEquals(IntArrayList.from(new int[]{8, 1, 2, 9}), p.calcNodes());
683+
assertEquals(IntArrayList.from(8, 1, 2, 9), p.calcNodes());
684684
assertEquals(p.toString(), 56.7, p.getDistance(), .1);
685685
}
686686

@@ -704,17 +704,17 @@ public void testViaEdges_SpecialCases() {
704704

705705
// 0-1 to 3-4
706706
Path p = calcPathViaQuery(graph, 0.00010, 0.00001, 0, 0.00009);
707-
assertEquals(IntArrayList.from(new int[]{5, 1, 2, 3, 6}), p.calcNodes());
707+
assertEquals(IntArrayList.from(5, 1, 2, 3, 6), p.calcNodes());
708708
assertEquals(p.toString(), 26.81, p.getDistance(), .1);
709709

710710
// overlapping edges: 2-3 and 3-2
711711
p = calcPathViaQuery(graph, 0.000049, 0.00014, 0.00001, 0.0001);
712-
assertEquals(IntArrayList.from(new int[]{5, 6}), p.calcNodes());
712+
assertEquals(IntArrayList.from(5, 6), p.calcNodes());
713713
assertEquals(p.toString(), 6.2, p.getDistance(), .1);
714714

715715
// 'from' and 'to' edge share one node '2': 1-2 to 3-2
716716
p = calcPathViaQuery(graph, 0.00009, 0.00011, 0.00001, 0.00011);
717-
assertEquals(p.toString(), IntArrayList.from(new int[]{6, 2, 5}), p.calcNodes());
717+
assertEquals(p.toString(), IntArrayList.from(6, 2, 5), p.calcNodes());
718718
assertEquals(p.toString(), 12.57, p.getDistance(), .1);
719719
}
720720

@@ -724,7 +724,7 @@ public void testQueryGraphAndFastest() {
724724
GraphHopperStorage graph = createGHStorage(encodingManager, Arrays.asList(weighting), false);
725725
initDirectedAndDiffSpeed(graph, carEncoder);
726726
Path p = calcPathViaQuery(weighting, graph, 0.002, 0.0005, 0.0017, 0.0031);
727-
assertEquals(IntArrayList.from(new int[]{8, 1, 5, 3, 9}), p.calcNodes());
727+
assertEquals(IntArrayList.from(8, 1, 5, 3, 9), p.calcNodes());
728728
assertEquals(602.98, p.getDistance(), 1e-1);
729729
}
730730

@@ -814,7 +814,7 @@ public void test0SpeedButUnblocked_Issue242() {
814814
RoutingAlgorithm algo = createAlgo(graph);
815815
try {
816816
Path p = algo.calcPath(0, 2);
817-
assertTrue(false);
817+
fail("there should have been an exception");
818818
} catch (Exception ex) {
819819
assertTrue(ex.getMessage(), ex.getMessage().startsWith("Speed cannot be 0"));
820820
}
@@ -878,7 +878,7 @@ public String getName() {
878878
initEleGraph(graph);
879879
Path p = createAlgo(graph, opts).calcPath(0, 10);
880880
// GHUtility.printEdgeInfo(graph, carEncoder);
881-
assertEquals(IntArrayList.from(new int[]{0, 4, 6, 10}), p.calcNodes());
881+
assertEquals(IntArrayList.from(0, 4, 6, 10), p.calcNodes());
882882

883883
AlgorithmOptions fakeOpts = AlgorithmOptions.start().weighting(fakeWeighting).build();
884884
graph = createGHStorage(encodingManager, Arrays.asList(fakeOpts.getWeighting()), true);
@@ -889,7 +889,7 @@ public String getName() {
889889
RoutingAlgorithmFactory factory = createFactory(graph, fakeOpts);
890890
QueryGraph qGraph = new QueryGraph(getGraph(graph, fakeWeighting)).lookup(from, to);
891891
p = factory.createAlgo(qGraph, fakeOpts).calcPath(from.getClosestNode(), to.getClosestNode());
892-
assertEquals(IntArrayList.from(new int[]{12, 0, 1, 2, 11, 7, 10, 13}), p.calcNodes());
892+
assertEquals(IntArrayList.from(12, 0, 1, 2, 11, 7, 10, 13), p.calcNodes());
893893
assertEquals(37009621, p.getTime());
894894
assertEquals(616827, p.getDistance(), 1);
895895
assertEquals(493462, p.getWeight(), 1);
@@ -918,7 +918,7 @@ public void testMultipleVehicles_issue548() {
918918
RoutingAlgorithm algoCar = createFactory(ghStorage, carOptions).
919919
createAlgo(getGraph(ghStorage, carWeighting), carOptions);
920920
Path p1 = algoCar.calcPath(0, 7);
921-
assertEquals(IntArrayList.from(new int[]{0, 1, 5, 6, 7}), p1.calcNodes());
921+
assertEquals(IntArrayList.from(0, 1, 5, 6, 7), p1.calcNodes());
922922
assertEquals(p1.toString(), 26000, p1.getDistance(), 1e-6);
923923
}
924924

‎core/src/test/java/com/graphhopper/routing/DijkstraOneToManyTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ public void testIssue182() {
130130
initGraph(storage);
131131
RoutingAlgorithm algo = createAlgo(storage);
132132
Path p = algo.calcPath(0, 8);
133-
assertEquals(IntArrayList.from(new int[]{0, 7, 8}), p.calcNodes());
133+
assertEquals(IntArrayList.from(0, 7, 8), p.calcNodes());
134134

135135
// expand SPT
136136
p = algo.calcPath(0, 10);
137-
assertEquals(IntArrayList.from(new int[]{0, 1, 2, 3, 4, 10}), p.calcNodes());
137+
assertEquals(IntArrayList.from(0, 1, 2, 3, 4, 10), p.calcNodes());
138138
}
139139

140140
@Test
@@ -160,15 +160,15 @@ public void testIssue239_and362() {
160160
public void testUseCache() {
161161
RoutingAlgorithm algo = createAlgo(createTestStorage());
162162
Path p = algo.calcPath(0, 4);
163-
assertEquals(IntArrayList.from(new int[]{0, 4}), p.calcNodes());
163+
assertEquals(IntArrayList.from(0, 4), p.calcNodes());
164164

165165
// expand SPT
166166
p = algo.calcPath(0, 7);
167-
assertEquals(IntArrayList.from(new int[]{0, 4, 5, 7}), p.calcNodes());
167+
assertEquals(IntArrayList.from(0, 4, 5, 7), p.calcNodes());
168168

169169
// use SPT
170170
p = algo.calcPath(0, 2);
171-
assertEquals(IntArrayList.from(new int[]{0, 1, 2}), p.calcNodes());
171+
assertEquals(IntArrayList.from(0, 1, 2), p.calcNodes());
172172
}
173173

174174
@Test
@@ -188,7 +188,7 @@ public boolean accept(EdgeIteratorState iter) {
188188
}
189189
});
190190
Path p = algo.calcPath(4, 6);
191-
assertEquals(IntArrayList.from(new int[]{4, 3, 6}), p.calcNodes());
191+
assertEquals(IntArrayList.from(4, 3, 6), p.calcNodes());
192192

193193
// important call!
194194
algo.clear();
@@ -199,7 +199,7 @@ public boolean accept(EdgeIteratorState iter) {
199199
}
200200
});
201201
p = algo.calcPath(4, 6);
202-
assertEquals(IntArrayList.from(new int[]{4, 5, 6}), p.calcNodes());
202+
assertEquals(IntArrayList.from(4, 5, 6), p.calcNodes());
203203
}
204204

205205
private Graph initGraph(Graph g) {
@@ -241,18 +241,18 @@ public void testUseCacheZeroPath_issue707() {
241241
RoutingAlgorithm algo = createAlgo(createTestStorage());
242242

243243
Path p = algo.calcPath(0, 0);
244-
assertEquals(0, p.distance, 0.00000);
244+
assertEquals(0, p.getDistance(), 0.00000);
245245

246246
p = algo.calcPath(0, 4);
247-
assertEquals(IntArrayList.from(new int[]{0, 4}), p.calcNodes());
247+
assertEquals(IntArrayList.from(0, 4), p.calcNodes());
248248

249249
// expand SPT
250250
p = algo.calcPath(0, 7);
251-
assertEquals(IntArrayList.from(new int[]{0, 4, 5, 7}), p.calcNodes());
251+
assertEquals(IntArrayList.from(0, 4, 5, 7), p.calcNodes());
252252

253253
// use SPT
254254
p = algo.calcPath(0, 2);
255-
assertEquals(IntArrayList.from(new int[]{0, 1, 2}), p.calcNodes());
255+
assertEquals(IntArrayList.from(0, 1, 2), p.calcNodes());
256256
}
257257

258258
}

0 commit comments

Comments
 (0)