Import Upstream version 0.6.0

1 files changed, 10 insertions, 11 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/index/preprocessed/knn/RandomSampleKNNPreprocessor.java b/src/de/lmu/ifi/dbs/elki/index/preprocessed/knn/RandomSampleKNNPreprocessor.java
index cb3f1638..87b5a3c0 100644
--- a/src/de/lmu/ifi/dbs/elki/index/preprocessed/knn/RandomSampleKNNPreprocessor.java
+++ b/src/de/lmu/ifi/dbs/elki/index/preprocessed/knn/RandomSampleKNNPreprocessor.java
@@ -40,8 +40,7 @@ import de.lmu.ifi.dbs.elki.logging.progress.FiniteProgress;
 import de.lmu.ifi.dbs.elki.utilities.RandomFactory;
 import de.lmu.ifi.dbs.elki.utilities.documentation.Reference;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.GreaterConstraint;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.LessConstraint;
+import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.CommonConstraints;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleParameter;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.RandomParameter;
@@ -104,22 +103,22 @@ public class RandomSampleKNNPreprocessor<O, D extends Distance<D>> extends Abstr
     final ArrayDBIDs ids = DBIDUtil.ensureArray(relation.getDBIDs());
     final int samplesize = (int) (ids.size() * share);
 
-    for (DBIDIter iter = ids.iter(); iter.valid(); iter.advance()) {
+    for(DBIDIter iter = ids.iter(); iter.valid(); iter.advance()) {
       KNNHeap<D> kNN = DBIDUtil.newHeap(distanceFunction.getDistanceFactory(), k);
 
       DBIDs rsamp = DBIDUtil.randomSample(ids, samplesize, rnd);
-      for (DBIDIter iter2 = rsamp.iter(); iter2.valid(); iter2.advance()) {
+      for(DBIDIter iter2 = rsamp.iter(); iter2.valid(); iter2.advance()) {
         D dist = distanceQuery.distance(iter, iter2);
-        kNN.add(dist, iter2);
+        kNN.insert(dist, iter2);
       }
 
       storage.put(iter, kNN.toKNNList());
-      if (progress != null) {
+      if(progress != null) {
         progress.incrementProcessed(getLogger());
       }
     }
 
-    if (progress != null) {
+    if(progress != null) {
       progress.ensureCompleted(getLogger());
     }
   }
@@ -230,13 +229,13 @@ public class RandomSampleKNNPreprocessor<O, D extends Distance<D>> extends Abstr
       protected void makeOptions(Parameterization config) {
         super.makeOptions(config);
         DoubleParameter shareP = new DoubleParameter(SHARE_ID);
-        shareP.addConstraint(new GreaterConstraint(0.0));
-        shareP.addConstraint(new LessConstraint(1.0));
-        if (config.grab(shareP)) {
+        shareP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
+        shareP.addConstraint(CommonConstraints.LESS_THAN_ONE_DOUBLE);
+        if(config.grab(shareP)) {
           share = shareP.getValue();
         }
         RandomParameter rndP = new RandomParameter(SEED_ID);
-        if (config.grab(rndP)) {
+        if(config.grab(rndP)) {
           rnd = rndP.getValue();
         }
       }