From 5b6de561f131d75049fdb999e98a07939ec2e8e7 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Sat, 24 May 2014 13:32:58 +0200 Subject: backward compatibility --- packages/tests/src/Numeric/LinearAlgebra/Tests.hs | 8 ++++---- packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs | 2 +- packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/tests/src/Numeric') diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs index 5fdc5af..3803f3b 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs @@ -24,8 +24,8 @@ module Numeric.LinearAlgebra.Tests( --, runBigTests ) where ---import Data.Packed.Random import Numeric.LinearAlgebra +import Numeric.HMatrix import Numeric.LinearAlgebra.Util(col,row) import Data.Packed import Numeric.LinearAlgebra.LAPACK @@ -56,8 +56,8 @@ import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector import Test.QuickCheck.Test(isSuccess) -eps = peps :: Double -i = 0:+1 :: Complex Double +--eps = peps :: Double +--i = 0:+1 :: Complex Double qCheck n x = do r <- quickCheckWithResult stdArgs {maxSize = n} x @@ -760,7 +760,7 @@ mkVecBench = do subBench = do putStrLn "" let g = foldl1' (.) (replicate (10^5) (\v -> subVector 1 (dim v -1) v)) - time "0.1M subVector " (g (constant 1 (1+10^5) :: Vector Double) @> 0) + time "0.1M subVector " (g (konst 1 (1+10^5) :: Vector Double) @> 0) let f = foldl1' (.) (replicate (10^5) (fromRows.toRows)) time "subVector-join 3" (f (ident 3 :: Matrix Double) @@>(0,0)) time "subVector-join 10" (f (ident 10 :: Matrix Double) @@>(0,0)) diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs index 4f5a5d2..b306f94 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs @@ -30,7 +30,7 @@ import System.Random import Numeric.LinearAlgebra import Numeric.LinearAlgebra.Devel -import Numeric.Container hiding (Testable) +import Numeric.Container import Control.Monad(replicateM) import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector ,sized,classify,Testable,Property diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs index 423edaa..f4f1b89 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs @@ -43,7 +43,7 @@ module Numeric.LinearAlgebra.Tests.Properties ( linearSolveProp, linearSolveProp2 ) where -import Numeric.Container hiding (Testable) +import Numeric.Container import Numeric.LinearAlgebra --hiding (real,complex) import Numeric.LinearAlgebra.LAPACK import Debug.Trace -- cgit v1.2.3