diff options
Diffstat (limited to 'lib/Numeric')
-rw-r--r-- | lib/Numeric/Container.hs | 10 | ||||
-rw-r--r-- | lib/Numeric/HMatrix.hs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs index dea8a79..7e46147 100644 --- a/lib/Numeric/Container.hs +++ b/lib/Numeric/Container.hs | |||
@@ -38,7 +38,7 @@ module Numeric.Container ( | |||
38 | -- * Matrix product | 38 | -- * Matrix product |
39 | Product(..), udot, | 39 | Product(..), udot, |
40 | Mul(..), | 40 | Mul(..), |
41 | Contraction(..), mmul, | 41 | Contraction(..), |
42 | optimiseMult, | 42 | optimiseMult, |
43 | mXm,mXv,vXm,LSDiv(..), cdot, (·), dot, (<.>), | 43 | mXm,mXv,vXm,LSDiv(..), cdot, (·), dot, (<.>), |
44 | outer, kronecker, | 44 | outer, kronecker, |
@@ -296,8 +296,8 @@ meanCov x = (med,cov) where | |||
296 | dot :: Product e => Vector e -> Vector e -> e | 296 | dot :: Product e => Vector e -> Vector e -> e |
297 | dot = udot | 297 | dot = udot |
298 | 298 | ||
299 | {-# DEPRECATED (<.>) "use udot or (×)" #-} | 299 | -- | contraction operator, equivalent to (x) |
300 | infixl 7 <.> | 300 | infixr 7 <.> |
301 | (<.>) :: Product e => Vector e -> Vector e -> e | 301 | (<.>) :: Contraction a b c => a -> b -> c |
302 | (<.>) = udot | 302 | (<.>) = (×) |
303 | 303 | ||
diff --git a/lib/Numeric/HMatrix.hs b/lib/Numeric/HMatrix.hs index 09ad518..2e01454 100644 --- a/lib/Numeric/HMatrix.hs +++ b/lib/Numeric/HMatrix.hs | |||
@@ -123,7 +123,7 @@ module Numeric.HMatrix ( | |||
123 | rand, randn, RandDist(..), randomVector, gaussianSample, uniformSample, | 123 | rand, randn, RandDist(..), randomVector, gaussianSample, uniformSample, |
124 | 124 | ||
125 | -- * Misc | 125 | -- * Misc |
126 | meanCov, peps, relativeError, haussholder, optimiseMult, udot, cdot, mmul | 126 | meanCov, peps, relativeError, haussholder, optimiseMult, udot, cdot, (<.>) |
127 | ) where | 127 | ) where |
128 | 128 | ||
129 | import Numeric.HMatrix.Data | 129 | import Numeric.HMatrix.Data |