diff options
Diffstat (limited to 'examples/fitting.hs')
-rw-r--r-- | examples/fitting.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/fitting.hs b/examples/fitting.hs index 8298c52..a8f6b1c 100644 --- a/examples/fitting.hs +++ b/examples/fitting.hs | |||
@@ -8,15 +8,15 @@ sigma = 0.1 | |||
8 | ys = map return $ toList $ fromList (map (head . expModel [5,0.1,1]) xs) | 8 | ys = map return $ toList $ fromList (map (head . expModel [5,0.1,1]) xs) |
9 | + scalar sigma * (randomVector 0 Gaussian 40) | 9 | + scalar sigma * (randomVector 0 Gaussian 40) |
10 | 10 | ||
11 | dat :: [([Double],[Double],Double)] | 11 | dat :: [([Double],([Double],Double))] |
12 | 12 | ||
13 | dat = zipWith3 (,,) xs ys (repeat sigma) | 13 | dat = zip xs (zip ys (repeat sigma)) |
14 | 14 | ||
15 | expModel [a,lambda,b] [t] = [a * exp (-lambda * t) + b] | 15 | expModel [a,lambda,b] [t] = [a * exp (-lambda * t) + b] |
16 | 16 | ||
17 | expModelDer [a,lambda,b] [t] = [[exp (-lambda * t), -t * a * exp(-lambda*t) , 1]] | 17 | expModelDer [a,lambda,b] [t] = [[exp (-lambda * t), -t * a * exp(-lambda*t) , 1]] |
18 | 18 | ||
19 | (sol,path) = fitModel 1E-4 1E-4 20 (resM expModel, resD expModelDer) dat [1,0,0] | 19 | (sol,path) = fitModelScaled 1E-4 1E-4 20 (expModel, expModelDer) dat [1,0,0] |
20 | 20 | ||
21 | main = do | 21 | main = do |
22 | print dat | 22 | print dat |