diff options
author | Joe Crayne <joe@jerkface.net> | 2019-08-08 02:22:30 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-08-08 22:47:46 -0400 |
commit | badcbdfddc4be31fc79a6df4553795af18069efe (patch) | |
tree | 90c38bd8793b53a5e6f00049eb78acaa8d88d711 /packages/base/src/Internal/Sparse.hs | |
parent | d844a145f2e8808c9f75cd99c673d5f5c8960bf2 (diff) |
Removed the Element class.tower
Diffstat (limited to 'packages/base/src/Internal/Sparse.hs')
-rw-r--r-- | packages/base/src/Internal/Sparse.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/base/src/Internal/Sparse.hs b/packages/base/src/Internal/Sparse.hs index fbea11a..423b169 100644 --- a/packages/base/src/Internal/Sparse.hs +++ b/packages/base/src/Internal/Sparse.hs | |||
@@ -20,7 +20,7 @@ import Data.Function(on) | |||
20 | import Control.Arrow((***)) | 20 | import Control.Arrow((***)) |
21 | import Control.Monad(when) | 21 | import Control.Monad(when) |
22 | import Data.List(groupBy, sort) | 22 | import Data.List(groupBy, sort) |
23 | import Foreign.C.Types(CInt(..)) | 23 | import Data.Int |
24 | 24 | ||
25 | import Internal.Devel | 25 | import Internal.Devel |
26 | import System.IO.Unsafe(unsafePerformIO) | 26 | import System.IO.Unsafe(unsafePerformIO) |
@@ -34,16 +34,16 @@ type AssocMatrix = [((Int,Int),Double)] | |||
34 | 34 | ||
35 | data CSR = CSR | 35 | data CSR = CSR |
36 | { csrVals :: Vector Double | 36 | { csrVals :: Vector Double |
37 | , csrCols :: Vector CInt | 37 | , csrCols :: Vector Int32 |
38 | , csrRows :: Vector CInt | 38 | , csrRows :: Vector Int32 |
39 | , csrNRows :: Int | 39 | , csrNRows :: Int |
40 | , csrNCols :: Int | 40 | , csrNCols :: Int |
41 | } deriving Show | 41 | } deriving Show |
42 | 42 | ||
43 | data CSC = CSC | 43 | data CSC = CSC |
44 | { cscVals :: Vector Double | 44 | { cscVals :: Vector Double |
45 | , cscRows :: Vector CInt | 45 | , cscRows :: Vector Int32 |
46 | , cscCols :: Vector CInt | 46 | , cscCols :: Vector Int32 |
47 | , cscNRows :: Int | 47 | , cscNRows :: Int |
48 | , cscNCols :: Int | 48 | , cscNCols :: Int |
49 | } deriving Show | 49 | } deriving Show |
@@ -138,9 +138,9 @@ mkDiagR r c v | |||
138 | diagVals = v | 138 | diagVals = v |
139 | 139 | ||
140 | 140 | ||
141 | type IV t = CInt -> Ptr CInt -> t | 141 | type IV t = Int32 -> Ptr Int32 -> t |
142 | type V t = CInt -> Ptr Double -> t | 142 | type V t = Int32 -> Ptr Double -> t |
143 | type SMxV = V (IV (IV (V (V (IO CInt))))) | 143 | type SMxV = V (IV (IV (V (V (IO Int32))))) |
144 | 144 | ||
145 | gmXv :: GMatrix -> Vector Double -> Vector Double | 145 | gmXv :: GMatrix -> Vector Double -> Vector Double |
146 | gmXv SparseR { gmCSR = CSR{..}, .. } v = unsafePerformIO $ do | 146 | gmXv SparseR { gmCSR = CSR{..}, .. } v = unsafePerformIO $ do |