summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java')
-rw-r--r--src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java120
1 files changed, 62 insertions, 58 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java
index 2cc1b10c..da972b49 100644
--- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java
+++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/MaximumDistanceFunction.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.distance.distancefunction.minkowski;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2013
+ Copyright (C) 2014
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -29,8 +29,7 @@ import de.lmu.ifi.dbs.elki.utilities.Alias;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
/**
- * Maximum distance function to compute the Maximum distance for a pair of
- * FeatureVectors.
+ * Maximum distance for {@link NumberVector}s.
*
* @author Erich Schubert
*/
@@ -42,8 +41,7 @@ public class MaximumDistanceFunction extends LPNormDistanceFunction {
public static final MaximumDistanceFunction STATIC = new MaximumDistanceFunction();
/**
- * Provides a Maximum distance function that can compute the Manhattan
- * distance (that is a DoubleDistance) for FeatureVectors.
+ * Constructor - use {@link #STATIC} instead.
*
* @deprecated Use static instance!
*/
@@ -52,62 +50,62 @@ public class MaximumDistanceFunction extends LPNormDistanceFunction {
super(Double.POSITIVE_INFINITY);
}
- private final double doublePreDistance(NumberVector<?> v1, NumberVector<?> v2, int start, int end, double agg) {
- for (int d = start; d < end; d++) {
+ private final double preDistance(NumberVector v1, NumberVector v2, int start, int end, double agg) {
+ for(int d = start; d < end; d++) {
final double xd = v1.doubleValue(d), yd = v2.doubleValue(d);
final double delta = (xd >= yd) ? xd - yd : yd - xd;
- if (delta > agg) {
+ if(delta > agg) {
agg = delta;
}
}
return agg;
}
- private final double doublePreDistanceVM(NumberVector<?> v, SpatialComparable mbr, int start, int end, double agg) {
- for (int d = start; d < end; d++) {
+ private final double preDistanceVM(NumberVector v, SpatialComparable mbr, int start, int end, double agg) {
+ for(int d = start; d < end; d++) {
final double value = v.doubleValue(d), min = mbr.getMin(d);
double delta = min - value;
- if (delta < 0.) {
+ if(delta < 0.) {
delta = value - mbr.getMax(d);
}
- if (delta > agg) {
+ if(delta > agg) {
agg = delta;
}
}
return agg;
}
- private final double doublePreDistanceMBR(SpatialComparable mbr1, SpatialComparable mbr2, int start, int end, double agg) {
- for (int d = start; d < end; d++) {
+ private final double preDistanceMBR(SpatialComparable mbr1, SpatialComparable mbr2, int start, int end, double agg) {
+ for(int d = start; d < end; d++) {
double delta = mbr2.getMin(d) - mbr1.getMax(d);
- if (delta < 0.) {
+ if(delta < 0.) {
delta = mbr1.getMin(d) - mbr2.getMax(d);
}
- if (delta > agg) {
+ if(delta > agg) {
agg = delta;
}
}
return agg;
}
- private final double doublePreNorm(NumberVector<?> v, int start, int end, double agg) {
- for (int d = start; d < end; d++) {
+ private final double preNorm(NumberVector v, int start, int end, double agg) {
+ for(int d = start; d < end; d++) {
final double xd = v.doubleValue(d);
final double delta = (xd >= 0.) ? xd : -xd;
- if (delta > agg) {
+ if(delta > agg) {
agg = delta;
}
}
return agg;
}
- private final double doublePreNormMBR(SpatialComparable mbr, int start, int end, double agg) {
- for (int d = start; d < end; d++) {
+ private final double preNormMBR(SpatialComparable mbr, int start, int end, double agg) {
+ for(int d = start; d < end; d++) {
double delta = mbr.getMin(d);
- if (delta < 0.) {
+ if(delta < 0.) {
delta = -mbr.getMax(d);
}
- if (delta > agg) {
+ if(delta > agg) {
agg = delta;
}
}
@@ -115,59 +113,65 @@ public class MaximumDistanceFunction extends LPNormDistanceFunction {
}
@Override
- public double doubleDistance(NumberVector<?> v1, NumberVector<?> v2) {
+ public double distance(NumberVector v1, NumberVector v2) {
final int dim1 = v1.getDimensionality(), dim2 = v2.getDimensionality();
final int mindim = (dim1 < dim2) ? dim1 : dim2;
- double agg = doublePreDistance(v1, v2, 0, mindim, 0.);
- if (dim1 > mindim) {
- agg = doublePreNorm(v1, mindim, dim1, agg);
- } else if (dim2 > mindim) {
- agg = doublePreNorm(v2, mindim, dim2, agg);
+ double agg = preDistance(v1, v2, 0, mindim, 0.);
+ if(dim1 > mindim) {
+ agg = preNorm(v1, mindim, dim1, agg);
+ }
+ else if(dim2 > mindim) {
+ agg = preNorm(v2, mindim, dim2, agg);
}
return agg;
}
@Override
- public double doubleNorm(NumberVector<?> v) {
- return doublePreNorm(v, 0, v.getDimensionality(), 0.);
+ public double norm(NumberVector v) {
+ return preNorm(v, 0, v.getDimensionality(), 0.);
}
@Override
- public double doubleMinDist(SpatialComparable mbr1, SpatialComparable mbr2) {
+ public double minDist(SpatialComparable mbr1, SpatialComparable mbr2) {
final int dim1 = mbr1.getDimensionality(), dim2 = mbr2.getDimensionality();
final int mindim = (dim1 < dim2) ? dim1 : dim2;
- final NumberVector<?> v1 = (mbr1 instanceof NumberVector) ? (NumberVector<?>) mbr1 : null;
- final NumberVector<?> v2 = (mbr2 instanceof NumberVector) ? (NumberVector<?>) mbr2 : null;
+ final NumberVector v1 = (mbr1 instanceof NumberVector) ? (NumberVector) mbr1 : null;
+ final NumberVector v2 = (mbr2 instanceof NumberVector) ? (NumberVector) mbr2 : null;
double agg = 0.;
- if (v1 != null) {
- if (v2 != null) {
- agg = doublePreDistance(v1, v2, 0, mindim, agg);
- } else {
- agg = doublePreDistanceVM(v1, mbr2, 0, mindim, agg);
- }
- } else {
- if (v2 != null) {
- agg = doublePreDistanceVM(v2, mbr1, 0, mindim, agg);
- } else {
- agg = doublePreDistanceMBR(mbr1, mbr2, 0, mindim, agg);
+ if(v1 != null) {
+ if(v2 != null) {
+ agg = preDistance(v1, v2, 0, mindim, agg);
+ }
+ else {
+ agg = preDistanceVM(v1, mbr2, 0, mindim, agg);
+ }
+ }
+ else {
+ if(v2 != null) {
+ agg = preDistanceVM(v2, mbr1, 0, mindim, agg);
+ }
+ else {
+ agg = preDistanceMBR(mbr1, mbr2, 0, mindim, agg);
}
}
// first object has more dimensions.
- if (dim1 > mindim) {
- if (v1 != null) {
- agg = doublePreNorm(v1, mindim, dim1, agg);
- } else {
- agg = doublePreNormMBR(v1, mindim, dim1, agg);
+ if(dim1 > mindim) {
+ if(v1 != null) {
+ agg = preNorm(v1, mindim, dim1, agg);
+ }
+ else {
+ agg = preNormMBR(v1, mindim, dim1, agg);
}
}
// second object has more dimensions.
- if (dim2 > mindim) {
- if (v2 != null) {
- agg = doublePreNorm(v2, mindim, dim2, agg);
- } else {
- agg = doublePreNormMBR(mbr2, mindim, dim2, agg);
+ if(dim2 > mindim) {
+ if(v2 != null) {
+ agg = preNorm(v2, mindim, dim2, agg);
+ }
+ else {
+ agg = preNormMBR(mbr2, mindim, dim2, agg);
}
}
return agg;
@@ -185,13 +189,13 @@ public class MaximumDistanceFunction extends LPNormDistanceFunction {
@Override
public boolean equals(Object obj) {
- if (obj == null) {
+ if(obj == null) {
return false;
}
- if (obj == this) {
+ if(obj == this) {
return true;
}
- if (this.getClass().equals(obj.getClass())) {
+ if(this.getClass().equals(obj.getClass())) {
return true;
}
return super.equals(obj);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 16:14:12 +0000