From bbc54bf2573ea3631ee436507807dae6c4353bcc Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Thu, 4 Jun 2009 18:53:55 +0000 Subject: improved windows installation instructions --- lib/Data/Packed/Development.hs | 2 +- lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | 12 ------------ lib/Numeric/LinearAlgebra/Tests.hs | 8 ++------ 3 files changed, 3 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/Data/Packed/Development.hs b/lib/Data/Packed/Development.hs index cbb2f81..56e7b8f 100644 --- a/lib/Data/Packed/Development.hs +++ b/lib/Data/Packed/Development.hs @@ -24,4 +24,4 @@ module Data.Packed.Development ( MatrixOrder(..), orderOf, cmat, fmat, ) where -import Data.Packed.Internal \ No newline at end of file +import Data.Packed.Internal diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c index d7248d1..f18bbed 100644 --- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c +++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c @@ -435,9 +435,6 @@ int linearSolveLSR_l(KDMAT(a),KDMAT(b),DMAT(x)) { //////////////////// least squares complex linear system //////////// int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { - #ifdef _WIN32 - return NOSPRTD; - #else integer m = ar; integer n = ac; integer nrhs = bc; @@ -478,7 +475,6 @@ int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { free(work); free(AC); OK - #endif } //////////////////// least squares real linear system using SVD //////////// @@ -543,9 +539,6 @@ int zgelss_(integer *m, integer *n, integer *nhrs, integer *info); int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { - #ifdef _WIN32 - return NOSPRTD; - #else integer m = ar; integer n = ac; integer nrhs = bc; @@ -596,7 +589,6 @@ int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { free(S); free(AC); OK - #endif } //////////////////// Cholesky factorization ///////////////////////// @@ -749,9 +741,6 @@ int schur_l_R(KDMAT(a), DMAT(u), DMAT(s)) { } int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)) { - #ifdef _WIN32 - return NOSPRTD; - #else integer m = ar; integer n = ac; REQUIRES(m>=1 && n==m && ur==n && uc==n && sr==n && sc==n, BAD_SIZE); @@ -776,7 +765,6 @@ int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)) { free(BWORK); free(WORK); OK - #endif } //////////////////// LU factorization ///////////////////////// diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs index 4f73e3a..174e418 100644 --- a/lib/Numeric/LinearAlgebra/Tests.hs +++ b/lib/Numeric/LinearAlgebra/Tests.hs @@ -159,9 +159,7 @@ runTests n = do test (linearSolveProp (luSolve.luPacked) . cSqWC) putStrLn "------ pinv (linearSolveSVD)" test (pinvProp . rM) - if os == "mingw32" - then putStrLn "complex pinvTest skipped in this OS" - else test (pinvProp . cM) + test (pinvProp . cM) putStrLn "------ det" test (detProp . rSqWC) test (detProp . cSqWC) @@ -186,9 +184,7 @@ runTests n = do test (hessProp . cSq) putStrLn "------ schur" test (schurProp2 . rSq) - if os == "mingw32" - then putStrLn "complex schur skipped in this OS" - else test (schurProp1 . cSq) + test (schurProp1 . cSq) putStrLn "------ chol" test (cholProp . rPosDef) test (cholProp . cPosDef) -- cgit v1.2.3