vector fread/fwrite, fscanf/fprinf

2 files changed, 48 insertions, 46 deletions

diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c
index 0904a67..b3b524d 100644
--- a/lib/Numeric/GSL/gsl-aux.c
+++ b/lib/Numeric/GSL/gsl-aux.c
@@ -1,4 +1,15 @@
-#include "gsl-aux.h"
+#include <gsl/gsl_complex.h>
+
+#define RVEC(A) int A##n, double*A##p
+#define RMAT(A) int A##r, int A##c, double* A##p
+#define KRVEC(A) int A##n, const double*A##p
+#define KRMAT(A) int A##r, int A##c, const double* A##p
+
+#define CVEC(A) int A##n, gsl_complex*A##p
+#define CMAT(A) int A##r, int A##c, gsl_complex* A##p
+#define KCVEC(A) int A##n, const gsl_complex*A##p
+#define KCMAT(A) int A##r, int A##c, const gsl_complex* A##p
+
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_errno.h>
@@ -8,7 +19,6 @@
 #include <gsl/gsl_poly.h>
 #include <gsl/gsl_multimin.h>
 #include <gsl/gsl_multiroots.h>
-#include <gsl/gsl_complex.h>
 #include <gsl/gsl_complex_math.h>
 #include <string.h>
 #include <stdio.h>
@@ -340,13 +350,45 @@ int polySolve(KRVEC(a), CVEC(z)) {
     OK;
 }
 
-int matrix_fscanf(char*filename, RMAT(a)) {
+int vector_fscanf(char*filename, RVEC(a)) {
     DEBUGMSG("gsl_matrix_fscanf");
-    //printf(filename); printf("\n");
-    DMVIEW(a);
+    DVVIEW(a);
     FILE * f = fopen(filename,"r");
     CHECK(!f,BAD_FILE);
-    int res = gsl_matrix_fscanf(f, M(a));
+    int res = gsl_vector_fscanf(f,V(a));
+    CHECK(res,res);
+    fclose (f);
+    OK
+}
+
+int vector_fprintf(char*filename, char*fmt, RVEC(a)) {
+    DEBUGMSG("gsl_vector_fprintf");
+    DVVIEW(a);
+    FILE * f = fopen(filename,"w");
+    CHECK(!f,BAD_FILE);
+    int res = gsl_vector_fprintf(f,V(a),fmt);
+    CHECK(res,res);
+    fclose (f);
+    OK
+}
+
+int vector_fread(char*filename, RVEC(a)) {
+    DEBUGMSG("gsl_matrix_fscanf");
+    DVVIEW(a);
+    FILE * f = fopen(filename,"r");
+    CHECK(!f,BAD_FILE);
+    int res = gsl_vector_fread(f,V(a));
+    CHECK(res,res);
+    fclose (f);
+    OK
+}
+
+int vector_fwrite(char*filename, RVEC(a)) {
+    DEBUGMSG("gsl_vector_fprintf");
+    DVVIEW(a);
+    FILE * f = fopen(filename,"w");
+    CHECK(!f,BAD_FILE);
+    int res = gsl_vector_fwrite(f,V(a));
     CHECK(res,res);
     fclose (f);
     OK
diff --git a/lib/Numeric/GSL/gsl-aux.h b/lib/Numeric/GSL/gsl-aux.h
deleted file mode 100644
index 881d0d0..0000000
--- a/lib/Numeric/GSL/gsl-aux.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <gsl/gsl_complex.h>
-
-#define RVEC(A) int A##n, double*A##p
-#define RMAT(A) int A##r, int A##c, double* A##p
-#define KRVEC(A) int A##n, const double*A##p
-#define KRMAT(A) int A##r, int A##c, const double* A##p
-
-#define CVEC(A) int A##n, gsl_complex*A##p
-#define CMAT(A) int A##r, int A##c, gsl_complex* A##p
-#define KCVEC(A) int A##n, const gsl_complex*A##p
-#define KCMAT(A) int A##r, int A##c, const gsl_complex* A##p
-
-void no_abort_on_error();
-
-int toScalarR(int code, KRVEC(x), RVEC(r));
-/* norm2, absdif, maximum, posmax, etc. */
-
-int mapR(int code, KRVEC(x), RVEC(r));
-int mapC(int code, KCVEC(x), CVEC(r));
-/* sin cos tan etc. */
-
-int mapValR(int code, double*, KRVEC(x), RVEC(r));
-int mapValC(int code, gsl_complex*, KCVEC(x), CVEC(r));
-
-int zipR(int code, KRVEC(a), KRVEC(b), RVEC(r));
-int zipC(int code, KCVEC(a), KCVEC(b), CVEC(r));
-
-
-int fft(int code, KCVEC(a), CVEC(b));
-
-int deriv(int code, double f(double, void*), double x, double h, double * result, double * abserr);
-
-int integrate_qng(double f(double, void*), double a, double b, double prec,
-                   double *result, double*error);
-
-int integrate_qags(double f(double,void*), double a, double b, double prec, int w,
-               double *result, double* error);
-
-int polySolve(KRVEC(a), CVEC(z));
-