multiplyI

2 files changed, 18 insertions, 3 deletions

diff --git a/packages/base/src/Data/Packed/Internal/Numeric.hs b/packages/base/src/Data/Packed/Internal/Numeric.hs
index 354863f..2e36de2 100644
--- a/packages/base/src/Data/Packed/Internal/Numeric.hs
+++ b/packages/base/src/Data/Packed/Internal/Numeric.hs
@@ -50,7 +50,7 @@ import Data.Packed.Development
 import Numeric.Vectorized
 import Data.Complex
 
-import Numeric.LinearAlgebra.LAPACK(multiplyR,multiplyC,multiplyF,multiplyQ)
+import Numeric.LinearAlgebra.LAPACK(multiplyR,multiplyC,multiplyF,multiplyQ,multiplyI)
 import Data.Packed.Internal
 import Foreign.C.Types(CInt)
 import Text.Printf(printf)
@@ -540,7 +540,7 @@ class (Num e, Element e) => Product e where
     -- | sum of absolute value of elements
     norm1      :: Vector e -> RealOf e
     -- | euclidean norm
-    norm2      :: Vector e -> RealOf e
+    norm2      :: Floating e => Vector e -> RealOf e
     -- | element of maximum magnitude
     normInf    :: Vector e -> RealOf e
 
@@ -572,6 +572,14 @@ instance Product (Complex Double) where
     normInf    = emptyVal (maxElement . fst . fromComplex . vectorMapC Abs)
     multiply   = emptyMul multiplyC
 
+instance Product CInt where
+    norm2      = undefined
+--    absSum     = emptyVal (toScalarF AbsSum)
+--    norm1      = emptyVal (toScalarF AbsSum)
+--    normInf    = emptyVal (maxElement . vectorMapF Abs)
+    multiply   = emptyMul multiplyI
+
+
 emptyMul m a b
     | x1 == 0 && x2 == 0 || r == 0 || c == 0 = konst' 0 (r,c)
     | otherwise = m a b
@@ -706,6 +714,8 @@ type instance RealOf (Complex Double) = Double
 type instance RealOf Float = Float
 type instance RealOf (Complex Float) = Float
 
+type instance RealOf CInt = CInt
+
 type family ComplexOf x
 
 type instance ComplexOf Double = Complex Double
diff --git a/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs b/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs
index d96e14f..219d996 100644
--- a/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/LAPACK.hs
@@ -14,7 +14,7 @@
 
 module Numeric.LinearAlgebra.LAPACK (
     -- * Matrix product
-    multiplyR, multiplyC, multiplyF, multiplyQ,
+    multiplyR, multiplyC, multiplyF, multiplyQ, multiplyI,
     -- * Linear systems
     linearSolveR, linearSolveC,
     mbLinearSolveR, mbLinearSolveC,
@@ -58,6 +58,7 @@ foreign import ccall unsafe "multiplyR" dgemmc :: CInt -> CInt -> TMMM
 foreign import ccall unsafe "multiplyC" zgemmc :: CInt -> CInt -> TCMCMCM
 foreign import ccall unsafe "multiplyF" sgemmc :: CInt -> CInt -> TFMFMFM
 foreign import ccall unsafe "multiplyQ" cgemmc :: CInt -> CInt -> TQMQMQM
+foreign import ccall unsafe "multiplyI" c_multiplyI :: CInt -> CInt -> (CM CInt (CM CInt (CM CInt (IO CInt))))
 
 isT Matrix{order = ColumnMajor} = 0
 isT Matrix{order = RowMajor} = 1
@@ -88,6 +89,10 @@ multiplyF a b = multiplyAux sgemmc "sgemmc" a b
 multiplyQ :: Matrix (Complex Float) -> Matrix (Complex Float) -> Matrix (Complex Float)
 multiplyQ a b = multiplyAux cgemmc "cgemmc" a b
 
+multiplyI :: Matrix CInt -> Matrix CInt -> Matrix CInt
+multiplyI = multiplyAux c_multiplyI "c_multiplyI"
+
+
 -----------------------------------------------------------------------------
 foreign import ccall unsafe "svd_l_R" dgesvd :: TMMVM
 foreign import ccall unsafe "svd_l_C" zgesvd :: TCMCMVCM