From 6eadb2711bff6ccf398d0974c1e925af2518621c Mon Sep 17 00:00:00 2001
From: Radek Oslejsek <oslejsek@fi.muni.cz>
Date: Tue, 23 Mar 2021 10:45:51 +0100
Subject: [PATCH] Renamed visitors
---
.../java/cz/fidentis/analyst/EfficiencyTests.java | 12 ++++++------
.../analyst/symmetry/SymmetryEstimator.java | 14 +++++++-------
.../kdtree/KdTreeApproxDistanceToTriangles.java | 2 +-
...MultipleVisitor.java => KdTreeClosestNode.java} | 4 ++--
.../analyst/visitors/kdtree/KdTreeDistance.java | 2 +-
.../visitors/kdtree/KdTreeDistanceToVertices.java | 2 +-
.../mesh/{CurvatureVisitor.java => Curvature.java} | 4 ++--
...urvatureVisitor.java => GaussianCurvature.java} | 4 ++--
...{MaxCurvatureVisitor.java => MaxCurvature.java} | 4 ++--
.../kdtree/ClosestNodeMultipleVisitorTest.java | 12 ++++++------
10 files changed, 30 insertions(+), 30 deletions(-)
rename Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/{ClosestNodeMultipleVisitor.java => KdTreeClosestNode.java} (97%)
rename Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/{CurvatureVisitor.java => Curvature.java} (94%)
rename Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/{GaussianCurvatureVisitor.java => GaussianCurvature.java} (95%)
rename Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/{MaxCurvatureVisitor.java => MaxCurvature.java} (98%)
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/EfficiencyTests.java b/Comparison/src/main/java/cz/fidentis/analyst/EfficiencyTests.java
index b9e1ac78..27ecd8c2 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/EfficiencyTests.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/EfficiencyTests.java
@@ -6,10 +6,10 @@ import cz.fidentis.analyst.mesh.core.MeshFacet;
import cz.fidentis.analyst.symmetry.Config;
import cz.fidentis.analyst.symmetry.Plane;
import cz.fidentis.analyst.symmetry.SymmetryEstimator;
-import cz.fidentis.analyst.visitors.mesh.GaussianCurvatureVisitor;
+import cz.fidentis.analyst.visitors.mesh.GaussianCurvature;
import cz.fidentis.analyst.visitors.mesh.HausdorffDistance;
import cz.fidentis.analyst.visitors.mesh.HausdorffDistance.Strategy;
-import cz.fidentis.analyst.visitors.mesh.MaxCurvatureVisitor;
+import cz.fidentis.analyst.visitors.mesh.MaxCurvature;
import java.io.File;
import java.io.IOException;
import java.util.List;
@@ -42,10 +42,10 @@ public class EfficiencyTests {
boolean relativeDist = false;
boolean printDetails = false;
- face1.getMeshModel().compute(new GaussianCurvatureVisitor(false)); // initialize everything, then measure
+ face1.getMeshModel().compute(new GaussianCurvature(false)); // initialize everything, then measure
- System.out.println(measureCurvature(face1, new GaussianCurvatureVisitor(false), false) + "\tmsec:\tGaussian curvature");
- System.out.println(measureCurvature(face1, new MaxCurvatureVisitor(false), false) + "\tmsec:\tMax curvature");
+ System.out.println(measureCurvature(face1, new GaussianCurvature(false), false) + "\tmsec:\tGaussian curvature");
+ System.out.println(measureCurvature(face1, new MaxCurvature(false), false) + "\tmsec:\tMax curvature");
printSymmetryPlane(face1, true, printDetails, false);
printSymmetryPlane(face1, true, printDetails, true);
printSymmetryPlane(face1, false, printDetails, false);
@@ -114,7 +114,7 @@ public class EfficiencyTests {
}
}
- private static long measureCurvature(HumanFace face, GaussianCurvatureVisitor vis, boolean printDetails) {
+ private static long measureCurvature(HumanFace face, GaussianCurvature vis, boolean printDetails) {
long startTime = System.currentTimeMillis();
face.getMeshModel().compute(vis);
long retTime = System.currentTimeMillis() - startTime;
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java
index def09958..dc43dd34 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java
@@ -5,9 +5,9 @@ import cz.fidentis.analyst.mesh.core.MeshFacetImpl;
import cz.fidentis.analyst.mesh.core.MeshPointImpl;
import cz.fidentis.analyst.visitors.mesh.BoundingBox;
import cz.fidentis.analyst.visitors.mesh.BoundingBoxVisitor;
-import cz.fidentis.analyst.visitors.mesh.CurvatureVisitor;
-import cz.fidentis.analyst.visitors.mesh.GaussianCurvatureVisitor;
-import cz.fidentis.analyst.visitors.mesh.MaxCurvatureVisitor;
+import cz.fidentis.analyst.visitors.mesh.Curvature;
+import cz.fidentis.analyst.visitors.mesh.GaussianCurvature;
+import cz.fidentis.analyst.visitors.mesh.MaxCurvature;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -48,9 +48,9 @@ public class SymmetryEstimator {
*
* @param facet Mesh facet for which the symmetry plane is calculated
* @param config Algorighm options
- * @param maxCurvatureAlg If {@code true}, then more precise but slower {@link MaxCurvatureVisitor}
- * algorithm is used. Otherwise, the faster {@link GaussianCurvatureVisitor} is used.
- * See {@link CurvatureVisitor} for more details.
+ * @param maxCurvatureAlg If {@code true}, then more precise but slower {@link MaxCurvature}
+ * algorithm is used. Otherwise, the faster {@link GaussianCurvature} is used.
+ * See {@link Curvature} for more details.
* @throws IllegalArgumentException if some input paramter is missing
*/
public SymmetryEstimator(MeshFacet facet, Config config, boolean maxCurvatureAlg) {
@@ -253,7 +253,7 @@ public class SymmetryEstimator {
}
protected static List<Double> calculateCurvatures(MeshFacet facet, boolean maxCurvature) {
- CurvatureVisitor vis = (maxCurvature) ? new MaxCurvatureVisitor(false) : new GaussianCurvatureVisitor(false);
+ Curvature vis = (maxCurvature) ? new MaxCurvature(false) : new GaussianCurvature(false);
facet.accept(vis);
List<Double> curvatures = new ArrayList<>(vis.getCurvatures().get(facet));
for (int i = 0; i < curvatures.size(); i++) {
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeApproxDistanceToTriangles.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeApproxDistanceToTriangles.java
index c67cf6f9..302868b5 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeApproxDistanceToTriangles.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeApproxDistanceToTriangles.java
@@ -72,7 +72,7 @@ public class KdTreeApproxDistanceToTriangles extends KdTreeVisitor implements Di
@Override
protected void visitKdTree(KdTree kdTree) {
// find the closest nodes:
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(point3d, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(point3d, false);
kdTree.accept(visitor);
final Set<KdNode> closestNodes = visitor.getClosestNodes();
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitor.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeClosestNode.java
similarity index 97%
rename from Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitor.java
rename to Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeClosestNode.java
index deaef2c3..6d244e9f 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitor.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeClosestNode.java
@@ -24,7 +24,7 @@ import javax.vecmath.Vector3d;
*
* @author Daniel Schramm
*/
-public class ClosestNodeMultipleVisitor extends KdTreeVisitor {
+public class KdTreeClosestNode extends KdTreeVisitor {
private final Vector3d point3d;
private double distance = Double.POSITIVE_INFINITY;
@@ -35,7 +35,7 @@ public class ClosestNodeMultipleVisitor extends KdTreeVisitor {
* @param asynchronous If {@code true}, then asynchronous visitor is created.
* @throws IllegalArgumentException if some parameter is wrong
*/
- public ClosestNodeMultipleVisitor(Vector3d point, boolean asynchronous) {
+ public KdTreeClosestNode(Vector3d point, boolean asynchronous) {
super(asynchronous);
if (point == null) {
throw new IllegalArgumentException("point");
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistance.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistance.java
index f0f79b68..a3a203b7 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistance.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistance.java
@@ -44,7 +44,7 @@ public class KdTreeDistance extends KdTreeVisitor implements Distance {
@Override
protected void visitKdTree(KdTree kdTree) {
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(point3d, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(point3d, false);
kdTree.accept(visitor);
final KdNode closestNode = visitor.getAnyClosestNode();
final Vector3d aux = new Vector3d(closestNode.getLocation());
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistanceToVertices.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistanceToVertices.java
index e7121dd3..8bc2d661 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistanceToVertices.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/kdtree/KdTreeDistanceToVertices.java
@@ -58,7 +58,7 @@ public class KdTreeDistanceToVertices extends KdTreeVisitor implements DistanceW
@Override
protected void visitKdTree(KdTree kdTree) {
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(point3d, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(point3d, false);
kdTree.accept(visitor);
final Set<KdNode> closestNodes = visitor.getClosestNodes();
final double dist = visitor.getDistance();
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/CurvatureVisitor.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/Curvature.java
similarity index 94%
rename from Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/CurvatureVisitor.java
rename to Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/Curvature.java
index 6a1d65cc..6a37dbb6 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/CurvatureVisitor.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/Curvature.java
@@ -15,7 +15,7 @@ import java.util.Map;
* @author Natalia Bebjakova
* @author Radek Oslejsek
*/
-public abstract class CurvatureVisitor extends MeshVisitor {
+public abstract class Curvature extends MeshVisitor {
private final Map<MeshFacet, List<Double>> curvatures = new HashMap<>();
@@ -25,7 +25,7 @@ public abstract class CurvatureVisitor extends MeshVisitor {
* @param asynchronous If {@code true}, then asynchronous visitor is created,
* i.e., has to be invoked by {@code Executor}
*/
- public CurvatureVisitor(boolean asynchronous) {
+ public Curvature(boolean asynchronous) {
super(asynchronous);
}
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/GaussianCurvatureVisitor.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/GaussianCurvature.java
similarity index 95%
rename from Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/GaussianCurvatureVisitor.java
rename to Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/GaussianCurvature.java
index 64b2280b..655df22d 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/GaussianCurvatureVisitor.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/GaussianCurvature.java
@@ -11,7 +11,7 @@ import javax.vecmath.Vector3d;
* @author Natalia Bebjakova
* @author Radek Oslejsek
*/
-public class GaussianCurvatureVisitor extends CurvatureVisitor {
+public class GaussianCurvature extends Curvature {
/**
* Constructor.
@@ -19,7 +19,7 @@ public class GaussianCurvatureVisitor extends CurvatureVisitor {
* @param asynchronous If {@code true}, then asynchronous visitor is created,
* i.e., has to be invoked by {@code Executor}
*/
- public GaussianCurvatureVisitor(boolean asynchronous) {
+ public GaussianCurvature(boolean asynchronous) {
super(asynchronous);
}
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/MaxCurvatureVisitor.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/MaxCurvature.java
similarity index 98%
rename from Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/MaxCurvatureVisitor.java
rename to Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/MaxCurvature.java
index 7babaa2e..4de50289 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/MaxCurvatureVisitor.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/MaxCurvature.java
@@ -15,7 +15,7 @@ import javax.vecmath.Vector3d;
* @author Natalia Bebjakova
* @author Radek Oslejsek
*/
-public class MaxCurvatureVisitor extends GaussianCurvatureVisitor {
+public class MaxCurvature extends GaussianCurvature {
/**
* Constructor.
@@ -24,7 +24,7 @@ public class MaxCurvatureVisitor extends GaussianCurvatureVisitor {
* i.e., has to be invoked by {@code Executor}
* @param parallel If {@code true}, then the algorithm computation runs concurrently utilizing all CPU cores
*/
- public MaxCurvatureVisitor(boolean asynchronous) {
+ public MaxCurvature(boolean asynchronous) {
super(asynchronous);
}
diff --git a/Comparison/src/test/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitorTest.java b/Comparison/src/test/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitorTest.java
index 89e0d65a..23723dfc 100644
--- a/Comparison/src/test/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitorTest.java
+++ b/Comparison/src/test/java/cz/fidentis/analyst/visitors/kdtree/ClosestNodeMultipleVisitorTest.java
@@ -54,7 +54,7 @@ public class ClosestNodeMultipleVisitorTest {
final Set<MeshPoint> closest = getTreeNodesSymmetric(1);
final KdTree kdTree = new KdTree(closest);
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(centerNode, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(centerNode, false);
kdTree.accept(visitor);
final Set<KdNode> closestFound = visitor.getClosestNodes();
@@ -69,7 +69,7 @@ public class ClosestNodeMultipleVisitorTest {
treeNodes.add(closest);
final KdTree kdTree = new KdTree(treeNodes);
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(centerNode, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(centerNode, false);
kdTree.accept(visitor);
final Set<KdNode> closestFound = visitor.getClosestNodes();
@@ -85,7 +85,7 @@ public class ClosestNodeMultipleVisitorTest {
assertEquals(16, treeNodes.size());
final KdTree kdTree = new KdTree(treeNodes);
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(centerNode, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(centerNode, false);
kdTree.accept(visitor);
final Set<KdNode> closestFound = visitor.getClosestNodes();
@@ -103,7 +103,7 @@ public class ClosestNodeMultipleVisitorTest {
assertEquals(8 * 99, treeNodes.size());
final KdTree kdTree = new KdTree(treeNodes);
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(centerNode, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(centerNode, false);
kdTree.accept(visitor);
final Set<KdNode> closestFound = visitor.getClosestNodes();
@@ -119,7 +119,7 @@ public class ClosestNodeMultipleVisitorTest {
final KdTree kdTree1 = new KdTree(getTreeNodesSymmetric(2));
final KdTree kdTree2 = new KdTree(getTreeNodesSymmetric(3));
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(centerNode, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(centerNode, false);
kdTree1.accept(visitor);
kdTreeClosest.accept(visitor);
kdTree2.accept(visitor);
@@ -151,7 +151,7 @@ public class ClosestNodeMultipleVisitorTest {
final KdTree kdTreeClosest2 = new KdTree(closest2);
final KdTree kdTree = new KdTree(getTreeNodesSymmetric(2));
- final ClosestNodeMultipleVisitor visitor = new ClosestNodeMultipleVisitor(centerNode, false);
+ final KdTreeClosestNode visitor = new KdTreeClosestNode(centerNode, false);
kdTreeClosest1.accept(visitor);
kdTree.accept(visitor);
kdTreeClosest2.accept(visitor);
--
GitLab