From 8878aaaf649962f4360a94109a674da756ad2202 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Thu, 8 Jan 2015 13:54:23 +0100 Subject: update base to ghc-7.10 --- packages/base/src/Numeric/LinearAlgebra/Util/CG.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/base/src/Numeric/LinearAlgebra/Util') diff --git a/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs b/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs index b82c74f..899a5bf 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Util/CG.hs @@ -9,7 +9,7 @@ module Numeric.LinearAlgebra.Util.CG( import Data.Packed.Numeric import Numeric.Sparse import Numeric.Vector() -import Numeric.LinearAlgebra.Algorithms(linearSolveLS, relativeError, NormType(..)) +import Numeric.LinearAlgebra.Algorithms(linearSolveLS, relativeError, pnorm, NormType(..)) import Control.Arrow((***)) {- @@ -142,13 +142,13 @@ instance Testable GMatrix print s3; print d3 print s4; print d4 print s5; print d5 - print $ relativeError Infinity s5 d5 + print $ relativeError (pnorm Infinity) s5 d5 ok = s1==d1 && s2==d2 && s3==d3 && s4==d4 - && relativeError Infinity s5 d5 < 1E-10 + && relativeError (pnorm Infinity) s5 d5 < 1E-10 disp = putStr . dispf 2 -- cgit v1.2.3