diff options
Diffstat (limited to 'packages/hmatrix/src/Numeric/GSL/Fitting.hs')
-rw-r--r-- | packages/hmatrix/src/Numeric/GSL/Fitting.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/hmatrix/src/Numeric/GSL/Fitting.hs b/packages/hmatrix/src/Numeric/GSL/Fitting.hs index c4f3a91..0a92373 100644 --- a/packages/hmatrix/src/Numeric/GSL/Fitting.hs +++ b/packages/hmatrix/src/Numeric/GSL/Fitting.hs | |||
@@ -3,9 +3,8 @@ Module : Numeric.GSL.Fitting | |||
3 | Copyright : (c) Alberto Ruiz 2010 | 3 | Copyright : (c) Alberto Ruiz 2010 |
4 | License : GPL | 4 | License : GPL |
5 | 5 | ||
6 | Maintainer : Alberto Ruiz (aruiz at um dot es) | 6 | Maintainer : Alberto Ruiz |
7 | Stability : provisional | 7 | Stability : provisional |
8 | Portability : uses ffi | ||
9 | 8 | ||
10 | Nonlinear Least-Squares Fitting | 9 | Nonlinear Least-Squares Fitting |
11 | 10 | ||
@@ -42,7 +41,7 @@ expModelDer [a,lambda,b] [t] = [[exp (-lambda * t), -t * a * exp(-lambda*t) , 1] | |||
42 | (1.0192487112786812,3.782067731353722e-2)] | 41 | (1.0192487112786812,3.782067731353722e-2)] |
43 | 42 | ||
44 | -} | 43 | -} |
45 | ----------------------------------------------------------------------------- | 44 | |
46 | 45 | ||
47 | module Numeric.GSL.Fitting ( | 46 | module Numeric.GSL.Fitting ( |
48 | -- * Levenberg-Marquardt | 47 | -- * Levenberg-Marquardt |
@@ -51,7 +50,6 @@ module Numeric.GSL.Fitting ( | |||
51 | fitModelScaled, fitModel | 50 | fitModelScaled, fitModel |
52 | ) where | 51 | ) where |
53 | 52 | ||
54 | import Data.Packed.Internal | ||
55 | import Numeric.LinearAlgebra | 53 | import Numeric.LinearAlgebra |
56 | import Numeric.GSL.Internal | 54 | import Numeric.GSL.Internal |
57 | 55 | ||
@@ -61,6 +59,9 @@ import System.IO.Unsafe(unsafePerformIO) | |||
61 | 59 | ||
62 | ------------------------------------------------------------------------- | 60 | ------------------------------------------------------------------------- |
63 | 61 | ||
62 | type TVV = TV (TV Res) | ||
63 | type TVM = TV (TM Res) | ||
64 | |||
64 | data FittingMethod = LevenbergMarquardtScaled -- ^ Interface to gsl_multifit_fdfsolver_lmsder. This is a robust and efficient version of the Levenberg-Marquardt algorithm as implemented in the scaled lmder routine in minpack. Minpack was written by Jorge J. More, Burton S. Garbow and Kenneth E. Hillstrom. | 65 | data FittingMethod = LevenbergMarquardtScaled -- ^ Interface to gsl_multifit_fdfsolver_lmsder. This is a robust and efficient version of the Levenberg-Marquardt algorithm as implemented in the scaled lmder routine in minpack. Minpack was written by Jorge J. More, Burton S. Garbow and Kenneth E. Hillstrom. |
65 | | LevenbergMarquardt -- ^ This is an unscaled version of the lmder algorithm. The elements of the diagonal scaling matrix D are set to 1. This algorithm may be useful in circumstances where the scaled version of lmder converges too slowly, or the function is already scaled appropriately. | 66 | | LevenbergMarquardt -- ^ This is an unscaled version of the lmder algorithm. The elements of the diagonal scaling matrix D are set to 1. This algorithm may be useful in circumstances where the scaled version of lmder converges too slowly, or the function is already scaled appropriately. |
66 | deriving (Enum,Eq,Show,Bounded) | 67 | deriving (Enum,Eq,Show,Bounded) |