Import Upstream version 0.6.0

1 files changed, 3 insertions, 3 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/CTLuRandomWalkEC.java b/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/CTLuRandomWalkEC.java
index c8efe4da..85524b4e 100644
--- a/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/CTLuRandomWalkEC.java
+++ b/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/CTLuRandomWalkEC.java
@@ -56,7 +56,7 @@ import de.lmu.ifi.dbs.elki.utilities.documentation.Description;
 import de.lmu.ifi.dbs.elki.utilities.documentation.Reference;

 import de.lmu.ifi.dbs.elki.utilities.documentation.Title;

 import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;

-import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.GreaterEqualConstraint;

+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.IntParameter;

@@ -149,7 +149,7 @@ public class CTLuRandomWalkEC<N, D extends NumberDistance<D, ?>> extends Abstrac
           }

           final double e;

           final D distance = distFunc.distance(id, n);

-          heap.add(distance, n);

+          heap.insert(distance, n);

           double dist = distance.doubleValue();

           if(dist == 0) {

             LOG.warning("Zero distances are not supported - skipping: " + DBIDUtil.toString(id) + " " + DBIDUtil.toString(n));

@@ -296,7 +296,7 @@ public class CTLuRandomWalkEC<N, D extends NumberDistance<D, ?>> extends Abstrac
      */

     protected void configK(Parameterization config) {

       final IntParameter param = new IntParameter(K_ID);

-      param.addConstraint(new GreaterEqualConstraint(1));

+      param.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);

       if(config.grab(param)) {

         k = param.getValue();

       }