1 files changed, 0 insertions, 286 deletions

diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c
index bd0a6bd..052cafd 100644
--- a/lib/Numeric/GSL/gsl-aux.c
+++ b/lib/Numeric/GSL/gsl-aux.c
@@ -1,11 +1,8 @@
 #include "gsl-aux.h"
 #include <gsl/gsl_blas.h>
-#include <gsl/gsl_linalg.h>
-#include <gsl/gsl_matrix.h>
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_fft_complex.h>
-#include <gsl/gsl_eigen.h>
 #include <gsl/gsl_integration.h>
 #include <gsl/gsl_deriv.h>
 #include <gsl/gsl_poly.h>
@@ -161,47 +158,6 @@ int mapC(int code, KCVEC(x), CVEC(r)) {
 }
 
 
-/*
-int scaleR(double* alpha, KRVEC(x), RVEC(r)) {
-    REQUIRES(xn == rn,BAD_SIZE);
-    DEBUGMSG("scaleR");
-    KDVVIEW(x);
-    DVVIEW(r);
-    CHECK( gsl_vector_memcpy(V(r),V(x)) , MEM);
-    int res = gsl_vector_scale(V(r),*alpha);
-    CHECK(res,res);
-    OK
-}
-
-int scaleC(gsl_complex *alpha, KCVEC(x), CVEC(r)) {
-    REQUIRES(xn == rn,BAD_SIZE);
-    DEBUGMSG("scaleC");
-    //KCVVIEW(x);
-    CVVIEW(r);
-    gsl_vector_const_view vrx = gsl_vector_const_view_array((double*)xp,xn*2);
-    gsl_vector_view vrr = gsl_vector_view_array((double*)rp,rn*2);
-    CHECK(gsl_vector_memcpy(V(vrr),V(vrx)) , MEM);
-    gsl_blas_zscal(*alpha,V(r)); // void !
-    int res = 0; 
-    CHECK(res,res);
-    OK
-}
-
-int addConstantR(double offs, KRVEC(x), RVEC(r)) { 
-    REQUIRES(xn == rn,BAD_SIZE); 
-    DEBUGMSG("addConstantR");
-    KDVVIEW(x);
-    DVVIEW(r);
-    CHECK(gsl_vector_memcpy(V(r),V(x)), MEM);
-    int res = gsl_vector_add_constant(V(r),offs);
-    CHECK(res,res);
-    OK
-}
-
-*/
-
-
-
 int mapValR(int code, double* pval, KRVEC(x), RVEC(r)) {
     int k;
     double val = *pval;
@@ -291,248 +247,6 @@ int zipC(int code, KCVEC(a), KCVEC(b), CVEC(r)) {
 
 
 
-
-int luSolveR(KRMAT(a),KRMAT(b),RMAT(r)) {
-    REQUIRES(ar==ac && ac==br && ar==rr && bc==rc,BAD_SIZE);
-    DEBUGMSG("luSolveR");
-    KDMVIEW(a);
-    KDMVIEW(b);
-    DMVIEW(r);
-    int res;
-    gsl_matrix *LU = gsl_matrix_alloc(ar,ar);
-    CHECK(!LU,MEM);
-    int s;
-    gsl_permutation * p = gsl_permutation_alloc (ar);
-    CHECK(!p,MEM);
-    CHECK(gsl_matrix_memcpy(LU,M(a)),MEM);
-    res = gsl_linalg_LU_decomp(LU, p, &s);
-    CHECK(res,res);
-    int c;
-
-    for (c=0; c<bc; c++) {
-        gsl_vector_const_view colb = gsl_matrix_const_column (M(b), c);
-        gsl_vector_view colr = gsl_matrix_column (M(r), c);
-        res = gsl_linalg_LU_solve (LU, p, V(colb), V(colr));
-        CHECK(res,res);
-    }
-    gsl_permutation_free(p);
-    gsl_matrix_free(LU);
-    OK
-}
-
-
-int luSolveC(KCMAT(a),KCMAT(b),CMAT(r)) {
-    REQUIRES(ar==ac && ac==br && ar==rr && bc==rc,BAD_SIZE);
-    DEBUGMSG("luSolveC");
-    KCMVIEW(a);
-    KCMVIEW(b);
-    CMVIEW(r);
-    gsl_matrix_complex *LU = gsl_matrix_complex_alloc(ar,ar);
-    CHECK(!LU,MEM);
-    int s;
-    gsl_permutation * p = gsl_permutation_alloc (ar);
-    CHECK(!p,MEM);
-    CHECK(gsl_matrix_complex_memcpy(LU,M(a)),MEM);
-    int res;
-    res = gsl_linalg_complex_LU_decomp(LU, p, &s);
-    CHECK(res,res);
-    int c;
-    for (c=0; c<bc; c++) {
-        gsl_vector_complex_const_view colb = gsl_matrix_complex_const_column (M(b), c);
-        gsl_vector_complex_view colr = gsl_matrix_complex_column (M(r), c);
-        res = gsl_linalg_complex_LU_solve (LU, p, V(colb), V(colr));
-        CHECK(res,res);
-    }
-    gsl_permutation_free(p);
-    gsl_matrix_complex_free(LU);
-    OK
-}
-
-
-int luRaux(KRMAT(a),RVEC(b)) {
-    REQUIRES(ar==ac && bn==ar*ar+ar+1,BAD_SIZE);
-    DEBUGMSG("luRaux");
-    KDMVIEW(a);
-    //DVVIEW(b);
-    gsl_matrix_view LU = gsl_matrix_view_array(bp,ar,ac);
-    int s;
-    gsl_permutation * p = gsl_permutation_alloc (ar);
-    CHECK(!p,MEM);
-    CHECK(gsl_matrix_memcpy(M(LU),M(a)),MEM);
-    gsl_linalg_LU_decomp(M(LU), p, &s);
-    bp[ar*ar] = s;
-    int k;
-    for (k=0; k<ar; k++) {
-        bp[ar*ar+k+1] = gsl_permutation_get(p,k);
-    }
-    gsl_permutation_free(p);
-    OK
-}
-
-int luCaux(KCMAT(a),CVEC(b)) {
-    REQUIRES(ar==ac && bn==ar*ar+ar+1,BAD_SIZE);
-    DEBUGMSG("luCaux");
-    KCMVIEW(a);
-    //DVVIEW(b);
-    gsl_matrix_complex_view LU = gsl_matrix_complex_view_array((double*)bp,ar,ac);
-    int s;
-    gsl_permutation * p = gsl_permutation_alloc (ar);
-    CHECK(!p,MEM);
-    CHECK(gsl_matrix_complex_memcpy(M(LU),M(a)),MEM);
-    int res;
-    res = gsl_linalg_complex_LU_decomp(M(LU), p, &s);
-    CHECK(res,res);
-    ((double*)bp)[2*ar*ar] = s;
-    ((double*)bp)[2*ar*ar+1] = 0;
-    int k;
-    for (k=0; k<ar; k++) {
-        ((double*)bp)[2*ar*ar+2*k+2] = gsl_permutation_get(p,k);
-        ((double*)bp)[2*ar*ar+2*k+2+1] = 0;
-    }
-    gsl_permutation_free(p);
-    OK
-}
-
-int svd(KRMAT(a),RMAT(u), RVEC(s),RMAT(v)) {
-    REQUIRES(ar==ur && ac==uc && ac==sn && ac==vr && ac==vc,BAD_SIZE);
-    DEBUGMSG("svd");
-    KDMVIEW(a);
-    DMVIEW(u);
-    DVVIEW(s);
-    DMVIEW(v);
-    gsl_vector  *workv = gsl_vector_alloc(ac);
-    CHECK(!workv,MEM);
-    gsl_matrix  *workm = gsl_matrix_alloc(ac,ac);
-    CHECK(!workm,MEM);
-    CHECK(gsl_matrix_memcpy(M(u),M(a)),MEM);
-    // int res = gsl_linalg_SV_decomp_jacobi (&U.matrix, &V.matrix, &S.vector);
-    // doesn't work 
-    //int res = gsl_linalg_SV_decomp (&U.matrix, &V.matrix, &S.vector, workv);
-    int res = gsl_linalg_SV_decomp_mod (M(u), workm, M(v), V(s), workv);
-    CHECK(res,res);
-    //gsl_matrix_transpose(M(v));
-    gsl_vector_free(workv);
-    gsl_matrix_free(workm);
-    OK
-}
-
-
-// for real symmetric matrices
-int eigensystemR(KRMAT(x),RVEC(l),RMAT(v)) {
-    REQUIRES(xr==xc && xr==ln && xr==vr && vr==vc,BAD_SIZE);
-    DEBUGMSG("eigensystemR (gsl_eigen_symmv)");
-    KDMVIEW(x);
-    DVVIEW(l);
-    DMVIEW(v);
-    gsl_matrix *XC = gsl_matrix_alloc(xr,xr);
-    gsl_matrix_memcpy(XC,M(x)); // needed because the argument is destroyed
-                                // many thanks to Nico Mahlo for the bug report 
-    gsl_eigen_symmv_workspace * w = gsl_eigen_symmv_alloc (xc);
-    int res = gsl_eigen_symmv (XC, V(l), M(v), w);
-    CHECK(res,res);
-    gsl_eigen_symmv_free (w);
-    gsl_matrix_free(XC);
-    gsl_eigen_symmv_sort (V(l), M(v), GSL_EIGEN_SORT_ABS_DESC);
-    OK
-}
-
-// for hermitian matrices
-int eigensystemC(KCMAT(x),RVEC(l),CMAT(v)) {
-    REQUIRES(xr==xc && xr==ln && xr==vr && vr==vc,BAD_SIZE);
-    DEBUGMSG("eigensystemC");
-    KCMVIEW(x);
-    DVVIEW(l);
-    CMVIEW(v);
-    gsl_matrix_complex *XC = gsl_matrix_complex_alloc(xr,xr);
-    gsl_matrix_complex_memcpy(XC,M(x)); // again needed because the argument is destroyed
-    gsl_eigen_hermv_workspace * w = gsl_eigen_hermv_alloc (xc);
-    int res = gsl_eigen_hermv (XC, V(l), M(v), w);
-    CHECK(res,res);
-    gsl_eigen_hermv_free (w);
-    gsl_matrix_complex_free(XC);
-    gsl_eigen_hermv_sort (V(l), M(v), GSL_EIGEN_SORT_ABS_DESC);
-    OK
-}
-
-int QR(KRMAT(x),RMAT(q),RMAT(r)) {
-    REQUIRES(xr==rr && xc==rc && qr==qc && xr==qr,BAD_SIZE);
-    DEBUGMSG("QR");
-    KDMVIEW(x);
-    DMVIEW(q);
-    DMVIEW(r);
-    gsl_matrix * a = gsl_matrix_alloc(xr,xc);
-    gsl_vector * tau = gsl_vector_alloc(MIN(xr,xc));
-    gsl_matrix_memcpy(a,M(x));
-    int res = gsl_linalg_QR_decomp(a,tau);
-    CHECK(res,res);
-    gsl_linalg_QR_unpack(a,tau,M(q),M(r));
-    gsl_vector_free(tau);
-    gsl_matrix_free(a);
-    OK
-}
-
-int QRpacked(KRMAT(x),RMAT(qr),RVEC(tau)) {
-    //REQUIRES(xr==rr && xc==rc && qr==qc && xr==qr,BAD_SIZE);
-    DEBUGMSG("QRpacked");
-    KDMVIEW(x);
-    DMVIEW(qr);
-    DVVIEW(tau);
-    //gsl_matrix * a = gsl_matrix_alloc(xr,xc);
-    //gsl_vector * tau = gsl_vector_alloc(MIN(xr,xc));
-    gsl_matrix_memcpy(M(qr),M(x));
-    int res = gsl_linalg_QR_decomp(M(qr),V(tau));
-    CHECK(res,res);
-    OK
-}
-
-
-int QRunpack(KRMAT(xqr),KRVEC(tau),RMAT(q),RMAT(r)) {
-    //REQUIRES(xr==rr && xc==rc && qr==qc && xr==qr,BAD_SIZE);
-    DEBUGMSG("QRunpack");
-    KDMVIEW(xqr);
-    KDVVIEW(tau);
-    DMVIEW(q);
-    DMVIEW(r);
-    gsl_linalg_QR_unpack(M(xqr),V(tau),M(q),M(r));
-    OK
-}
-
-
-int cholR(KRMAT(x),RMAT(l)) {
-    REQUIRES(xr==xc && lr==xr && lr==lc,BAD_SIZE);
-    DEBUGMSG("cholR");
-    KDMVIEW(x);
-    DMVIEW(l);
-    gsl_matrix_memcpy(M(l),M(x));
-    int res = gsl_linalg_cholesky_decomp(M(l));
-    CHECK(res,res);
-    int r,c;
-    for (r=0; r<xr-1; r++) {
-        for(c=r+1; c<xc; c++) {
-            lp[r*lc+c] = 0.;
-        }
-    }
-    OK
-}
-
-int cholC(KCMAT(x),CMAT(l)) {
-    REQUIRES(xr==xc && lr==xr && lr==lc,BAD_SIZE);
-    DEBUGMSG("cholC");
-    KCMVIEW(x);
-    CMVIEW(l);
-    gsl_matrix_complex_memcpy(M(l),M(x));
-    int res = 0; // gsl_linalg_complex_cholesky_decomp(M(l));
-    CHECK(res,res);
-    gsl_complex zero = {0.,0.};
-    int r,c;
-    for (r=0; r<xr-1; r++) {
-        for(c=r+1; c<xc; c++) {
-            lp[r*lc+c] = zero;
-        }
-    }
-    OK
-}
-
 int fft(int code, KCVEC(X), CVEC(R)) {
     REQUIRES(Xn == Rn,BAD_SIZE);
     DEBUGMSG("fft");