vector norms moved to Vectors

1 files changed, 1 insertions, 54 deletions

diff --git a/lib/Numeric/LinearAlgebra/Interface.hs b/lib/Numeric/LinearAlgebra/Interface.hs
index ec08694..13d175b 100644
--- a/lib/Numeric/LinearAlgebra/Interface.hs
+++ b/lib/Numeric/LinearAlgebra/Interface.hs
@@ -19,7 +19,7 @@ In the context of the standard numeric operators, one-component vectors and matr
 -----------------------------------------------------------------------------
 
 module Numeric.LinearAlgebra.Interface(
-    (<>),(<.>),mulG, Adapt, adaptElements,
+    (<>),(<.>),
     (<\>),
     (.*),(*/),
     (<|>),(<->),
@@ -29,28 +29,20 @@ import Data.Packed.Vector
 import Data.Packed.Matrix
 import Numeric.LinearAlgebra.Algorithms
 import Numeric.LinearAlgebra.Linear
-import Data.Complex
-import Control.Arrow((***))
-
---import Numeric.GSL.Vector
 
 class Mul a b c | a b -> c where
  infixl 7 <>
  -- | Matrix-matrix, matrix-vector, and vector-matrix products.
  (<>)  :: Product t => a t -> b t -> c t
- mulG :: (Element r, Element s, Adapt r s t t, Product t) => a r -> b s -> c t
 
 instance Mul Matrix Matrix Matrix where
     (<>) = mXm
-    mulG a b = uncurry mXm (curry adapt a b)
 
 instance Mul Matrix Vector Vector where
     (<>) m v = flatten $ m <> (asColumn v)
-    mulG m v = flatten $ m `mulG` (asColumn v)
 
 instance Mul Vector Matrix Vector where
     (<>) v m = flatten $ (asRow v) <> m
-    mulG v m = flatten $ (asRow v) `mulG` m
 
 ---------------------------------------------------
 
@@ -124,48 +116,3 @@ a <|> b = joinH a b
 -- -- | Vertical concatenation of matrices and vectors.
 -- (<->) :: (Element t, Joinable a b) => a t -> b t -> Matrix t
 a <-> b = joinV a b
-
-----------------------------------------------------
-
-class Adapt a b c d | a b -> c, a b -> d where
-    adapt :: Container k => (k a, k b) -> (k c, k d) 
-
---instance Adapt a a a a where
---    adapt = id *** id
-
-instance Adapt Float Float Float Float where
-    adapt = id *** id
-
-instance Adapt Double Double Double Double where
-    adapt = id *** id
-
-instance Adapt (Complex Float) (Complex Float) (Complex Float) (Complex Float) where
-    adapt = id *** id
-
-instance Adapt Float Double Double Double where
-    adapt = double *** id
-
-instance Adapt Double Float Double Double where
-    adapt = id *** double
-
-instance Adapt Float (Complex Float) (Complex Float) (Complex Float) where
-    adapt = complex *** id
-
-instance Adapt (Complex Float) Float (Complex Float) (Complex Float) where
-    adapt = id *** complex
-
-instance (Convert a, Convert (DoubleOf a), ComplexOf (DoubleOf a) ~ Complex Double) => Adapt a (Complex Double) (Complex Double) (Complex Double) where
-    adapt = complex.double *** id
-
-instance (Convert a, Convert (DoubleOf a), ComplexOf (DoubleOf a) ~ Complex Double) => Adapt (Complex Double) a (Complex Double) (Complex Double) where
-    adapt = id *** complex.double
-
-instance Adapt Double (Complex Float) (Complex Double) (Complex Double) where
-    adapt = complex *** double
-
-instance Adapt (Complex Float) Double (Complex Double) (Complex Double) where
-    adapt = double *** complex
-
-adaptElements:: (Adapt a b c d, Container k) => (k a, k b) -> (k c, k d)
-adaptElements p = adapt p
-