Skip to content
Snippets Groups Projects
Commit e2ed0ea2 authored by Daniel Schramm's avatar Daniel Schramm
Browse files

Compilation error fixed

parent 41b53667
No related branches found
No related tags found
No related merge requests found
......@@ -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)) {
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment