diff --git a/analysis/pom.xml b/analysis/pom.xml index d46d4ef5..1f326d6a 100644 --- a/analysis/pom.xml +++ b/analysis/pom.xml @@ -10,7 +10,7 @@ org.tinfour Tinfour - 2.1.4-SNAPSHOT + 2.1.4 TinfourAnalysis diff --git a/core/pom.xml b/core/pom.xml index dc3fa367..df9a6401 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -10,7 +10,7 @@ org.tinfour Tinfour - 2.1.4-SNAPSHOT + 2.1.4 TinfourCore diff --git a/demo/pom.xml b/demo/pom.xml index a080cbba..35d05265 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -10,7 +10,7 @@ org.tinfour Tinfour - 2.1.4-SNAPSHOT + 2.1.4 TinfourDemo diff --git a/demo/src/main/java/org/tinfour/demo/development/cdt/ConstraintStarDemo.java b/demo/src/main/java/org/tinfour/demo/development/cdt/ConstraintStarDemo.java index 85ac2c8f..256cd535 100644 --- a/demo/src/main/java/org/tinfour/demo/development/cdt/ConstraintStarDemo.java +++ b/demo/src/main/java/org/tinfour/demo/development/cdt/ConstraintStarDemo.java @@ -40,9 +40,6 @@ import java.awt.geom.Path2D; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import static java.lang.Math.sin; -import static java.lang.Math.cos; -import static java.lang.Math.tan; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -239,7 +236,7 @@ private void addGrid(List vertices) { final static double A72 = Math.toRadians(72); final static double rNotch = 1.0; // radius for inner (notch) vertices - final static double rPoint = rNotch * (cos(A36) + sin(A36) * tan(A72)); + final static double rPoint = rNotch * (Math.cos(A36) + Math.sin(A36) * Math.tan(A72)); /** * Add a region (polygon) constraint in the form of a five-pointed start to diff --git a/demo/src/main/java/org/tinfour/demo/development/cdt/MixedModeConstraintTest.java b/demo/src/main/java/org/tinfour/demo/development/cdt/MixedModeConstraintTest.java index 2659a19b..57665d53 100644 --- a/demo/src/main/java/org/tinfour/demo/development/cdt/MixedModeConstraintTest.java +++ b/demo/src/main/java/org/tinfour/demo/development/cdt/MixedModeConstraintTest.java @@ -314,12 +314,7 @@ private void test(IQuadEdge edge, IIncrementalTin tin, BitSet perimeterFlags) { private String fail(IQuadEdge edge, String message) { return "Edge +(" + edge.getIndex() + "): " + message; } - - private String eString(IQuadEdge edge) { - Vertex A = edge.getA(); - Vertex B = edge.getB(); - return edge.getIndex() + ": " + A + ", " + B + ">> " + edge.toString(); - } + PolygonConstraint makePoly(String label, int xMin, int yMin, int xMax, int yMax) { PolygonConstraint p = new PolygonConstraint(); diff --git a/demo/src/main/java/org/tinfour/demo/performance/RepeatedDeleteTest.java b/demo/src/main/java/org/tinfour/demo/performance/RepeatedDeleteTest.java index 33932a5e..54e96486 100644 --- a/demo/src/main/java/org/tinfour/demo/performance/RepeatedDeleteTest.java +++ b/demo/src/main/java/org/tinfour/demo/performance/RepeatedDeleteTest.java @@ -137,13 +137,9 @@ public void runTest(PrintStream ps, String args[]) throws IOException { int iAvg = 3; // minimum index to start collecting average for (int iTest = 0; iTest < nTests; iTest++) { - String preallocTime = " ~~~"; tin = options.getNewInstanceOfTestTin(); if (usePreAlloc) { - time0 = System.nanoTime(); tin.preAllocateEdges(nVertices); - time1 = System.nanoTime(); - preallocTime = String.format("%12.3f", (time1 - time0) / 1000000.0); } time0 = System.nanoTime(); tin.add(vertexList, null); diff --git a/demo/src/main/java/org/tinfour/demo/performance/SingleBuildTest.java b/demo/src/main/java/org/tinfour/demo/performance/SingleBuildTest.java index 77672297..c98d4b3c 100644 --- a/demo/src/main/java/org/tinfour/demo/performance/SingleBuildTest.java +++ b/demo/src/main/java/org/tinfour/demo/performance/SingleBuildTest.java @@ -48,7 +48,8 @@ import org.tinfour.utils.loaders.ICoordinateTransform; /** - * Builds a TIN from the specified Lidar file, running once and terminating to + * Builds a TIN from the specified input file (text, Lidar, Shapefile), + * running once and terminating to * provide a simple test of the IncrementalTin logic. */ public class SingleBuildTest implements IDevelopmentTest { diff --git a/demo/src/main/java/org/tinfour/demo/performance/TimeDueToSampleSize.java b/demo/src/main/java/org/tinfour/demo/performance/TimeDueToSampleSize.java index cdf9ed5b..b73063c8 100644 --- a/demo/src/main/java/org/tinfour/demo/performance/TimeDueToSampleSize.java +++ b/demo/src/main/java/org/tinfour/demo/performance/TimeDueToSampleSize.java @@ -175,6 +175,10 @@ public void runTest(PrintStream ps, String[] args) throws IOException { TestOptions options = new TestOptions(); boolean[] recognized = options.argumentScan(args); File target = options.getInputFile(); + if(target==null){ + ps.println("Missing valid input target"); + return; + } Class tinClass = options.getTinClass(); @@ -209,7 +213,7 @@ public void runTest(PrintStream ps, String[] args) throws IOException { String dateString = sdFormat.format(date); ps.println("Date of test: " + dateString); ps.println("TIN Class: " + tinClass.getName()); - ps.println("File: " + options.getInputFile().getCanonicalPath()); + ps.println("File: " + target.getCanonicalPath()); ps.println("Random size: " + (randomSize == null ? "Unspecified, Use full size" diff --git a/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.form b/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.form index b7d2580b..ca8661b5 100644 --- a/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.form +++ b/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.form @@ -55,9 +55,6 @@ - - - diff --git a/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.java b/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.java index 4d0a5f6f..eb03f253 100644 --- a/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.java +++ b/demo/src/main/java/org/tinfour/demo/viewer/ExportImageOptionsPanel.java @@ -59,11 +59,6 @@ private void initComponents() { imageFrameCheckBox.setText("Add frame to image"); imageFrameCheckBox.setToolTipText("Draw a thin frame (box) around image"); - imageFrameCheckBox.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - imageFrameCheckBoxActionPerformed(evt); - } - }); transparentBackgroundCheckBox.setText("Transparent Background"); transparentBackgroundCheckBox.setToolTipText("Save image with transparent background (PNG iimages only)"); @@ -96,10 +91,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { ); }// //GEN-END:initComponents - private void imageFrameCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_imageFrameCheckBoxActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_imageFrameCheckBoxActionPerformed - boolean isImageFrameEnabled() { return imageFrameCheckBox.isSelected(); } diff --git a/demo/src/main/java/org/tinfour/demo/viewer/backplane/MvComposite.java b/demo/src/main/java/org/tinfour/demo/viewer/backplane/MvComposite.java index 7140d458..e46b8cf7 100644 --- a/demo/src/main/java/org/tinfour/demo/viewer/backplane/MvComposite.java +++ b/demo/src/main/java/org/tinfour/demo/viewer/backplane/MvComposite.java @@ -1752,9 +1752,6 @@ private Shape makeClipMask() { List vList = con.getVertices(); double[] c = new double[4]; boolean moveFlag = true; - - double x0 = 0; - double y0 = 0; for (Vertex v : vList) { c[0] = v.getX(); c[1] = v.getY(); @@ -1762,8 +1759,6 @@ private Shape makeClipMask() { if (moveFlag) { moveFlag = false; path.moveTo(c[2], c[3]); - x0 = c[2]; - y0 = c[3]; } else { foundStuff = true; path.lineTo(c[2], c[3]); diff --git a/gis/pom.xml b/gis/pom.xml index 80d547df..5c88a34e 100644 --- a/gis/pom.xml +++ b/gis/pom.xml @@ -8,7 +8,7 @@ org.tinfour Tinfour - 2.1.4-SNAPSHOT + 2.1.4 TinfourGis @@ -19,7 +19,7 @@ com.github.mreutegg laszip4j - 0.5 + 0.7 diff --git a/pom.xml b/pom.xml index e3c5d5ee..b1575d11 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.tinfour Tinfour - 2.1.4-SNAPSHOT + 2.1.4 pom Tinfour diff --git a/svm/pom.xml b/svm/pom.xml index dbed7a2f..c53220ee 100644 --- a/svm/pom.xml +++ b/svm/pom.xml @@ -10,7 +10,7 @@ org.tinfour Tinfour - 2.1.4-SNAPSHOT + 2.1.4 TinfourSvm