diff options
Diffstat (limited to 'lib/Numeric')
-rw-r--r-- | lib/Numeric/GSL/gsl-aux.c | 6 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c index 83c3bf8..bd0a6bd 100644 --- a/lib/Numeric/GSL/gsl-aux.c +++ b/lib/Numeric/GSL/gsl-aux.c | |||
@@ -116,9 +116,9 @@ int mapR(int code, KRVEC(x), RVEC(r)) { | |||
116 | OP(7,sinh) | 116 | OP(7,sinh) |
117 | OP(8,cosh) | 117 | OP(8,cosh) |
118 | OP(9,tanh) | 118 | OP(9,tanh) |
119 | OP(10,asinh) | 119 | OP(10,gsl_asinh) |
120 | OP(11,acosh) | 120 | OP(11,gsl_acosh) |
121 | OP(12,atanh) | 121 | OP(12,gsl_atanh) |
122 | OP(13,exp) | 122 | OP(13,exp) |
123 | OP(14,log) | 123 | OP(14,log) |
124 | OP(15,sign) | 124 | OP(15,sign) |
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c index bf0cfba..9b6c1db 100644 --- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c +++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #define SINGULAR 2004 | 29 | #define SINGULAR 2004 |
30 | #define NOCONVER 2005 | 30 | #define NOCONVER 2005 |
31 | #define NODEFPOS 2006 | 31 | #define NODEFPOS 2006 |
32 | #define NOSPRTD 2007 | ||
33 | |||
32 | 34 | ||
33 | //////////////////// real svd //////////////////////////////////// | 35 | //////////////////// real svd //////////////////////////////////// |
34 | 36 | ||
@@ -423,6 +425,9 @@ int linearSolveLSR_l(KDMAT(a),KDMAT(b),DMAT(x)) { | |||
423 | //////////////////// least squares complex linear system //////////// | 425 | //////////////////// least squares complex linear system //////////// |
424 | 426 | ||
425 | int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { | 427 | int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { |
428 | #ifdef _WIN32 | ||
429 | return NOSPRTD; | ||
430 | #else | ||
426 | integer m = ar; | 431 | integer m = ar; |
427 | integer n = ac; | 432 | integer n = ac; |
428 | integer nrhs = bc; | 433 | integer nrhs = bc; |
@@ -463,6 +468,7 @@ int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) { | |||
463 | free(work); | 468 | free(work); |
464 | free(AC); | 469 | free(AC); |
465 | OK | 470 | OK |
471 | #endif | ||
466 | } | 472 | } |
467 | 473 | ||
468 | //////////////////// least squares real linear system using SVD //////////// | 474 | //////////////////// least squares real linear system using SVD //////////// |
@@ -527,6 +533,9 @@ int zgelss_(integer *m, integer *n, integer *nhrs, | |||
527 | integer *info); | 533 | integer *info); |
528 | 534 | ||
529 | int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { | 535 | int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { |
536 | #ifdef _WIN32 | ||
537 | return NOSPRTD; | ||
538 | #else | ||
530 | integer m = ar; | 539 | integer m = ar; |
531 | integer n = ac; | 540 | integer n = ac; |
532 | integer nrhs = bc; | 541 | integer nrhs = bc; |
@@ -577,6 +586,7 @@ int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) { | |||
577 | free(S); | 586 | free(S); |
578 | free(AC); | 587 | free(AC); |
579 | OK | 588 | OK |
589 | #endif | ||
580 | } | 590 | } |
581 | 591 | ||
582 | //////////////////// Cholesky factorization ///////////////////////// | 592 | //////////////////// Cholesky factorization ///////////////////////// |