-
-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into vw-simplifier
- Loading branch information
Showing
42 changed files
with
1,705 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
...ler-benchmarks/src/main/java/com/onthegomap/planetiler/benchmarks/BenchmarkLineMerge.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package com.onthegomap.planetiler.benchmarks; | ||
|
|
||
| import com.onthegomap.planetiler.geo.GeoUtils; | ||
| import com.onthegomap.planetiler.util.Format; | ||
| import com.onthegomap.planetiler.util.FunctionThatThrows; | ||
| import com.onthegomap.planetiler.util.Gzip; | ||
| import com.onthegomap.planetiler.util.LoopLineMerger; | ||
| import java.io.IOException; | ||
| import java.math.BigDecimal; | ||
| import java.math.MathContext; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.time.Duration; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import org.locationtech.jts.geom.Coordinate; | ||
| import org.locationtech.jts.geom.CoordinateXY; | ||
| import org.locationtech.jts.geom.Geometry; | ||
| import org.locationtech.jts.geom.GeometryFactory; | ||
| import org.locationtech.jts.geom.LineString; | ||
| import org.locationtech.jts.io.ParseException; | ||
| import org.locationtech.jts.io.WKBReader; | ||
| import org.locationtech.jts.operation.linemerge.LineMerger; | ||
|
|
||
| public class BenchmarkLineMerge { | ||
| private static int numLines; | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| for (int i = 0; i < 10; i++) { | ||
| time(" JTS", geom -> { | ||
| var lm = new LineMerger(); | ||
| lm.add(geom); | ||
| return lm.getMergedLineStrings(); | ||
| }); | ||
| time(" loop(0)", geom -> loopMerger(0).add(geom).getMergedLineStrings()); | ||
| time(" loop(0.1)", geom -> loopMerger(0.1).add(geom).getMergedLineStrings()); | ||
| time("loop(20.0)", geom -> loopMerger(20).add(geom).getMergedLineStrings()); | ||
| } | ||
| System.err.println(numLines); | ||
| } | ||
|
|
||
| private static LoopLineMerger loopMerger(double minLength) { | ||
| var lm = new LoopLineMerger(); | ||
| lm.setMinLength(minLength); | ||
| lm.setStubMinLength(minLength); | ||
| lm.setLoopMinLength(minLength); | ||
| lm.setTolerance(1); | ||
| lm.setMergeStrokes(true); | ||
| return lm; | ||
| } | ||
|
|
||
| private static void time(String name, FunctionThatThrows<Geometry, Collection<LineString>> fn) throws Exception { | ||
| System.err.println(String.join("\t", | ||
| name, | ||
| timeMillis(read("mergelines_200433_lines.wkb.gz"), fn), | ||
| timeMillis(read("mergelines_239823_lines.wkb.gz"), fn), | ||
| "(/s):", | ||
| timePerSec(read("mergelines_1759_point_line.wkb.gz"), fn), | ||
| timePerSec(makeLines(50, 2), fn), | ||
| timePerSec(makeLines(10, 10), fn), | ||
| timePerSec(makeLines(2, 50), fn) | ||
| )); | ||
| } | ||
|
|
||
| private static String timePerSec(Geometry geometry, FunctionThatThrows<Geometry, Collection<LineString>> fn) | ||
| throws Exception { | ||
| long start = System.nanoTime(); | ||
| long end = start + Duration.ofSeconds(1).toNanos(); | ||
| int num = 0; | ||
| for (; System.nanoTime() < end;) { | ||
| numLines += fn.apply(geometry).size(); | ||
| num++; | ||
| } | ||
| return Format.defaultInstance() | ||
| .numeric(Math.round(num * 1d / ((System.nanoTime() - start) * 1d / Duration.ofSeconds(1).toNanos())), true); | ||
| } | ||
|
|
||
| private static String timeMillis(Geometry geometry, FunctionThatThrows<Geometry, Collection<LineString>> fn) | ||
| throws Exception { | ||
| long start = System.nanoTime(); | ||
| long end = start + Duration.ofSeconds(1).toNanos(); | ||
| int num = 0; | ||
| for (; System.nanoTime() < end;) { | ||
| numLines += fn.apply(geometry).size(); | ||
| num++; | ||
| } | ||
| // equivalent of toPrecision(3) | ||
| long nanosPer = (System.nanoTime() - start) / num; | ||
| var bd = new BigDecimal(nanosPer, new MathContext(3)); | ||
| return Format.padRight(Duration.ofNanos(bd.longValue()).toString().replace("PT", ""), 6); | ||
| } | ||
|
|
||
|
|
||
| private static Geometry read(String fileName) throws IOException, ParseException { | ||
| var path = Path.of("planetiler-core", "src", "test", "resources", "mergelines", fileName); | ||
| byte[] bytes = Gzip.gunzip(Files.readAllBytes(path)); | ||
| return new WKBReader().read(bytes); | ||
| } | ||
|
|
||
| private static Geometry makeLines(int lines, int parts) { | ||
| List<LineString> result = new ArrayList<>(); | ||
| double idx = 0; | ||
| for (int i = 0; i < lines; i++) { | ||
| Coordinate[] coords = new Coordinate[parts]; | ||
| for (int j = 0; j < parts; j++) { | ||
| coords[j] = new CoordinateXY(idx, idx); | ||
| idx += 0.5; | ||
| } | ||
| result.add(GeoUtils.JTS_FACTORY.createLineString(coords)); | ||
| } | ||
| return new GeometryFactory().createMultiLineString(result.toArray(LineString[]::new)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.