minor changes

6 files changed, 22 insertions, 28 deletions

diff --git a/examples/oldtests.hs b/examples/oldtests.hs
index f60f4e2..7d4701c 100644
--- a/examples/oldtests.hs
+++ b/examples/oldtests.hs
@@ -1,5 +1,6 @@
 import Test.HUnit
-import GSLHaskell
+import LinearAlgebra
+import GSL hiding (exp)
 import System.Random(randomRs,mkStdGen)
 
 realMatrix = fromLists :: [[Double]] -> Matrix Double
@@ -8,7 +9,7 @@ realVector = fromList ::  [Double] -> Vector Double
 
 
 infixl 2 =~=
-a =~= b = pnorm 1 (flatten (a - b)) < 1E-6
+a =~= b = pnorm PNorm1 (flatten (a - b)) < 1E-6
 
 randomMatrix seed (n,m) = reshape m $ realVector $ take (n*m) $ randomRs (-100,100) $ mkStdGen seed 
 
diff --git a/examples/tests.hs b/examples/tests.hs
index f352b71..dcc3cbf 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -7,25 +7,14 @@
 -----------------------------------------------------------------------------
 
 import Data.Packed.Internal((>|<), fdat, cdat, multiply', multiplyG, MatrixOrder(..))
-import Data.Packed.Vector
-import Data.Packed.Matrix
-import GSL.Vector
-import GSL.Integration
-import GSL.Differentiation
-import GSL.Special hiding (choose, multiply, exp)
-import GSL.Fourier
-import GSL.Polynomials
-import LAPACK
+import GSL hiding (sin,cos,exp,choose)
+import LinearAlgebra hiding ((<>))
 import Test.QuickCheck
 import Test.HUnit hiding ((~:))
-import Complex
-import LinearAlgebra.Algorithms
-import LinearAlgebra.Linear hiding ((<>))
-import GSL.Matrix
-import GSLHaskell hiding ((<>),constant)
+
 
 dist :: (Normed t, Num t) => t -> t -> Double
-dist a b = norm (a-b)
+dist a b = pnorm Infinity (a-b)
 
 infixl 4 |~|
 a |~| b = a :~8~: b
@@ -280,15 +269,17 @@ integrateTest = assertBool "integrate" (abs (volSphere 2.5 - 4/3*pi*2.5^3) < eps
 
 ---------------------------------------------------------------------
 
-arit1 u = vectorMapValR PowVS 2 (vectorMapR Sin u)
-          `add` vectorMapValR PowVS 2 (vectorMapR Cos u)
-          |~| constant 1 (dim u)
+arit1 u = sin u ^ 2 + cos u ^ 2 |~| 1
+    where _ = u :: Vector Double
 
-arit2 u = (vectorMapR Cos u) `mul` (vectorMapR Tan u)
-          |~| vectorMapR Sin u
+arit2 u = sin u ** 2 + cos u ** 2 |~| 1
+    where _ = u :: Vector Double
 
+arit3 u = cos u * tan u |~| sin u
+    where _ = u :: Vector Double
 
--- arit3 (PairV u v) =
+arit4 u = (cos u * tan u) :~6~: sin u
+    where _ = u :: Vector (Complex Double)
 
 ---------------------------------------------------------------------
 
@@ -347,6 +338,8 @@ main = do
     putStrLn "--------- VEC OPER ------"
     quickCheck arit1
     quickCheck arit2
+    quickCheck arit3
+    quickCheck arit4
     putStrLn "--------- GSL ------"
     runTestTT tests
     quickCheck $ \v -> ifft (fft v) |~| v
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 951cec6..63ebddf 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -349,7 +349,7 @@ foreign import ccall safe "aux.h constantC"
 @> constant 2 7
 7 |> [2.0,2.0,2.0,2.0,2.0,2.0,2.0]@
 -}
-constant :: Double -> Int -> Vector Double
+constant :: Field a => a -> Int -> Vector a
 constant = constantD
 
 --------------------------------------------------------------------------
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 5a4b919..404fde7 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -27,7 +27,7 @@ module Data.Packed.Matrix (
     subMatrix, takeRows, dropRows, takeColumns, dropColumns,
     ident, diag, diagRect, takeDiag,
     liftMatrix, liftMatrix2,
-    dispR, readMatrix, fromArray2D
+    format, dispR, readMatrix, fromArray2D
 ) where
 
 import Data.Packed.Internal
@@ -95,7 +95,7 @@ takeDiag :: (Field t) => Matrix t -> Vector t
 takeDiag m = fromList [cdat m `at` (k*cols m+k) | k <- [0 .. min (rows m) (cols m) -1]]
 
 -- | creates the identity matrix of given dimension
-ident :: Int -> Matrix Double
+ident :: Field a => Int -> Matrix a
 ident n = diag (constant 1 n)
 
 ------------------------------------------------------------
diff --git a/lib/GSL/gsl-aux.c b/lib/GSL/gsl-aux.c
index c2839a8..0e8406c 100644
--- a/lib/GSL/gsl-aux.c
+++ b/lib/GSL/gsl-aux.c
@@ -229,7 +229,7 @@ int mapValCAux(int code, gsl_complex* pval, KGCVEC(x), GCVEC(r)) {
         OPV(2,gsl_complex_add(val,xp[k]))
         OPV(3,gsl_complex_sub(val,xp[k]))
         OPV(4,gsl_complex_pow(val,xp[k]))
-        OPV(5,gsl_complex_pow(val,xp[k]))
+        OPV(5,gsl_complex_pow(xp[k],val))
         default: ERROR(BAD_CODE);
     }
 }
diff --git a/lib/LinearAlgebra/Interface.hs b/lib/LinearAlgebra/Interface.hs
index 7d6ff0f..0d2c0a0 100644
--- a/lib/LinearAlgebra/Interface.hs
+++ b/lib/LinearAlgebra/Interface.hs
@@ -47,7 +47,7 @@ infixl 7 <.>
 
 ----------------------------------------------------
 
--- | @x .* a = scale (recip x) v@
+-- | @x .* a = scale x a@
 (.*) :: (Linear c a) => a -> c a -> c a
 infixl 7 .*
 a .* x = scale a x