diff options
author | Erich Schubert <erich@debian.org> | 2014-01-22 16:23:20 +0100 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 22:30:38 +0000 |
commit | cd98487b2f040496b2dd35cfb3e01e745cd5fba2 (patch) | |
tree | 78a9e71cbf436021b1e9601a44250511b37faa02 /src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java | |
parent | ec7f409f6e795bbcc6f3c005687954e9475c600c (diff) | |
parent | 14a486343aef55f97f54082d6b542dedebf6f3ba (diff) |
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)
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/math/statistics/distribution/estimator/meta/WinsorisingEstimator.java | 17 |
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(); } } |