From e2ed0ea2ae77dc4fdabf6661a49706c79686b73f Mon Sep 17 00:00:00 2001
From: Daniel Schramm <xschramm@fi.muni.cz>
Date: Wed, 28 Apr 2021 23:40:57 +0200
Subject: [PATCH] Compilation error fixed
---
.../fidentis/analyst/visitors/mesh/HausdorffDistance.java | 4 ++--
.../visitors/mesh/HausdorffDistancePrioritized.java | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistance.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistance.java
index 557ddeef..7d0b3568 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistance.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistance.java
@@ -252,7 +252,7 @@ public class HausdorffDistance extends MeshVisitor {
return Collections.unmodifiableMap(nearestPoints);
}
- protected Map<MeshFacet, List<Vector3d>> getNearestPointsRaw() {
+ protected Map<MeshFacet, List<Point3d>> getNearestPointsRaw() {
return nearestPoints;
}
@@ -326,7 +326,7 @@ public class HausdorffDistance extends MeshVisitor {
protected boolean instantiateClassAttributes(MeshFacet comparedFacet) {
final List<Double> distList = new ArrayList<>();
- final List<Vector3d> nearestPointsList = new ArrayList<>();
+ final List<Point3d> nearestPointsList = new ArrayList<>();
synchronized (this) {
if (distances.containsKey(comparedFacet)) {
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistancePrioritized.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistancePrioritized.java
index 70ee4c44..6b50fad7 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistancePrioritized.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/mesh/HausdorffDistancePrioritized.java
@@ -13,6 +13,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.vecmath.Point3d;
import javax.vecmath.Vector3d;
public class HausdorffDistancePrioritized extends HausdorffDistance {
@@ -60,7 +61,7 @@ public class HausdorffDistancePrioritized extends HausdorffDistance {
@Override
protected boolean instantiateClassAttributes(MeshFacet comparedFacet) {
final List<Double> distList = new ArrayList<>();
- final List<Vector3d> nearestPointsList = new ArrayList<>();
+ final List<Point3d> nearestPointsList = new ArrayList<>();
final List<Double> prioritiesList = new ArrayList<>();
synchronized (this) {
@@ -79,7 +80,7 @@ public class HausdorffDistancePrioritized extends HausdorffDistance {
@Override
protected void updateResults(KdTreeVisitor vis, MeshPoint point, MeshFacet facet) {
- Vector3d closestV = null;
+ Point3d closestV = null;
if (vis instanceof DistanceWithNearestPoints) { // We have nearest points
closestV = this.getClosestVertex((DistanceWithNearestPoints)vis);
@@ -113,7 +114,7 @@ public class HausdorffDistancePrioritized extends HausdorffDistance {
// TODO TEMPORARY - FP needs to be obtained from the 'facet' as a FP of type 'featurePointType'
final MeshPoint featurePoint = facet.getVertex(featurePointType);
- final double distance = featurePoint.distanceTo(point);
+ final double distance = featurePoint.getPosition().distance(point.getPosition());;
if (distance > sphereRadius) {
return 0;
}
--
GitLab