4 files changed, 22 insertions, 45 deletions

diff --git a/README b/README
index cd54fcd..e2b7aa3 100644
--- a/README
+++ b/README
@@ -107,4 +107,5 @@ INSTALLATION ON WINDOWS
    They are required to run the programs and ghci.
 
 Unfortunately the lapack dll supplied by the R system does not include zgels_ and zgelss_,
-so the functions depending on them will produced a "non supported" runtime error.
+so the functions depending on them (linearSolveLS and linearSolveSVD for complex data)
+will produce a "non supported" runtime error.
diff --git a/examples/pinv.hs b/examples/pinv.hs
new file mode 100644
index 0000000..cab8fc6
--- /dev/null
+++ b/examples/pinv.hs
@@ -0,0 +1,20 @@
+import Numeric.LinearAlgebra
+import Graphics.Plot
+import Text.Printf(printf)
+
+expand :: Int -> Vector Double -> Matrix Double
+expand n x = fromColumns $ constant 1 (dim x): map (x^) [1 .. n]
+
+polynomialModel :: Vector Double -> Vector Double -> Int
+                -> (Vector Double -> Vector Double)
+polynomialModel x y n = f where
+    f z = expand n z <> ws
+    ws  = expand n x <\> y
+
+main = do
+    [x,y] <- (toColumns . readMatrix) `fmap` readFile "data.txt"
+    let pol = polynomialModel x y
+    let view = [x, y, pol 1 x, pol 2 x, pol 3 x]
+    putStrLn $ "  x      y      p 1    p 2    p 3"
+    putStrLn $ format "  " (printf "%.2f") $ fromColumns view
+    mplot view
diff --git a/examples/pinv1.hs b/examples/pinv1.hs
deleted file mode 100644
index 301eac8..0000000
--- a/examples/pinv1.hs
+++ /dev/null
@@ -1,18 +0,0 @@
--- initial check for the polynomial model example
-import Numeric.LinearAlgebra
-
-
-prepSyst :: Int -> Matrix Double -> (Matrix Double, Vector Double)
-prepSyst n d = (a,b) where
-    [x,b] = toColumns d
-    a = fromColumns $ 1+0*x : map (x^) [1 .. n]
-
-main = do
-    dat <- readMatrix `fmap` readFile "data.txt"
-    let (a,b) = prepSyst 3 dat
-    putStr "Coefficient matrix:\n"
-    dispR 3 a
-    putStr "Desired values:\n"
-    print b
-    putStr "\nLeast Squares Solution:\n"
-    print $ pinv a <> b -- equivalent to: linearSolveLSR a (fromColumns [b])
diff --git a/examples/pinv2.hs b/examples/pinv2.hs
deleted file mode 100644
index 7423540..0000000
--- a/examples/pinv2.hs
+++ /dev/null
@@ -1,26 +0,0 @@
--- MSE polynomial model using the pseudoinverse
-import Numeric.LinearAlgebra
-import Graphics.Plot
-
-expand :: Int -> Vector Double -> Matrix Double
-expand n x = fromColumns $ constant 1 (dim x): map (x^) [1 .. n]
-
-polynomialModel :: Matrix Double -> Int -> (Vector Double -> Vector Double)
-polynomialModel d n = f where
-    f z = expand n z <> ws 
-    ws  = pinv a <> b
-    [x,b] = toColumns d 
-    a = expand n x
-
-mk fv = f where
-    f x = fv (fromList [x]) @> 0
-
-main = do
-    d <- readMatrix `fmap` readFile "data.txt"
-    let [x,y] = toColumns d
-    let pol = polynomialModel d
-    let view = [x, y, pol 1 x, pol 2 x, pol 3 x]
-    dispR 2 $ fromColumns view
-    mplot view
-    let f = mk (pol 2)
-    print (f 2.5)