make Numeric superclass of Field

4 files changed, 43 insertions, 46 deletions

diff --git a/packages/base/src/Internal/Algorithms.hs b/packages/base/src/Internal/Algorithms.hs
index 99c90aa..3d25491 100644
--- a/packages/base/src/Internal/Algorithms.hs
+++ b/packages/base/src/Internal/Algorithms.hs
@@ -38,14 +38,11 @@ import Internal.Vectorized(range)
 (Single precision data can be converted using 'single' and 'double').
 
 -}
-class (Product t,
+class (Numeric t,
        Convert t,
-       Container Vector t,
-       Container Matrix t,
        Normed Matrix t,
        Normed Vector t,
        Floating t,
-       CTrans t,
        RealOf t ~ Double) => Field t where
     svd'         :: Matrix t -> (Matrix t, Vector Double, Matrix t)
     thinSVD'     :: Matrix t -> (Matrix t, Vector Double, Matrix t)
diff --git a/packages/base/src/Internal/Container.hs b/packages/base/src/Internal/Container.hs
index 307c6a8..b08f892 100644
--- a/packages/base/src/Internal/Container.hs
+++ b/packages/base/src/Internal/Container.hs
@@ -28,7 +28,6 @@ import Internal.Vector
 import Internal.Matrix
 import Internal.Element
 import Internal.Numeric
-import Data.Complex
 import Internal.Algorithms(Field,linearSolveSVD)
 
 ------------------------------------------------------------------
@@ -158,29 +157,6 @@ instance LSDiv Matrix
 
 --------------------------------------------------------------------------------
 
-class Konst e d c | d -> c, c -> d
-  where
-    -- |
-    -- >>> konst 7 3 :: Vector Float
-    -- fromList [7.0,7.0,7.0]
-    --
-    -- >>> konst i (3::Int,4::Int)
-    -- (3><4)
-    --  [ 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0
-    --  , 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0
-    --  , 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0 ]
-    --
-    konst :: e -> d -> c e
-
-instance Container Vector e => Konst e Int Vector
-  where
-    konst = konst'
-
-instance (Num e, Container Vector e) => Konst e (Int,Int) Matrix
-  where
-    konst = konst'
-
---------------------------------------------------------------------------------
 
 class Build d f c e | d -> c, c -> d, f -> e, f -> d, f -> c, c e -> f, d e -> f
   where
@@ -241,23 +217,6 @@ meanCov x = (med,cov) where
 
 --------------------------------------------------------------------------------
 
-class ( Container Vector t
-      , Container Matrix t
-      , Konst t Int Vector
-      , Konst t (Int,Int) Matrix
-      , CTrans t
-      , Product t
-      ) => Numeric t
-
-instance Numeric Double
-instance Numeric (Complex Double)
-instance Numeric Float
-instance Numeric (Complex Float)
-instance Numeric I
-instance Numeric Z
-
---------------------------------------------------------------------------------
-
 sortVector :: (Ord t, Element t) => Vector t -> Vector t
 sortVector = sortV
 
diff --git a/packages/base/src/Internal/Numeric.hs b/packages/base/src/Internal/Numeric.hs
index 4d34885..a8ae2bb 100644
--- a/packages/base/src/Internal/Numeric.hs
+++ b/packages/base/src/Internal/Numeric.hs
@@ -549,6 +549,48 @@ accum
     -> c e              -- ^ result
 accum = accum'
 
+--------------------------------------------------------------------------------
+
+class Konst e d c | d -> c, c -> d
+  where
+    -- |
+    -- >>> konst 7 3 :: Vector Float
+    -- fromList [7.0,7.0,7.0]
+    --
+    -- >>> konst i (3::Int,4::Int)
+    -- (3><4)
+    --  [ 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0
+    --  , 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0
+    --  , 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0, 0.0 :+ 1.0 ]
+    --
+    konst :: e -> d -> c e
+
+instance Container Vector e => Konst e Int Vector
+  where
+    konst = konst'
+
+instance (Num e, Container Vector e) => Konst e (Int,Int) Matrix
+  where
+    konst = konst'
+
+--------------------------------------------------------------------------------
+
+class ( Container Vector t
+      , Container Matrix t
+      , Konst t Int Vector
+      , Konst t (Int,Int) Matrix
+      , CTrans t
+      , Product t
+      ) => Numeric t
+
+instance Numeric Double
+instance Numeric (Complex Double)
+instance Numeric Float
+instance Numeric (Complex Float)
+instance Numeric I
+instance Numeric Z
+
+--------------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
 
diff --git a/packages/base/src/Internal/Sparse.hs b/packages/base/src/Internal/Sparse.hs
index eb4ee1b..1604e7e 100644
--- a/packages/base/src/Internal/Sparse.hs
+++ b/packages/base/src/Internal/Sparse.hs
@@ -13,7 +13,6 @@ module Internal.Sparse(
 import Internal.Vector
 import Internal.Matrix
 import Internal.Numeric
-import Internal.Container
 import qualified Data.Vector.Storable as V
 import Data.Function(on)
 import Control.Arrow((***))