From 27c1c4c1b4acd6ccfb53cfef5687bfda1b99d81c Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Wed, 15 Apr 2015 19:53:15 +0200 Subject: remove Util --- packages/tests/src/Numeric/LinearAlgebra/Tests.hs | 21 +-------------------- .../src/Numeric/LinearAlgebra/Tests/Properties.hs | 2 +- 2 files changed, 2 insertions(+), 21 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 cf0f581..71c7c16 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs @@ -28,9 +28,8 @@ module Numeric.LinearAlgebra.Tests( --, runBigTests ) where -import Numeric.LinearAlgebra.HMatrix +import Numeric.LinearAlgebra hiding (unitary) import Numeric.LinearAlgebra.Devel hiding (vec) -import Numeric.LinearAlgebra.HMatrix.Util import Numeric.LinearAlgebra.Static(L) import Numeric.LinearAlgebra.Tests.Instances import Numeric.LinearAlgebra.Tests.Properties @@ -372,23 +371,6 @@ convolutionTest = utest "convolution" ok -------------------------------------------------------------------------------- -kroneckerTest = utest "kronecker" ok - where - a,x,b :: Matrix Double - a = (3><4) [1..] - x = (4><2) [3,5..] - b = (2><5) [0,5..] - v1 = vec (a <> x <> b) - v2 = (tr b `kronecker` a) #> vec x - s = tr b <> b - v3 = vec s - v4 = (dup 5 :: Matrix Double) #> vech s - ok = v1 == v2 && v3 == v4 - && vtrans 1 a == tr a - && vtrans (rows a) a == asColumn (vec a) - --------------------------------------------------------------------------------- - sparseTest = utest "sparse" (fst $ checkT (undefined :: GMatrix)) -------------------------------------------------------------------------------- @@ -583,7 +565,6 @@ runTests n = do , conformTest , accumTest , convolutionTest - , kroneckerTest , sparseTest , staticTest ] diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs index e2492dd..207a303 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs @@ -42,7 +42,7 @@ module Numeric.LinearAlgebra.Tests.Properties ( linearSolveProp, linearSolveProp2 ) where -import Numeric.LinearAlgebra.HMatrix hiding (Testable)--hiding (real,complex) +import Numeric.LinearAlgebra.HMatrix hiding (Testable,unitary) import Test.QuickCheck trivial :: Testable a => Bool -> a -> Property -- cgit v1.2.3