git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1571627 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2014-02-25 09:21:32 +00:00
parent b122db9eda
commit 856e3cf007
3 changed files with 46 additions and 22 deletions

View File

@ -16,22 +16,22 @@
*/
package org.apache.commons.math3.fitting;
import java.util.List;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.apache.commons.math3.analysis.function.Gaussian;
import org.apache.commons.math3.linear.DiagonalMatrix;
import org.apache.commons.math3.exception.NotStrictlyPositiveException;
import org.apache.commons.math3.exception.NullArgumentException;
import org.apache.commons.math3.exception.NumberIsTooSmallException;
import org.apache.commons.math3.exception.OutOfRangeException;
import org.apache.commons.math3.exception.ZeroException;
import org.apache.commons.math3.exception.NotStrictlyPositiveException;
import org.apache.commons.math3.exception.util.LocalizedFormats;
import org.apache.commons.math3.fitting.leastsquares.LeastSquaresBuilder;
import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem;
import org.apache.commons.math3.linear.DiagonalMatrix;
import org.apache.commons.math3.util.FastMath;
/**
@ -130,16 +130,24 @@ public class GaussianCurveFitter extends AbstractCurveFitter {
return new GaussianCurveFitter(null, Integer.MAX_VALUE);
}
/** {@inheritDoc} */
public GaussianCurveFitter withStartPoint(double[] start) {
return new GaussianCurveFitter(start.clone(),
/**
* Configure the sart point (initial guess).
* @param newStart new start point (initial guess)
* @return a new instance.
*/
public GaussianCurveFitter withStartPoint(double[] newStart) {
return new GaussianCurveFitter(newStart.clone(),
maxIter);
}
/** {@inheritDoc} */
public GaussianCurveFitter withMaxIterations(int max) {
/**
* Configure the maximum number of iterations.
* @param newMaxIter maximum number of iterations
* @return a new instance.
*/
public GaussianCurveFitter withMaxIterations(int newMaxIter) {
return new GaussianCurveFitter(initialGuess,
max);
newMaxIter);
}
/** {@inheritDoc} */

View File

@ -83,16 +83,24 @@ public class HarmonicCurveFitter extends AbstractCurveFitter {
return new HarmonicCurveFitter(null, Integer.MAX_VALUE);
}
/** {@inheritDoc} */
public HarmonicCurveFitter withStartPoint(double[] start) {
return new HarmonicCurveFitter(start.clone(),
/**
* Configure the sart point (initial guess).
* @param newStart new start point (initial guess)
* @return a new instance.
*/
public HarmonicCurveFitter withStartPoint(double[] newStart) {
return new HarmonicCurveFitter(newStart.clone(),
maxIter);
}
/** {@inheritDoc} */
public HarmonicCurveFitter withMaxIterations(int max) {
/**
* Configure the maximum number of iterations.
* @param newMaxIter maximum number of iterations
* @return a new instance.
*/
public HarmonicCurveFitter withMaxIterations(int newMaxIter) {
return new HarmonicCurveFitter(initialGuess,
max);
newMaxIter);
}
/** {@inheritDoc} */

View File

@ -74,16 +74,24 @@ public class PolynomialCurveFitter extends AbstractCurveFitter {
return new PolynomialCurveFitter(new double[degree + 1], Integer.MAX_VALUE);
}
/** {@inheritDoc} */
public PolynomialCurveFitter withStartPoint(double[] start) {
return new PolynomialCurveFitter(start.clone(),
/**
* Configure the sart point (initial guess).
* @param newStart new start point (initial guess)
* @return a new instance.
*/
public PolynomialCurveFitter withStartPoint(double[] newStart) {
return new PolynomialCurveFitter(newStart.clone(),
maxIter);
}
/** {@inheritDoc} */
public PolynomialCurveFitter withMaxIterations(int max) {
/**
* Configure the maximum number of iterations.
* @param newMaxIter maximum number of iterations
* @return a new instance.
*/
public PolynomialCurveFitter withMaxIterations(int newMaxIter) {
return new PolynomialCurveFitter(initialGuess,
max);
newMaxIter);
}
/** {@inheritDoc} */