minor changes

2 files changed, 17 insertions, 23 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