diff options
author | Alberto Ruiz <aruiz@um.es> | 2009-06-04 18:53:55 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2009-06-04 18:53:55 +0000 |
commit | bbc54bf2573ea3631ee436507807dae6c4353bcc (patch) | |
tree | b7db6ae5f4aba50a4bb8d4c584d131e424286be8 /lib | |
parent | 6e0dd472ef8c570ec1924ac641e5872db30ac142 (diff) |
improved windows installation instructions
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Data/Packed/Development.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | 12 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/Tests.hs | 8 |
3 files changed, 3 insertions, 19 deletions
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 ( | |||
24 | MatrixOrder(..), orderOf, cmat, fmat, | 24 | MatrixOrder(..), orderOf, cmat, fmat, |
25 | ) where | 25 | ) where |
26 | 26 | ||
27 | import Data.Packed.Internal \ No newline at end of file | 27 | 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)) { | |||
435 | //////////////////// least squares complex linear system //////////// | 435 | //////////////////// least squares complex linear system //////////// |
436 | 436 | ||
437 | int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { | 437 | int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { |
438 | #ifdef _WIN32 | ||
439 | return NOSPRTD; | ||
440 | #else | ||
441 | integer m = ar; | 438 | integer m = ar; |
442 | integer n = ac; | 439 | integer n = ac; |
443 | integer nrhs = bc; | 440 | integer nrhs = bc; |
@@ -478,7 +475,6 @@ int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { | |||
478 | free(work); | 475 | free(work); |
479 | free(AC); | 476 | free(AC); |
480 | OK | 477 | OK |
481 | #endif | ||
482 | } | 478 | } |
483 | 479 | ||
484 | //////////////////// least squares real linear system using SVD //////////// | 480 | //////////////////// least squares real linear system using SVD //////////// |
@@ -543,9 +539,6 @@ int zgelss_(integer *m, integer *n, integer *nhrs, | |||
543 | integer *info); | 539 | integer *info); |
544 | 540 | ||
545 | int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { | 541 | int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { |
546 | #ifdef _WIN32 | ||
547 | return NOSPRTD; | ||
548 | #else | ||
549 | integer m = ar; | 542 | integer m = ar; |
550 | integer n = ac; | 543 | integer n = ac; |
551 | integer nrhs = bc; | 544 | integer nrhs = bc; |
@@ -596,7 +589,6 @@ int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { | |||
596 | free(S); | 589 | free(S); |
597 | free(AC); | 590 | free(AC); |
598 | OK | 591 | OK |
599 | #endif | ||
600 | } | 592 | } |
601 | 593 | ||
602 | //////////////////// Cholesky factorization ///////////////////////// | 594 | //////////////////// Cholesky factorization ///////////////////////// |
@@ -749,9 +741,6 @@ int schur_l_R(KDMAT(a), DMAT(u), DMAT(s)) { | |||
749 | } | 741 | } |
750 | 742 | ||
751 | int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)) { | 743 | int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)) { |
752 | #ifdef _WIN32 | ||
753 | return NOSPRTD; | ||
754 | #else | ||
755 | integer m = ar; | 744 | integer m = ar; |
756 | integer n = ac; | 745 | integer n = ac; |
757 | REQUIRES(m>=1 && n==m && ur==n && uc==n && sr==n && sc==n, BAD_SIZE); | 746 | 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)) { | |||
776 | free(BWORK); | 765 | free(BWORK); |
777 | free(WORK); | 766 | free(WORK); |
778 | OK | 767 | OK |
779 | #endif | ||
780 | } | 768 | } |
781 | 769 | ||
782 | //////////////////// LU factorization ///////////////////////// | 770 | //////////////////// 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 | |||
159 | test (linearSolveProp (luSolve.luPacked) . cSqWC) | 159 | test (linearSolveProp (luSolve.luPacked) . cSqWC) |
160 | putStrLn "------ pinv (linearSolveSVD)" | 160 | putStrLn "------ pinv (linearSolveSVD)" |
161 | test (pinvProp . rM) | 161 | test (pinvProp . rM) |
162 | if os == "mingw32" | 162 | test (pinvProp . cM) |
163 | then putStrLn "complex pinvTest skipped in this OS" | ||
164 | else test (pinvProp . cM) | ||
165 | putStrLn "------ det" | 163 | putStrLn "------ det" |
166 | test (detProp . rSqWC) | 164 | test (detProp . rSqWC) |
167 | test (detProp . cSqWC) | 165 | test (detProp . cSqWC) |
@@ -186,9 +184,7 @@ runTests n = do | |||
186 | test (hessProp . cSq) | 184 | test (hessProp . cSq) |
187 | putStrLn "------ schur" | 185 | putStrLn "------ schur" |
188 | test (schurProp2 . rSq) | 186 | test (schurProp2 . rSq) |
189 | if os == "mingw32" | 187 | test (schurProp1 . cSq) |
190 | then putStrLn "complex schur skipped in this OS" | ||
191 | else test (schurProp1 . cSq) | ||
192 | putStrLn "------ chol" | 188 | putStrLn "------ chol" |
193 | test (cholProp . rPosDef) | 189 | test (cholProp . rPosDef) |
194 | test (cholProp . cPosDef) | 190 | test (cholProp . cPosDef) |