fix static blocks, GMatrix

1 files changed, 5 insertions, 8 deletions

diff --git a/packages/base/src/Numeric/Sparse.hs b/packages/base/src/Numeric/Sparse.hs
index 3c19c93..1b8a7b3 100644
--- a/packages/base/src/Numeric/Sparse.hs
+++ b/packages/base/src/Numeric/Sparse.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 
 module Numeric.Sparse(
-    GMatrix, CSR(..), mkCSR,
+    GMatrix(..), CSR(..), mkCSR, fromCSR,
     mkSparse, mkDiagR, mkDense,
     AssocMatrix,
     toDense,
@@ -95,9 +95,11 @@ mkDense m = Dense{..}
     nRows = rows m
     nCols = cols m
 
+mkSparse :: AssocMatrix -> GMatrix
+mkSparse = fromCSR . mkCSR
 
-mkSparse :: CSR -> GMatrix
-mkSparse csr = SparseR {..}
+fromCSR :: CSR -> GMatrix
+fromCSR csr = SparseR {..}
   where
     gmCSR @ CSR {..} = csr
     nRows = csrNRows
@@ -149,11 +151,6 @@ infixr 8 !#>
 (!#>) :: GMatrix -> Vector Double -> Vector Double
 (!#>) = gmXv
 
-
-instance Contraction GMatrix (Vector Double) (Vector Double)
-  where
-    contraction = gmXv
-
 --------------------------------------------------------------------------------
 
 foreign import ccall unsafe "smXv"