Import Debian changes 0.5.5-1

elki (0.5.5-1) unstable; urgency=low

  * New upstream release: 0.5.5 interim release.

1 files changed, 5 insertions, 5 deletions

diff --git a/test/de/lmu/ifi/dbs/elki/distance/distancefunction/SpatialPrimitiveDistanceFunctionTest.java b/test/de/lmu/ifi/dbs/elki/distance/distancefunction/SpatialPrimitiveDistanceFunctionTest.java
index 1c459717..7309cbbf 100644
--- a/test/de/lmu/ifi/dbs/elki/distance/distancefunction/SpatialPrimitiveDistanceFunctionTest.java
+++ b/test/de/lmu/ifi/dbs/elki/distance/distancefunction/SpatialPrimitiveDistanceFunctionTest.java
@@ -53,7 +53,7 @@ public class SpatialPrimitiveDistanceFunctionTest implements JUnit4Test {
     final int dim = 7;
     final int iters = 10000;
 
-    List<SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, ?>> dists = new ArrayList<SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, ?>>();
+    List<SpatialPrimitiveDistanceFunction<? super NumberVector<?>, ?>> dists = new ArrayList<SpatialPrimitiveDistanceFunction<? super NumberVector<?>, ?>>();
     dists.add(EuclideanDistanceFunction.STATIC);
     dists.add(ManhattanDistanceFunction.STATIC);
     dists.add(MaximumDistanceFunction.STATIC);
@@ -87,7 +87,7 @@ public class SpatialPrimitiveDistanceFunctionTest implements JUnit4Test {
         double m = rnd.nextDouble();
         d4[d] = m * d2[d] + (1 - m) * d3[d];
       }
-      for(SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, ?> dis : dists) {
+      for(SpatialPrimitiveDistanceFunction<? super NumberVector<?>, ?> dis : dists) {
         compareDistances(v1, mbr, v2, dis);
       }
     }
@@ -99,7 +99,7 @@ public class SpatialPrimitiveDistanceFunctionTest implements JUnit4Test {
     final int dim = 7;
     final int iters = 10000;
 
-    List<SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, ?>> dists = new ArrayList<SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, ?>>();
+    List<SpatialPrimitiveDistanceFunction<? super NumberVector<?>, ?>> dists = new ArrayList<SpatialPrimitiveDistanceFunction<? super NumberVector<?>, ?>>();
     dists.add(EuclideanDistanceFunction.STATIC);
     dists.add(ManhattanDistanceFunction.STATIC);
     dists.add(MaximumDistanceFunction.STATIC);
@@ -132,13 +132,13 @@ public class SpatialPrimitiveDistanceFunctionTest implements JUnit4Test {
         double m = rnd.nextDouble();
         d4[d] = m * d2[d] + (1 - m) * d3[d];
       }
-      for(SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, ?> dis : dists) {
+      for(SpatialPrimitiveDistanceFunction<? super NumberVector<?>, ?> dis : dists) {
         compareDistances(v1, mbr, v2, dis);
       }
     }
   }
 
-  protected <D extends Distance<D>> void compareDistances(Vector v1, ModifiableHyperBoundingBox mbr, Vector v2, SpatialPrimitiveDistanceFunction<? super NumberVector<?, ?>, D> dist) {
+  protected <D extends Distance<D>> void compareDistances(Vector v1, ModifiableHyperBoundingBox mbr, Vector v2, SpatialPrimitiveDistanceFunction<? super NumberVector<?>, D> dist) {
     D exact = dist.distance(v1, v2);
     D mind = dist.minDist(v1, v2);
     D mbrd = dist.minDist(v1, mbr);