From 2e48ffd1a395817288b8271299eebd0e483407af Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Tue, 6 Apr 2010 18:24:16 +0000 Subject: some changes in GSL.Fitting --- examples/fitting.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') 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 ys = map return $ toList $ fromList (map (head . expModel [5,0.1,1]) xs) + scalar sigma * (randomVector 0 Gaussian 40) -dat :: [([Double],[Double],Double)] +dat :: [([Double],([Double],Double))] -dat = zipWith3 (,,) xs ys (repeat sigma) +dat = zip xs (zip ys (repeat sigma)) expModel [a,lambda,b] [t] = [a * exp (-lambda * t) + b] expModelDer [a,lambda,b] [t] = [[exp (-lambda * t), -t * a * exp(-lambda*t) , 1]] -(sol,path) = fitModel 1E-4 1E-4 20 (resM expModel, resD expModelDer) dat [1,0,0] +(sol,path) = fitModelScaled 1E-4 1E-4 20 (expModel, expModelDer) dat [1,0,0] main = do print dat -- cgit v1.2.3