Import Debian changes 0.6.0-1

elki (0.6.0-1) unstable; urgency=low

  * New upstream final.
  * 3DPC extension is not included, but may be uploaded as a separate
    package when there is actual need (it is a demo software, not meant
    for use outside of research, so just get the source code!)
  * Upgrade to policy 3.9.5.0 (no changes)

1 files changed, 4 insertions, 5 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/KNNDistanceOrder.java b/src/de/lmu/ifi/dbs/elki/algorithm/KNNDistanceOrder.java
index b696ed36..46cf2246 100644
--- a/src/de/lmu/ifi/dbs/elki/algorithm/KNNDistanceOrder.java
+++ b/src/de/lmu/ifi/dbs/elki/algorithm/KNNDistanceOrder.java
@@ -43,8 +43,7 @@ import de.lmu.ifi.dbs.elki.result.KNNDistanceOrderResult;
 import de.lmu.ifi.dbs.elki.utilities.documentation.Description;
 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.GreaterConstraint;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.constraints.LessEqualConstraint;
+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;
@@ -164,14 +163,14 @@ public class KNNDistanceOrder<O, D extends Distance<D>> extends AbstractDistance
     protected void makeOptions(Parameterization config) {
       super.makeOptions(config);
       IntParameter kP = new IntParameter(K_ID, 1);
-      kP.addConstraint(new GreaterConstraint(0));
+      kP.addConstraint(CommonConstraints.GREATER_EQUAL_ONE_INT);
       if(config.grab(kP)) {
         k = kP.getValue();
       }
 
       DoubleParameter percentageP = new DoubleParameter(PERCENTAGE_ID, 1.0);
-      percentageP.addConstraint(new GreaterConstraint(0));
-      percentageP.addConstraint(new LessEqualConstraint(1));
+      percentageP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
+      percentageP.addConstraint(CommonConstraints.LESS_EQUAL_ONE_DOUBLE);
       if(config.grab(percentageP)) {
         percentage = percentageP.getValue();
       }