-Wall

6 files changed, 38 insertions, 38 deletions

diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index fbefa68..45298b5 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -168,9 +168,9 @@ square m = rows m == cols m
 
 -- | determinant of a square matrix, computed from the LU decomposition.
 det :: Field t => Matrix t -> t
-det m | square m = s * (product $ toList $ takeDiag $ lu)
+det m | square m = s * (product $ toList $ takeDiag $ lup)
       | otherwise = error "det of nonsquare matrix"
-    where (lu,perm) = luPacked m
+    where (lup,perm) = luPacked m
           s = signlp (rows m) perm
 
 -- | LU factorization of a general matrix using lapack's dgetrf or zgetrf.
@@ -501,21 +501,21 @@ fixPerm r vals = (fromColumns $ elems res, sign)
           s = toColumns (ident r)
           (res,sign) = foldl swap (listArray (0,r-1) s, 1) (zip v vals)
 
-triang r c h v = reshape c $ fromList [el i j | i<-[0..r-1], j<-[0..c-1]]
-    where el i j = if j-i>=h then v else 1 - v
+triang r c h v = (r><c) [el s t | s<-[0..r-1], t<-[0..c-1]]
+    where el p q = if q-p>=h then v else 1 - v
 
-luFact (lu,perm) | r <= c    = (l ,u ,p, s)
-                 | otherwise = (l',u',p, s)
+luFact (l_u,perm) | r <= c    = (l ,u ,p, s)
+                  | otherwise = (l',u',p, s)
   where
-    r = rows lu
-    c = cols lu
+    r = rows l_u
+    c = cols l_u
     tu = triang r c 0 1
     tl = triang r c 0 0
-    l = takeColumns r (lu |*| tl) |+| diagRect (constant 1 r) r r
-    u = lu |*| tu
+    l = takeColumns r (l_u |*| tl) |+| diagRect (constant 1 r) r r
+    u = l_u |*| tu
     (p,s) = fixPerm r perm
-    l' = (lu |*| tl) |+| diagRect (constant 1 c) r c
-    u' = takeRows c (lu |*| tu)
+    l' = (l_u |*| tl) |+| diagRect (constant 1 c) r c
+    u' = takeRows c (l_u |*| tu)
     (|+|) = add
     (|*|) = mul
 
@@ -572,8 +572,8 @@ kronecker a b = fromBlocks
 -- reference multiply
 ---------------------------------------------------------------------
 
-mulH a b = fromLists [[ dot ai bj | bj <- toColumns b] | ai <- toRows a ]
-    where dot u v = sum $ zipWith (*) (toList u) (toList v)
+mulH a b = fromLists [[ doth ai bj | bj <- toColumns b] | ai <- toRows a ]
+    where doth u v = sum $ zipWith (*) (toList u) (toList v)
 
 -----------------------------------------------------------------------------------
 -- workaround
@@ -599,7 +599,7 @@ colMajor = CBLASOrder 102
 
 noTrans, trans', conjTrans :: CBLASTrans
 noTrans   = CBLASTrans 111
-trans'     = CBLASTrans 112
+trans'    = CBLASTrans 112
 conjTrans = CBLASTrans 113
 
 foreign import ccall "cblas.h cblas_dgemm"
@@ -608,12 +608,12 @@ foreign import ccall "cblas.h cblas_dgemm"
               -> Ptr Double -> CInt -> IO ()
 
 multiplyR3 :: Matrix Double -> Matrix Double -> Matrix Double
-multiplyR3 a b = multiply3 dgemm "cblas_dgemm" (fmat a) (fmat b)
+multiplyR3 x y = multiply3 dgemm "cblas_dgemm" (fmat x) (fmat y)
     where
         multiply3 f st a b
             | cols a == rows b = unsafePerformIO $ do
                 s <- createMatrix ColumnMajor (rows a) (cols b)
-                let g ar ac ap br bc bp rr rc rp = f colMajor noTrans noTrans ar bc ac 1 ap ar bp br 0 rp rr >> return 0
+                let g ar ac ap br bc bp rr _rc rp = f colMajor noTrans noTrans ar bc ac 1 ap ar bp br 0 rp rr >> return 0
                 app3 g mat a mat b mat s st
                 return s
             | otherwise = error $ st ++ " (matrix product) of nonconformant matrices"
@@ -625,14 +625,14 @@ foreign import ccall "cblas.h cblas_zgemm"
               -> Ptr (Complex Double) -> CInt -> IO ()
 
 multiplyC3 :: Matrix (Complex Double) -> Matrix (Complex Double) -> Matrix (Complex Double)
-multiplyC3 a b = unsafePerformIO $ multiply3 zgemm "cblas_zgemm" (fmat a) (fmat b)
+multiplyC3 x y = unsafePerformIO $ multiply3 zgemm "cblas_zgemm" (fmat x) (fmat y)
     where
         multiply3 f st a b
             | cols a == rows b = do
                 s <- createMatrix ColumnMajor (rows a) (cols b)
                 palpha <- new 1
                 pbeta  <- new 0
-                let g ar ac ap br bc bp rr rc rp = f colMajor noTrans noTrans ar bc ac palpha ap ar bp br pbeta rp rr >> return 0
+                let g ar ac ap br bc bp rr _rc rp = f colMajor noTrans noTrans ar bc ac palpha ap ar bp br pbeta rp rr >> return 0
                 app3 g mat a mat b mat s st
                 free palpha
                 free pbeta
diff --git a/lib/Numeric/LinearAlgebra/Instances.hs b/lib/Numeric/LinearAlgebra/Instances.hs
index 334ccff..79a8990 100644
--- a/lib/Numeric/LinearAlgebra/Instances.hs
+++ b/lib/Numeric/LinearAlgebra/Instances.hs
@@ -22,7 +22,6 @@ module Numeric.LinearAlgebra.Instances(
 import Numeric.LinearAlgebra.Linear
 import Numeric.GSL.Vector
 import Data.Packed.Matrix
-import Data.Packed.Vector
 import Complex
 import Data.List(transpose,intersperse)
 import Foreign(Storable)
@@ -49,11 +48,11 @@ instance (Show a, Storable a) => (Show (Vector a)) where
 ------------------------------------------------------------------
 
 instance (Element a, Read a) => Read (Matrix a) where
-    readsPrec _ s = [((rows><cols) . read $ listnums, rest)]
+    readsPrec _ s = [((rs><cs) . read $ listnums, rest)]
         where (thing,rest) = breakAt ']' s
               (dims,listnums) = breakAt ')' thing
-              cols = read . init . fst. breakAt ')' . snd . breakAt '<' $ dims
-              rows = read . snd . breakAt '(' .init . fst . breakAt '>' $ dims
+              cs = read . init . fst. breakAt ')' . snd . breakAt '<' $ dims
+              rs = read . snd . breakAt '(' .init . fst . breakAt '>' $ dims
 
 instance (Element a, Read a) => Read (Vector a) where
     readsPrec _ s = [((d |>) . read $ listnums, rest)]
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index 3af9960..9bf60e2 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -18,8 +18,6 @@ module Numeric.LinearAlgebra.Linear (
     Linear(..)
 ) where
 
-
-import Data.Packed.Internal(partit)
 import Data.Packed
 import Numeric.GSL.Vector
 import Complex
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index 07b9f63..7ebd1f2 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -22,11 +22,15 @@ module Numeric.LinearAlgebra.Tests(
 import Numeric.LinearAlgebra
 import Numeric.LinearAlgebra.Tests.Instances
 import Numeric.LinearAlgebra.Tests.Properties
-import Test.QuickCheck
+import Test.QuickCheck hiding (test)
 import Test.HUnit hiding ((~:),test)
 import System.Info
 import Data.List(foldl1')
 import Numeric.GSL hiding (sin,cos,exp,choose)
+import Prelude hiding ((^))
+import qualified Prelude
+
+a ^ b = a Prelude.^ (b :: Int)
 
 qCheck n = check defaultConfig {configSize = const n}
 
@@ -73,7 +77,7 @@ besselTest = utest "bessel_J0_e" ( abs (r-expected) < e )
           expected = -0.17759677131433830434739701
 
 exponentialTest = utest "exp_e10_e" ( abs (v*10^e - expected) < 4E-2 )
-    where (v,e,err) = exp_e10_e 30.0
+    where (v,e,_err) = exp_e10_e 30.0
           expected = exp 30.0
 
 ---------------------------------------------------------------------
diff --git a/lib/Numeric/LinearAlgebra/Tests/Instances.hs b/lib/Numeric/LinearAlgebra/Tests/Instances.hs
index 677ad2b..4e829d2 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Instances.hs
+++ b/lib/Numeric/LinearAlgebra/Tests/Instances.hs
@@ -30,9 +30,9 @@ import Control.Monad(replicateM)
 
 instance (Arbitrary a, RealFloat a) => Arbitrary (Complex a) where
     arbitrary = do
-        r <- arbitrary
-        i <- arbitrary
-        return (r:+i)
+        re <- arbitrary
+        im <- arbitrary
+        return (re :+ im)
     coarbitrary = undefined
 
 chooseDim = sized $ \m -> choose (1,max 1 m)
diff --git a/lib/Numeric/LinearAlgebra/Tests/Properties.hs b/lib/Numeric/LinearAlgebra/Tests/Properties.hs
index 5663b86..b5321c2 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/lib/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -39,11 +39,10 @@ module Numeric.LinearAlgebra.Tests.Properties (
 ) where
 
 import Numeric.LinearAlgebra
-import Numeric.LinearAlgebra.Tests.Instances(Sq(..),Her(..),Rot(..))
 import Test.QuickCheck
-import Debug.Trace
+-- import Debug.Trace
 
-debug x = trace (show x) x
+-- debug x = trace (show x) x
 
 -- relative error
 dist :: (Normed t, Num t) => t -> t -> Double
@@ -77,7 +76,7 @@ hermitian m = square m && m |~| ctrans m
 wellCond m = rcond m > 1/100
 
 positiveDefinite m = minimum (toList e) > 0
-    where (e,v) = eigSH m
+    where (e,_v) = eigSH m
 
 upperTriang m = rows m == 1 || down == z
     where down = fromList $ concat $ zipWith drop [1..] (toLists (ctrans m))
@@ -107,8 +106,8 @@ pinvProp m =  m <> p <> m |~| m
 
 detProp m = s d1 |~| s d2
     where d1 = det m
-          d2 = det' m * det q
-          det' m = product $ toList $ takeDiag r
+          d2 = det' * det q
+          det' = product $ toList $ takeDiag r
           (q,r) = qr m
           s x = fromList [x]
 
@@ -147,10 +146,10 @@ schurProp2 m = m |~| u <> s <> ctrans u && unitary u && upperHessenberg s -- fix
 
 cholProp m = m |~| ctrans c <> c && upperTriang c
     where c = chol m
-          pos = positiveDefinite m
+          -- pos = positiveDefinite m
 
 expmDiagProp m = expm (logm m) :~ 7 ~: complex m
-    where logm m = matFunc log m
+    where logm = matFunc log
 
 multProp1 (a,b) = a <> b |~| mulH a b