1 files changed, 8 insertions, 10 deletions

diff --git a/examples/pca1.hs b/examples/pca1.hs
index a11eba9..ad2214d 100644
--- a/examples/pca1.hs
+++ b/examples/pca1.hs
@@ -8,27 +8,25 @@ import Control.Monad(when)
 type Vec = Vector Double
 type Mat = Matrix Double
 
-
+{-
 -- Vector with the mean value of the columns of a matrix
 mean a = constant (recip . fromIntegral . rows $ a) (rows a) <> a
 
 -- covariance matrix of a list of observations stored as rows
 cov x = (trans xc <> xc) / fromIntegral (rows x - 1)
     where xc = x - asRow (mean x)
+-}
 
 
 -- creates the compression and decompression functions from the desired number of components
 pca :: Int -> Mat -> (Vec -> Vec , Vec -> Vec)
 pca n dataSet = (encode,decode)
   where
-    encode x = vp <> (x - m)
-    decode x = x <> vp + m
-    m = mean dataSet
-    c = cov dataSet
-    (_,v) = eigSH' c
-    vp = takeRows n (trans v)
-
-norm = pnorm PNorm2
+    encode x = vp #> (x - m)
+    decode x = x <# vp + m
+    (m,c) = meanCov dataSet
+    (_,v) = eigSH (trustSym c)
+    vp = tr $ takeColumns n v
 
 main = do
     ok <- doesFileExist ("mnist.txt")
@@ -43,4 +41,4 @@ main = do
     let (pe,pd) = pca 10 xs
     let y = pe x
     print y  -- compressed version
-    print $ norm (x - pd y) / norm x --reconstruction quality
+    print $ norm_2 (x - pd y) / norm_2 x --reconstruction quality