deprecate .* and */

5 files changed, 13 insertions, 9 deletions

diff --git a/examples/lie.hs b/examples/lie.hs
index 87f7ed1..db21ea8 100644
--- a/examples/lie.hs
+++ b/examples/lie.hs
@@ -1,9 +1,8 @@
 -- The magic of Lie Algebra
 
 import Numeric.LinearAlgebra
-import Text.Printf(printf)
 
-disp = putStrLn . format "  " (printf "%.5f")
+disp = putStrLn . dispf 5
 
 rot1 :: Double -> Matrix Double
 rot1 a = (3><3)
@@ -50,14 +49,14 @@ infix 8 &
 a & b = a <> b - b <> a
 
 infixl 6 |+|
-a |+| b = a + b + a & b */2  + (a-b) & (a & b) */12
+a |+| b = a + b + a&b /2  + (a-b)&(a & b) /12
 
 main = do
    let a =  45*deg
        b =  50*deg
        c = -30*deg
        exact = rot3 a <> rot1 b <> rot2 c
-       lie = a.*g3 |+| b.*g1 |+| c.*g2
+       lie = scalar a * g3 |+| scalar b * g1 |+| scalar c * g2
    putStrLn "position in the tangent space:"
    disp lie
    putStrLn "exponential map back to the group (2 terms):"
diff --git a/lib/Data/Packed/Random.hs b/lib/Data/Packed/Random.hs
index a6145be..fea3cdd 100644
--- a/lib/Data/Packed/Random.hs
+++ b/lib/Data/Packed/Random.hs
@@ -21,6 +21,7 @@ module Data.Packed.Random (
 
 import Numeric.GSL.Vector
 import Data.Packed
+import Numeric.LinearAlgebra.Linear
 import Numeric.LinearAlgebra.Algorithms
 import Numeric.LinearAlgebra.Instances()
 import Numeric.LinearAlgebra.Interface
@@ -54,7 +55,7 @@ uniformSample seed n rgs = m where
     d = dim a
     dat = toRows $ reshape n $ randomVector seed Uniform (n*d)
     am = constant 1 n `outer` a
-    m = fromColumns (zipWith (.*) cs dat) + am
+    m = fromColumns (zipWith scale cs dat) + am
 
 ------------ utilities -------------------------------
 
diff --git a/lib/Numeric/LinearAlgebra/Interface.hs b/lib/Numeric/LinearAlgebra/Interface.hs
index 0ae9698..509b91c 100644
--- a/lib/Numeric/LinearAlgebra/Interface.hs
+++ b/lib/Numeric/LinearAlgebra/Interface.hs
@@ -49,6 +49,8 @@ infixl 7 <.>
 
 ----------------------------------------------------
 
+{-# DEPRECATED (.*) "use scale a x or scalar a * x" #-}
+
 -- | @x .* a = scale x a@
 (.*) :: (Linear c a) => a -> c a -> c a
 infixl 7 .*
@@ -56,6 +58,8 @@ a .* x = scale a x
 
 ----------------------------------------------------
 
+{-# DEPRECATED (*/) "use scale (recip a) x or x / scalar a" #-}
+
 -- | @a *\/ x = scale (recip x) a@
 (*/) :: (Linear c a) => c a -> a -> c a
 infixl 7 */
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index 063ae86..c1dae4a 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -262,8 +262,8 @@ runTests n = do
         , utest "expm1" (expmTest1)
         , utest "expm2" (expmTest2)
         , utest "arith1" $ ((ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| (49 :: RM)
-        , utest "arith2" $ (((1+i) .* ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| ( (140*i-51).*1 :: CM)
-        , utest "arith3" $ exp (i.*ones(10,10)*pi) + 1 |~| 0
+        , utest "arith2" $ ((scalar (1+i) * ones (100,100) * 5 + 2)/0.5 - 7)**2 |~| ( scalar (140*i-51) :: CM)
+        , utest "arith3" $ exp (scalar i * ones(10,10)*pi) + 1 |~| 0
         , utest "<\\>"   $ (3><2) [2,0,0,3,1,1::Double] <\> 3|>[4,9,5] |~| 2|>[2,3]
         , utest "gamma" (gamma 5 == 24.0)
         , besselTest
@@ -282,7 +282,7 @@ runTests n = do
         ]
     return ()
 
-makeUnitary v | realPart n > 1    = v */ n
+makeUnitary v | realPart n > 1    = v / scalar n
               | otherwise = v
     where n = sqrt (conj v <.> v)
 
diff --git a/lib/Numeric/LinearAlgebra/Tests/Instances.hs b/lib/Numeric/LinearAlgebra/Tests/Instances.hs
index 4995e39..d0adfba 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Instances.hs
+++ b/lib/Numeric/LinearAlgebra/Tests/Instances.hs
@@ -180,7 +180,7 @@ instance (Field a, Arbitrary a, Num (Vector a)) => Arbitrary (PosDef a) where
         l <- replicateM n (choose (0,100))
         let s = diag (fromList l)
             p = v <> real s <> ctrans v
-        return $ PosDef (0.5 .* p + 0.5 .* ctrans p)
+        return $ PosDef (0.5 * p + 0.5 * ctrans p)
 
 #if MIN_VERSION_QuickCheck(2,0,0)
 #else