1 files changed, 27 insertions, 26 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/LPIntegerNormDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/LPIntegerNormDistanceFunction.java
index 22ae45b3..b94374ed 100644
--- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/LPIntegerNormDistanceFunction.java
+++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/minkowski/LPIntegerNormDistanceFunction.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
@@ -32,8 +32,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameteriz
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter;
 
 /**
- * Provides a LP-Norm for number vectors. Optimized version for integer values
- * of p. This will likely not have huge impact, but YMMV.
+ * LP-Norm for {@link NumberVector}s, optimized version for integer values of p.
+ * This will likely not have huge impact, but may vary from CPU and virtual
+ * machine version.
  * 
  * @author Erich Schubert
  * 
@@ -55,7 +56,7 @@ public class LPIntegerNormDistanceFunction extends LPNormDistanceFunction {
     this.intp = p;
   }
 
-  private final double doublePreDistance(NumberVector<?> v1, NumberVector<?> v2, final int start, final int end, double agg) {
+  private final double preDistance(NumberVector v1, NumberVector v2, final int start, final 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;
@@ -64,7 +65,7 @@ public class LPIntegerNormDistanceFunction extends LPNormDistanceFunction {
     return agg;
   }
 
-  private final double doublePreDistanceVM(NumberVector<?> v, SpatialComparable mbr, final int start, final int end, double agg) {
+  private final double preDistanceVM(NumberVector v, SpatialComparable mbr, final int start, final 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;
@@ -78,7 +79,7 @@ public class LPIntegerNormDistanceFunction extends LPNormDistanceFunction {
     return agg;
   }
 
-  private final double doublePreDistanceMBR(SpatialComparable mbr1, SpatialComparable mbr2, final int start, final int end, double agg) {
+  private final double preDistanceMBR(SpatialComparable mbr1, SpatialComparable mbr2, final int start, final int end, double agg) {
     for(int d = start; d < end; d++) {
       double delta = mbr2.getMin(d) - mbr1.getMax(d);
       if(delta < 0.) {
@@ -91,7 +92,7 @@ public class LPIntegerNormDistanceFunction extends LPNormDistanceFunction {
     return agg;
   }
 
-  private final double doublePreNorm(NumberVector<?> v, final int start, final int end, double agg) {
+  private final double preNorm(NumberVector v, final int start, final int end, double agg) {
     for(int d = start; d < end; d++) {
       final double xd = v.doubleValue(d);
       final double delta = xd >= 0. ? xd : -xd;
@@ -100,7 +101,7 @@ public class LPIntegerNormDistanceFunction extends LPNormDistanceFunction {
     return agg;
   }
 
-  private final double doublePreNormMBR(SpatialComparable mbr, final int start, final int end, double agg) {
+  private final double preNormMBR(SpatialComparable mbr, final int start, final int end, double agg) {
     for(int d = start; d < end; d++) {
       double delta = mbr.getMin(d);
       if(delta < 0.) {
@@ -114,65 +115,65 @@ public class LPIntegerNormDistanceFunction 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.);
+    double agg = preDistance(v1, v2, 0, mindim, 0.);
     if(dim1 > mindim) {
-      agg = doublePreNorm(v1, mindim, dim1, agg);
+      agg = preNorm(v1, mindim, dim1, agg);
     }
     else if(dim2 > mindim) {
-      agg = doublePreNorm(v2, mindim, dim2, agg);
+      agg = preNorm(v2, mindim, dim2, agg);
     }
     return Math.pow(agg, invp);
   }
 
   @Override
-  public double doubleNorm(NumberVector<?> v) {
-    return Math.pow(doublePreNorm(v, 0, v.getDimensionality(), 0.), invp);
+  public double norm(NumberVector v) {
+    return Math.pow(preNorm(v, 0, v.getDimensionality(), 0.), invp);
   }
 
   @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);
+        agg = preDistance(v1, v2, 0, mindim, agg);
       }
       else {
-        agg = doublePreDistanceVM(v1, mbr2, 0, mindim, agg);
+        agg = preDistanceVM(v1, mbr2, 0, mindim, agg);
       }
     }
     else {
       if(v2 != null) {
-        agg = doublePreDistanceVM(v2, mbr1, 0, mindim, agg);
+        agg = preDistanceVM(v2, mbr1, 0, mindim, agg);
       }
       else {
-        agg = doublePreDistanceMBR(mbr1, mbr2, 0, mindim, agg);
+        agg = preDistanceMBR(mbr1, mbr2, 0, mindim, agg);
       }
     }
     // first object has more dimensions.
     if(dim1 > mindim) {
       if(v1 != null) {
-        agg = doublePreNorm(v1, mindim, dim1, agg);
+        agg = preNorm(v1, mindim, dim1, agg);
       }
       else {
-        agg = doublePreNormMBR(v1, mindim, dim1, agg);
+        agg = preNormMBR(v1, mindim, dim1, agg);
       }
     }
     // second object has more dimensions.
     if(dim2 > mindim) {
       if(v2 != null) {
-        agg = doublePreNorm(v2, mindim, dim2, agg);
+        agg = preNorm(v2, mindim, dim2, agg);
       }
       else {
-        agg = doublePreNormMBR(mbr2, mindim, dim2, agg);
+        agg = preNormMBR(mbr2, mindim, dim2, agg);
       }
     }
     return Math.pow(agg, invp);
@@ -194,7 +195,7 @@ public class LPIntegerNormDistanceFunction extends LPNormDistanceFunction {
     @Override
     protected void makeOptions(Parameterization config) {
       super.makeOptions(config);
-      final IntParameter paramP = new IntParameter(P_ID);
+      final IntParameter paramP = new IntParameter(LPNormDistanceFunction.Parameterizer.P_ID);
       paramP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
       if(config.grab(paramP)) {
         p = paramP.getValue();