From 12da081c7e1b5d8b79451423c84da78c1cf4d072 Mon Sep 17 00:00:00 2001 From: Vincent Danjean Date: Tue, 28 Apr 2009 03:35:23 +0800 Subject: [PATCH] Remove previous %apply and %typemap directives Signed-off-by: Jonathan "Duke" Leto --- swig/BLAS.i | 4 -- swig/CBLAS.i | 4 -- swig/Fit.i | 2 - swig/Histogram.i | 2 - swig/Histogram2D.i | 3 -- swig/Interp.i | 2 - swig/Linalg.i | 2 - swig/Matrix.i | 2 - swig/MatrixComplex.i | 2 - swig/Multifit.i | 1 - swig/NTuple.i | 11 ----- swig/QRNG.i | 43 +++++------------ swig/Sort.i | 132 +++++++++++---------------------------------------- swig/Spline.i | 1 - swig/Statistics.i | 4 -- swig/Sum.i | 2 - swig/Sys.i | 1 - 17 files changed, 39 insertions(+), 179 deletions(-) rewrite swig/QRNG.i (61%) rewrite swig/Sort.i (72%) diff --git a/swig/BLAS.i b/swig/BLAS.i index 5659fe9..fdb61d5 100644 --- a/swig/BLAS.i +++ b/swig/BLAS.i @@ -1,9 +1,5 @@ %module "Math::GSL::BLAS" -%apply float *OUTPUT { float *result }; -%apply double *OUTPUT { double *result }; -%apply double *OUTPUT { double c[], double s[] }; - %include "typemaps.i" %include "gsl_typemaps.i" %include "gsl/gsl_blas.h" diff --git a/swig/CBLAS.i b/swig/CBLAS.i index 056fb93..560d4fa 100644 --- a/swig/CBLAS.i +++ b/swig/CBLAS.i @@ -2,10 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply float [] { float *C }; -%apply double const [] { const double * }; -%apply float const [] { const float * }; - %{ #include "gsl/gsl_cblas.h" %} diff --git a/swig/Fit.i b/swig/Fit.i index 09542db..d3d605d 100644 --- a/swig/Fit.i +++ b/swig/Fit.i @@ -2,8 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * c0, double * c1, double * cov00, double * cov01, double * cov11, double * sumsq, double * chisq }; - %{ #include "gsl/gsl_fit.h" %} diff --git a/swig/Histogram.i b/swig/Histogram.i index dca65ab..8d513b2 100644 --- a/swig/Histogram.i +++ b/swig/Histogram.i @@ -2,8 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * lower, double * upper, size_t * i}; - %{ #include "gsl/gsl_histogram.h" %} diff --git a/swig/Histogram2D.i b/swig/Histogram2D.i index aec3a93..12a5cc7 100644 --- a/swig/Histogram2D.i +++ b/swig/Histogram2D.i @@ -2,9 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * xlower, double * xupper, double * ylower, double * yupper, double * x, double * y}; -%apply int *OUTPUT { size_t * i, size_t * j }; - %{ #include "gsl/gsl_histogram2d.h" %} diff --git a/swig/Interp.i b/swig/Interp.i index 235226a..17838b9 100644 --- a/swig/Interp.i +++ b/swig/Interp.i @@ -3,8 +3,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * y, double * d, double * d2, double * result }; - %{ #include "gsl/gsl_types.h" #include "gsl/gsl_interp.h" diff --git a/swig/Linalg.i b/swig/Linalg.i index f31b9f9..9cfd63d 100644 --- a/swig/Linalg.i +++ b/swig/Linalg.i @@ -1,8 +1,6 @@ %module "Math::GSL::Linalg" %include "gsl_typemaps.i" -%apply int *OUTPUT { int *signum }; - %{ #include "gsl/gsl_linalg.h" #include "gsl/gsl_permutation.h" diff --git a/swig/Matrix.i b/swig/Matrix.i index 7c4d563..f75124f 100644 --- a/swig/Matrix.i +++ b/swig/Matrix.i @@ -3,8 +3,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply int *OUTPUT { size_t *imin, size_t *imax, size_t *jmin, size_t *jmax }; -%apply double *OUTPUT { double * min_out, double * max_out }; %{ #include "gsl/gsl_matrix.h" diff --git a/swig/MatrixComplex.i b/swig/MatrixComplex.i index cf3148e..11061a8 100644 --- a/swig/MatrixComplex.i +++ b/swig/MatrixComplex.i @@ -3,8 +3,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply int *OUTPUT { size_t *imin, size_t *imax, size_t *jmin, size_t *jmax }; -%apply double *OUTPUT { double * min_out, double * max_out }; %{ #include "gsl/gsl_matrix.h" diff --git a/swig/Multifit.i b/swig/Multifit.i index 000b5f2..0a3aa08 100644 --- a/swig/Multifit.i +++ b/swig/Multifit.i @@ -2,7 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * y, double * y_err, double * chisq, size_t * rank}; %{ #include "gsl/gsl_types.h" diff --git a/swig/NTuple.i b/swig/NTuple.i index 73c5551..7eef6c3 100644 --- a/swig/NTuple.i +++ b/swig/NTuple.i @@ -2,17 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%typemap(in) void *ntuple_data { - fprintf(stderr,"symname=$symname\n"); - if ($input) - $1 = (double *) $input; - // should have a croak in an else -}; - -%typemap(argout) void *ntuple_data { - //Perl_sv_dump($1); -} - %{ #include "gsl/gsl_ntuple.h" #include "gsl/gsl_errno.h" diff --git a/swig/QRNG.i b/swig/QRNG.i dissimilarity index 61% index 6fdee27..e0f8398 100644 --- a/swig/QRNG.i +++ b/swig/QRNG.i @@ -1,31 +1,12 @@ -%module "Math::GSL::QRNG" -%include "typemaps.i" -%include "gsl_typemaps.i" - -%apply double *OUTPUT { double x[] }; - -%typemap(argout) double x[] { - AV *tempav; - I32 len; - int i; - SV **tv; - if (argvi >= items) { - EXTEND(sp,1); - } - $result = sv_newmortal(); - sv_setnv($result,(NV) *($1)); - argvi++; - - $result = sv_newmortal(); - sv_setnv($result,(NV) *($1+1)); - argvi++; -} - -%{ - #include "gsl/gsl_types.h" - #include "gsl/gsl_qrng.h" -%} - -%include "gsl/gsl_types.h" -%include "gsl/gsl_qrng.h" -%include "../pod/QRNG.pod" +%module "Math::GSL::QRNG" +%include "typemaps.i" +%include "gsl_typemaps.i" + +%{ + #include "gsl/gsl_types.h" + #include "gsl/gsl_qrng.h" +%} + +%include "gsl/gsl_types.h" +%include "gsl/gsl_qrng.h" +%include "../pod/QRNG.pod" diff --git a/swig/Sort.i b/swig/Sort.i dissimilarity index 72% index 822ba1e..195b747 100644 --- a/swig/Sort.i +++ b/swig/Sort.i @@ -1,105 +1,27 @@ -%module "Math::GSL::Sort" -/* Danger Will Robinson! */ - -%include "typemaps.i" -%include "gsl_typemaps.i" - -%typemap(argout) (double * data, const size_t stride, const size_t n) { - int i=0; - AV* tempav = newAV(); - - while( i < $3 ) { - av_push(tempav, newSVnv((double) $1[i])); - i++; - } - - $result = sv_2mortal( newRV_noinc( (SV*) tempav) ); - //Perl_sv_dump($result); - argvi++; -} -%typemap(argout) (double * dest, const size_t k, const gsl_vector * v) { - int i=0; - AV* tempav = newAV(); - - while( i < $2 ) { - av_push(tempav, newSVnv((double) $1[i])); - i++; - } - - $result = sv_2mortal( newRV_noinc( (SV*) tempav) ); - argvi++; -} - -%typemap(argout) (double * dest, const size_t k, const double * src, const size_t stride, const size_t n) { - int i=0; - AV* tempav = newAV(); - while( i < $2 ) { - av_push(tempav, newSVnv((double) $1[i])); - i++; - } - - $result = sv_2mortal( newRV_noinc( (SV*) tempav) ); - argvi++; -} -%typemap(argout) (size_t * p, const size_t k, const gsl_vector * v) -{ - int i=0; - AV* tempav = newAV(); - while( i < $2 ) { - av_push(tempav, newSVnv((double) $1[i])); - i++; - } - - $result = sv_2mortal( newRV_noinc( (SV*) tempav) ); - argvi++; -} - -%typemap(argout) (size_t * p, const double * data, const size_t stride, const size_t n) -{ - int i=0; - AV* tempav = newAV(); - while( i < $4 ) { - av_push(tempav, newSVnv((size_t) $1[i])); - i++; - } - - $result = sv_2mortal( newRV_noinc( (SV*) tempav) ); - argvi++; -} - -%typemap(argout) (size_t * p, const size_t k, const double * src, const size_t stride, const size_t n) -{ - int i=0; - AV* tempav = newAV(); - while( i < $2 ) { - av_push(tempav, newSVnv((size_t) $1[i])); - i++; - } - - $result = sv_2mortal( newRV_noinc( (SV*) tempav) ); - argvi++; -} - -%apply double * { double *data, double *dest }; - -%{ - #include "gsl/gsl_nan.h" - #include "gsl/gsl_sort.h" - #include "gsl/gsl_sort_double.h" - #include "gsl/gsl_sort_int.h" - #include "gsl/gsl_sort_vector.h" - #include "gsl/gsl_sort_vector_double.h" - #include "gsl/gsl_sort_vector_int.h" - #include "gsl/gsl_permutation.h" -%} - -%include "gsl/gsl_nan.h" -%include "gsl/gsl_sort.h" -%include "gsl/gsl_sort_double.h" -%include "gsl/gsl_sort_int.h" -%include "gsl/gsl_sort_vector.h" -%include "gsl/gsl_sort_vector_double.h" -%include "gsl/gsl_sort_vector_int.h" -%include "gsl/gsl_permutation.h" - -%include "../pod/Sort.pod" +%module "Math::GSL::Sort" +/* Danger Will Robinson! */ + +%include "typemaps.i" +%include "gsl_typemaps.i" + +%{ + #include "gsl/gsl_nan.h" + #include "gsl/gsl_sort.h" + #include "gsl/gsl_sort_double.h" + #include "gsl/gsl_sort_int.h" + #include "gsl/gsl_sort_vector.h" + #include "gsl/gsl_sort_vector_double.h" + #include "gsl/gsl_sort_vector_int.h" + #include "gsl/gsl_permutation.h" +%} + +%include "gsl/gsl_nan.h" +%include "gsl/gsl_sort.h" +%include "gsl/gsl_sort_double.h" +%include "gsl/gsl_sort_int.h" +%include "gsl/gsl_sort_vector.h" +%include "gsl/gsl_sort_vector_double.h" +%include "gsl/gsl_sort_vector_int.h" +%include "gsl/gsl_permutation.h" + +%include "../pod/Sort.pod" diff --git a/swig/Spline.i b/swig/Spline.i index 6aa939d..1544434 100644 --- a/swig/Spline.i +++ b/swig/Spline.i @@ -2,7 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * y, double * d, double * d2, double * result }; %{ #include "gsl/gsl_spline.h" diff --git a/swig/Statistics.i b/swig/Statistics.i index a43f0ad..96e70ec 100644 --- a/swig/Statistics.i +++ b/swig/Statistics.i @@ -3,10 +3,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * min, double * max }; - -%apply int *OUTPUT { size_t * min_index, size_t * max_index }; - %{ #include "gsl/gsl_statistics_double.h" #include "gsl/gsl_statistics_int.h" diff --git a/swig/Sum.i b/swig/Sum.i index dd3ee89..ab65792 100644 --- a/swig/Sum.i +++ b/swig/Sum.i @@ -1,8 +1,6 @@ %module "Math::GSL::Sum" %include "gsl_typemaps.i" -%apply double *OUTPUT { double * sum_accel, double * abserr, double * abserr_trunc }; - %{ #include "gsl/gsl_sum.h" %} diff --git a/swig/Sys.i b/swig/Sys.i index e6301ba..3074d30 100644 --- a/swig/Sys.i +++ b/swig/Sys.i @@ -2,7 +2,6 @@ %include "typemaps.i" %include "gsl_typemaps.i" -%apply int *OUTPUT { int * e }; %{ #include "gsl/gsl_sys.h" -- 2.11.4.GIT