From 3fe17d0bc9f84390c3baa841e37218d32906fff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Proch=C3=A1zka?= <david@prochazka.dev> Date: Wed, 10 Feb 2021 14:09:21 +0100 Subject: [PATCH] ADD: distance measure enum, changed distance to double type --- src/mhtree/DistanceMeasure.java | 8 ++++++++ src/mhtree/ObjectToNodeDistanceRank.java | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/mhtree/DistanceMeasure.java diff --git a/src/mhtree/DistanceMeasure.java b/src/mhtree/DistanceMeasure.java new file mode 100644 index 0000000..9486ec8 --- /dev/null +++ b/src/mhtree/DistanceMeasure.java @@ -0,0 +1,8 @@ +package mhtree; + +public enum DistanceMeasure { + NEAREST_HULL_OBJECT, + FURTHEST_HULL_OBJECT, + SUM_OF_DISTANCES_TO_HULL_OBJECTS, + MEDOID +} diff --git a/src/mhtree/ObjectToNodeDistanceRank.java b/src/mhtree/ObjectToNodeDistanceRank.java index fa48091..8d5de83 100644 --- a/src/mhtree/ObjectToNodeDistanceRank.java +++ b/src/mhtree/ObjectToNodeDistanceRank.java @@ -6,7 +6,7 @@ public class ObjectToNodeDistanceRank implements Comparable<ObjectToNodeDistance private final Node node; private final LocalAbstractObject object; - private final float distance; + private final double distance; public ObjectToNodeDistanceRank(Node node, LocalAbstractObject object) { this.node = node; @@ -15,7 +15,7 @@ public class ObjectToNodeDistanceRank implements Comparable<ObjectToNodeDistance } public int compareTo(ObjectToNodeDistanceRank rank) { - return Float.compare(distance, rank.node.getDistance(object)); + return Double.compare(distance, rank.node.getDistance(object)); } public Node getNode() { -- GitLab