refactoring norms

1 files changed, 17 insertions, 23 deletions

diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 9059723..2855a90 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -21,7 +21,7 @@
 module Data.Packed.Matrix (
     Element, RealElement, Container(..),
     Convert(..), RealOf, ComplexOf, SingleOf, DoubleOf, ElementOf,
-    Precision(..), comp, real'', complex'',
+    Precision(..), comp,
     AutoReal(..),
     Matrix,rows,cols,
     (><),
@@ -485,7 +485,10 @@ instance Precision (Complex Float) (Complex Double) where
     float2DoubleG = asComplex . float2DoubleV . asReal
 
 -- | Supported real types
-class (Element t, Element (Complex t), RealFloat t) => RealElement t
+class (Element t, Element (Complex t), RealFloat t
+--       , RealOf t ~ t, RealOf (Complex t) ~ t
+       )
+       => RealElement t
 
 instance RealElement Double
 
@@ -501,6 +504,8 @@ class Container c where
     single'      :: Precision a b => c b -> c a
     double'      :: Precision a b => c a -> c b
 
+comp x = complex' x
+
 instance Container Vector where
     toComplex = toComplexV
     fromComplex = fromComplexV
@@ -592,34 +597,23 @@ instance Convert (Complex Float) where
 
 -------------------------------------------------------------------
 
-
 -- | to be replaced by Convert
 class Convert t => AutoReal t where
-    real''' :: Container c => c Double -> c t
-    complex''' :: Container c => c t -> c (Complex Double)
+    real'' :: Container c => c Double -> c t
+    complex'' :: Container c => c t -> c (Complex Double)
 
 instance AutoReal Double where
-    real''' = real
-    complex''' = complex
+    real'' = real
+    complex'' = complex
 
 instance AutoReal (Complex Double) where
-    real''' = real
-    complex''' = complex
+    real'' = real
+    complex'' = complex
 
 instance AutoReal Float where
-    real''' = real . single
-    complex''' = double . complex
+    real'' = real . single
+    complex'' = double . complex
 
 instance AutoReal (Complex Float) where
-    real''' = real . single
-    complex''' = double . complex
-
-
-comp x = complex' x
-
--- complex'' x = double (complex x)
--- real'' x = real (single x)
-
-real'' x = real''' x
-complex'' x = complex''' x
-
+    real'' = real . single
+    complex'' = double . complex