Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java @ 4794:a7d080347ac3
MINFO: Allow two methods for outlier test in SQ relation.
* Methods can be switched as option in conf.xml.
* Methods:
- Find outliers via multiples of the standard deviation.
- Grubbs (used in Fix-Analysis)
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 11 Jan 2013 13:57:38 +0100 |
parents | e727e3ebdf85 |
children |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java Wed Jan 09 13:17:09 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java Fri Jan 11 13:57:38 2013 +0100 @@ -1,23 +1,18 @@ package de.intevation.flys.artifacts.model.fixings; -import de.intevation.flys.artifacts.math.Outlier; - -import de.intevation.flys.artifacts.math.fitting.Function; - import gnu.trove.TDoubleArrayList; import java.util.ArrayList; import java.util.List; import org.apache.commons.math.MathException; - import org.apache.commons.math.optimization.fitting.CurveFitter; - import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer; - import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; +import org.apache.log4j.Logger; -import org.apache.log4j.Logger; +import de.intevation.flys.artifacts.math.GrubbsOutlier; +import de.intevation.flys.artifacts.math.fitting.Function; public class Fitting { @@ -206,7 +201,7 @@ inputs.add(Double.valueOf(ys.getQuick(i) - y)); } - Integer outlier = Outlier.findOutlier(inputs); + Integer outlier = GrubbsOutlier.findOutlier(inputs); if (outlier == null) { break;