1 files changed, 9 insertions, 8 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java b/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java
index 0ef6318d..47fe427e 100644
--- a/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java
+++ b/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java
@@ -31,8 +31,7 @@ import de.lmu.ifi.dbs.elki.utilities.datastructures.arraylike.NumberArrayAdapter
 import de.lmu.ifi.dbs.elki.utilities.documentation.Reference;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
 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.ObjectParameter;
@@ -53,6 +52,8 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter;
  * 
  * @author Erich Schubert
  * 
+ * @apiviz.uses DistributionEstimator
+ *
  * @param <D> Distribution type
  */
 @Reference(authors = "C. Hastings, F. Mosteller, J. W. Tukey, C. P. Winsor", title = "Low moments for small samples: a comparative study of order statistics", booktitle = "The Annals of Mathematical Statistics, 18(3)", url = "http://dx.doi.org/10.1214/aoms/1177730388")
@@ -86,7 +87,7 @@ public class WinsorisingEstimator<D extends Distribution> implements Distributio
     final int cut = ((int) (len * winsorize)) >> 1;
     // X positions of samples
     double[] x = new double[len];
-    for (int i = 0; i < len; i++) {
+    for(int i = 0; i < len; i++) {
       final double val = adapter.getDouble(data, i);
       x[i] = val;
     }
@@ -95,7 +96,7 @@ public class WinsorisingEstimator<D extends Distribution> implements Distributio
     double max = QuickSelect.quickSelect(x, cut, len, len - 1 - cut);
     // Winsorize by replacing the smallest and largest values.
     // QuickSelect ensured that these are correctly in place.
-    for (int i = 0, j = len - 1; i < cut; i++, j--) {
+    for(int i = 0, j = len - 1; i < cut; i++, j--) {
       x[i] = min;
       x[j] = max;
     }
@@ -146,14 +147,14 @@ public class WinsorisingEstimator<D extends Distribution> implements Distributio
     protected void makeOptions(Parameterization config) {
       super.makeOptions(config);
       ObjectParameter<DistributionEstimator<D>> innerP = new ObjectParameter<>(INNER_ID, DistributionEstimator.class);
-      if (config.grab(innerP)) {
+      if(config.grab(innerP)) {
         inner = innerP.instantiateClass(config);
       }
 
       DoubleParameter trimP = new DoubleParameter(WINSORIZE_ID);
-      trimP.addConstraint(new GreaterConstraint(0.));
-      trimP.addConstraint(new LessConstraint(0.5));
-      if (config.grab(trimP)) {
+      trimP.addConstraint(CommonConstraints.GREATER_THAN_ZERO_DOUBLE);
+      trimP.addConstraint(CommonConstraints.LESS_THAN_HALF_DOUBLE);
+      if(config.grab(trimP)) {
         winsorize = trimP.doubleValue();
       }
     }