X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FLinear%2FMatrix.hs;h=8490b229921becb127a7a299be47efd16ddec7e4;hb=4bd7e17d1c9315e30881ad697371640acbfa1fb5;hp=dbd321fefc6e076ade9344495ddfd1c6bd26858c;hpb=c22f72ffaa4edec587b28a7c22aa07330349fd73;p=numerical-analysis.git diff --git a/src/Linear/Matrix.hs b/src/Linear/Matrix.hs index dbd321f..8490b22 100644 --- a/src/Linear/Matrix.hs +++ b/src/Linear/Matrix.hs @@ -17,6 +17,7 @@ where import Data.List (intercalate) import Data.Vector.Fixed ( + (!), N1, N2, N3, @@ -42,7 +43,7 @@ import qualified Data.Vector.Fixed as V ( zipWith ) import Data.Vector.Fixed.Boxed (Vec) -import Data.Vector.Fixed.Internal (Arity, arity) +import Data.Vector.Fixed.Internal.Arity (Arity, arity) import Linear.Vector import Normed @@ -416,9 +417,8 @@ instance (Ring.C a, Arity m, Arity n) => Module.C a (Mat m n a) where instance (Algebraic.C a, ToRational.C a, - Arity m, - Arity n) - => Normed (Mat (S m) (S n) a) where + Arity m) + => Normed (Mat (S m) N1 a) where -- | Generic p-norms. The usual norm in R^n is (norm_p 2). We treat -- all matrices as big vectors. --