rb-gsl 1.16.0.4 → 1.16.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +12 -0
- data/.travis.yml +24 -0
- data/AUTHORS +6 -0
- data/COPYING +341 -339
- data/ChangeLog +608 -587
- data/Gemfile +4 -0
- data/README.md +77 -0
- data/Rakefile +14 -33
- data/THANKS +1 -1
- data/examples/blas/blas.rb +1 -1
- data/examples/bspline.rb +3 -3
- data/examples/complex/functions.rb +4 -4
- data/examples/complex/mul.rb +1 -1
- data/examples/const/physconst.rb +4 -4
- data/examples/const/travel.rb +4 -4
- data/examples/eigen/nonsymmv.rb +1 -1
- data/examples/eigen/qhoscillator.rb +3 -3
- data/examples/fft/radix2.rb +1 -1
- data/examples/fft/real-halfcomplex.rb +3 -3
- data/examples/fft/real-halfcomplex2.rb +3 -3
- data/examples/fit/expfit.rb +1 -1
- data/examples/fit/multifit.rb +1 -1
- data/examples/fit/ndlinear.rb +44 -44
- data/examples/fit/nonlinearfit.rb +1 -1
- data/examples/fit/wlinear.rb +3 -3
- data/examples/function/function.rb +1 -1
- data/examples/function/min.rb +1 -1
- data/examples/function/synchrotron.rb +2 -2
- data/examples/gallery/koch.rb +1 -1
- data/examples/histogram/cauchy.rb +2 -2
- data/examples/histogram/exponential.rb +1 -1
- data/examples/histogram/histo3d.rb +1 -1
- data/examples/histogram/histogram-pdf.rb +2 -2
- data/examples/histogram/xexp.rb +1 -1
- data/examples/integration/ahmed.rb +2 -2
- data/examples/integration/cosmology.rb +7 -7
- data/examples/integration/friedmann.rb +4 -4
- data/examples/integration/qng.rb +1 -1
- data/examples/interp/demo.rb +2 -2
- data/examples/linalg/LQ_solve.rb +1 -1
- data/examples/linalg/LU.rb +1 -1
- data/examples/linalg/LU2.rb +1 -1
- data/examples/linalg/LU_narray.rb +1 -1
- data/examples/linalg/PTLQ.rb +1 -1
- data/examples/linalg/QRPT.rb +1 -1
- data/examples/linalg/chol.rb +1 -1
- data/examples/linalg/chol_narray.rb +1 -1
- data/examples/linalg/complex.rb +1 -1
- data/examples/math/elementary.rb +1 -1
- data/examples/math/functions.rb +1 -1
- data/examples/math/inf_nan.rb +1 -1
- data/examples/math/minmax.rb +1 -1
- data/examples/math/power.rb +1 -1
- data/examples/math/test.rb +1 -1
- data/examples/min.rb +1 -1
- data/examples/multimin/bundle.rb +1 -1
- data/examples/multimin/cqp.rb +17 -17
- data/examples/multiroot/fsolver3.rb +1 -1
- data/examples/odeiv/binarysystem.rb +12 -12
- data/examples/odeiv/demo.rb +3 -3
- data/examples/odeiv/frei1.rb +7 -7
- data/examples/odeiv/frei2.rb +4 -4
- data/examples/odeiv/oscillator.rb +1 -1
- data/examples/odeiv/sedov.rb +3 -3
- data/examples/odeiv/whitedwarf.rb +11 -11
- data/examples/permutation/ex1.rb +2 -2
- data/examples/permutation/permutation.rb +1 -1
- data/examples/poly/demo.rb +1 -1
- data/examples/random/diffusion.rb +1 -1
- data/examples/random/generator.rb +2 -2
- data/examples/random/randomwalk.rb +3 -3
- data/examples/random/rng.rb +1 -1
- data/examples/roots/bisection.rb +1 -1
- data/examples/roots/brent.rb +1 -1
- data/examples/roots/demo.rb +1 -1
- data/examples/roots/newton.rb +2 -2
- data/examples/roots/recombination.gp +0 -1
- data/examples/sf/hyperg.rb +1 -1
- data/examples/sf/sphbessel.rb +1 -1
- data/examples/sort/sort.rb +1 -1
- data/examples/tamu_anova.rb +4 -4
- data/examples/vector/add.rb +1 -1
- data/examples/vector/decimate.rb +1 -1
- data/examples/vector/gnuplot.rb +8 -8
- data/examples/vector/vector.rb +2 -2
- data/examples/wavelet/wavelet1.rb +1 -1
- data/ext/{gsl → gsl_native}/alf.c +9 -9
- data/ext/{gsl → gsl_native}/array.c +64 -151
- data/ext/{gsl → gsl_native}/array_complex.c +61 -63
- data/ext/{gsl → gsl_native}/blas.c +0 -0
- data/ext/{gsl → gsl_native}/blas1.c +32 -32
- data/ext/{gsl → gsl_native}/blas2.c +54 -58
- data/ext/{gsl → gsl_native}/blas3.c +54 -54
- data/ext/{gsl → gsl_native}/block.c +3 -6
- data/ext/{gsl/block_source.c → gsl_native/block_source.h} +109 -111
- data/ext/gsl_native/bspline.c +122 -0
- data/ext/{gsl → gsl_native}/bundle.c +0 -0
- data/ext/{gsl → gsl_native}/cdf.c +76 -88
- data/ext/{gsl → gsl_native}/cheb.c +74 -85
- data/ext/{gsl → gsl_native}/combination.c +9 -16
- data/ext/{gsl → gsl_native}/common.c +7 -37
- data/ext/{gsl → gsl_native}/complex.c +113 -115
- data/ext/gsl_native/const.c +331 -0
- data/ext/{gsl → gsl_native}/const_additional.c +12 -33
- data/ext/gsl_native/cqp.c +283 -0
- data/ext/{gsl → gsl_native}/deriv.c +22 -30
- data/ext/{gsl → gsl_native}/dht.c +20 -28
- data/ext/{gsl → gsl_native}/diff.c +23 -25
- data/ext/{gsl → gsl_native}/dirac.c +44 -45
- data/ext/{gsl → gsl_native}/eigen.c +1031 -1082
- data/ext/{gsl → gsl_native}/error.c +13 -13
- data/ext/{gsl → gsl_native}/extconf.rb +5 -13
- data/ext/{gsl → gsl_native}/fft.c +192 -198
- data/ext/{gsl → gsl_native}/fit.c +16 -16
- data/ext/gsl_native/fresnel.c +312 -0
- data/ext/{gsl → gsl_native}/function.c +29 -35
- data/ext/{gsl → gsl_native}/geometry.c +15 -15
- data/ext/{gsl → gsl_native}/graph.c +37 -87
- data/ext/{gsl → gsl_native}/gsl.c +10 -23
- data/ext/{gsl → gsl_native}/gsl_narray.c +15 -24
- data/ext/{gsl → gsl_native}/histogram.c +123 -150
- data/ext/{gsl → gsl_native}/histogram2d.c +71 -96
- data/ext/{gsl → gsl_native}/histogram3d.c +72 -72
- data/ext/{gsl → gsl_native}/histogram3d_source.c +195 -196
- data/ext/{gsl → gsl_native}/histogram_find.c +31 -33
- data/ext/{gsl → gsl_native}/histogram_oper.c +43 -52
- data/ext/{gsl → gsl_native}/ieee.c +7 -15
- data/ext/{gsl → gsl_native}/include/rb_gsl.h +0 -7
- data/ext/{gsl → gsl_native}/include/rb_gsl_array.h +15 -25
- data/ext/{gsl → gsl_native}/include/rb_gsl_cheb.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_common.h +44 -52
- data/ext/{gsl → gsl_native}/include/rb_gsl_complex.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_const.h +0 -5
- data/ext/{gsl → gsl_native}/include/rb_gsl_dirac.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_eigen.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_fft.h +0 -3
- data/ext/{gsl → gsl_native}/include/rb_gsl_fit.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_function.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_graph.h +2 -2
- data/ext/{gsl → gsl_native}/include/rb_gsl_histogram.h +8 -8
- data/ext/{gsl → gsl_native}/include/rb_gsl_histogram3d.h +50 -50
- data/ext/{gsl → gsl_native}/include/rb_gsl_integration.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_interp.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_linalg.h +0 -1
- data/ext/{gsl → gsl_native}/include/rb_gsl_math.h +0 -4
- data/ext/{gsl → gsl_native}/include/rb_gsl_odeiv.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_poly.h +3 -3
- data/ext/{gsl → gsl_native}/include/rb_gsl_rational.h +1 -1
- data/ext/{gsl → gsl_native}/include/rb_gsl_rng.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_root.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_sf.h +39 -43
- data/ext/{gsl → gsl_native}/include/rb_gsl_statistics.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_tensor.h +0 -0
- data/ext/{gsl → gsl_native}/include/rb_gsl_with_narray.h +0 -0
- data/ext/{gsl → gsl_native}/include/templates_off.h +0 -0
- data/ext/{gsl → gsl_native}/include/templates_on.h +1 -1
- data/ext/{gsl → gsl_native}/integration.c +160 -183
- data/ext/{gsl → gsl_native}/interp.c +23 -31
- data/ext/gsl_native/jacobi.c +733 -0
- data/ext/{gsl → gsl_native}/linalg.c +448 -576
- data/ext/{gsl → gsl_native}/linalg_complex.c +84 -98
- data/ext/{gsl → gsl_native}/math.c +45 -63
- data/ext/{gsl → gsl_native}/matrix.c +4 -6
- data/ext/{gsl → gsl_native}/matrix_complex.c +111 -114
- data/ext/{gsl → gsl_native}/matrix_double.c +74 -77
- data/ext/{gsl → gsl_native}/matrix_int.c +49 -50
- data/ext/{gsl/matrix_source.c → gsl_native/matrix_source.h} +280 -302
- data/ext/{gsl → gsl_native}/min.c +43 -74
- data/ext/{gsl → gsl_native}/monte.c +45 -59
- data/ext/{gsl → gsl_native}/multifit.c +138 -147
- data/ext/{gsl → gsl_native}/multimin.c +55 -83
- data/ext/{gsl → gsl_native}/multimin_fsdf.c +15 -15
- data/ext/{gsl → gsl_native}/multiroots.c +61 -64
- data/ext/{gsl → gsl_native}/multiset.c +3 -7
- data/ext/{gsl → gsl_native}/ndlinear.c +320 -321
- data/ext/{gsl → gsl_native}/nmf.c +11 -11
- data/ext/{gsl → gsl_native}/nmf_wrap.c +1 -1
- data/ext/{gsl → gsl_native}/ntuple.c +13 -13
- data/ext/{gsl → gsl_native}/odeiv.c +95 -106
- data/ext/gsl_native/ool.c +879 -0
- data/ext/{gsl → gsl_native}/permutation.c +36 -34
- data/ext/{gsl → gsl_native}/poly.c +2 -5
- data/ext/{gsl → gsl_native}/poly2.c +6 -6
- data/ext/{gsl/poly_source.c → gsl_native/poly_source.h} +232 -275
- data/ext/{gsl → gsl_native}/qrng.c +6 -17
- data/ext/{gsl → gsl_native}/randist.c +218 -243
- data/ext/{gsl → gsl_native}/rational.c +9 -9
- data/ext/{gsl → gsl_native}/rng.c +29 -45
- data/ext/{gsl → gsl_native}/root.c +43 -43
- data/ext/{gsl → gsl_native}/sf.c +163 -197
- data/ext/{gsl → gsl_native}/sf_airy.c +0 -0
- data/ext/{gsl → gsl_native}/sf_bessel.c +6 -6
- data/ext/{gsl → gsl_native}/sf_clausen.c +0 -0
- data/ext/{gsl → gsl_native}/sf_coulomb.c +39 -39
- data/ext/{gsl → gsl_native}/sf_coupling.c +29 -29
- data/ext/{gsl → gsl_native}/sf_dawson.c +0 -0
- data/ext/{gsl → gsl_native}/sf_debye.c +0 -9
- data/ext/{gsl → gsl_native}/sf_dilog.c +0 -0
- data/ext/{gsl → gsl_native}/sf_elementary.c +2 -2
- data/ext/{gsl → gsl_native}/sf_ellint.c +42 -42
- data/ext/{gsl → gsl_native}/sf_elljac.c +2 -2
- data/ext/{gsl → gsl_native}/sf_erfc.c +0 -4
- data/ext/{gsl → gsl_native}/sf_exp.c +2 -2
- data/ext/{gsl → gsl_native}/sf_expint.c +1 -11
- data/ext/{gsl → gsl_native}/sf_fermi_dirac.c +0 -0
- data/ext/{gsl → gsl_native}/sf_gamma.c +1 -5
- data/ext/{gsl → gsl_native}/sf_gegenbauer.c +0 -0
- data/ext/{gsl → gsl_native}/sf_hyperg.c +0 -0
- data/ext/{gsl → gsl_native}/sf_laguerre.c +3 -3
- data/ext/{gsl → gsl_native}/sf_lambert.c +0 -0
- data/ext/{gsl → gsl_native}/sf_legendre.c +0 -0
- data/ext/{gsl → gsl_native}/sf_log.c +3 -3
- data/ext/gsl_native/sf_mathieu.c +235 -0
- data/ext/{gsl → gsl_native}/sf_power.c +0 -0
- data/ext/{gsl → gsl_native}/sf_psi.c +2 -11
- data/ext/{gsl → gsl_native}/sf_synchrotron.c +0 -0
- data/ext/{gsl → gsl_native}/sf_transport.c +0 -0
- data/ext/{gsl → gsl_native}/sf_trigonometric.c +3 -3
- data/ext/{gsl → gsl_native}/sf_zeta.c +0 -4
- data/ext/{gsl → gsl_native}/signal.c +60 -64
- data/ext/{gsl → gsl_native}/siman.c +36 -40
- data/ext/{gsl → gsl_native}/sort.c +3 -4
- data/ext/{gsl → gsl_native}/spline.c +25 -43
- data/ext/{gsl → gsl_native}/stats.c +102 -115
- data/ext/{gsl → gsl_native}/sum.c +32 -32
- data/ext/{gsl → gsl_native}/tamu_anova.c +0 -0
- data/ext/{gsl → gsl_native}/tensor.c +2 -4
- data/ext/{gsl/tensor_source.c → gsl_native/tensor_source.h} +144 -144
- data/ext/{gsl → gsl_native}/vector.c +2 -4
- data/ext/{gsl → gsl_native}/vector_complex.c +165 -171
- data/ext/{gsl → gsl_native}/vector_double.c +167 -174
- data/ext/{gsl → gsl_native}/vector_int.c +23 -25
- data/ext/{gsl/vector_source.c → gsl_native/vector_source.h} +400 -414
- data/ext/{gsl → gsl_native}/wavelet.c +215 -236
- data/lib/gsl.rb +1 -7
- data/lib/gsl/gnuplot.rb +2 -2
- data/lib/gsl/version.rb +1 -3
- data/rb-gsl.gemspec +29 -0
- data/rdoc/blas.rdoc +3 -3
- data/rdoc/bspline.rdoc +7 -7
- data/rdoc/cheb.rdoc +8 -8
- data/rdoc/cholesky_complex.rdoc +1 -1
- data/rdoc/combi.rdoc +9 -9
- data/rdoc/complex.rdoc +11 -11
- data/rdoc/const.rdoc +20 -20
- data/rdoc/dht.rdoc +6 -6
- data/rdoc/diff.rdoc +6 -6
- data/rdoc/ehandling.rdoc +3 -3
- data/rdoc/eigen.rdoc +11 -11
- data/rdoc/fft.rdoc +26 -26
- data/rdoc/fit.rdoc +18 -18
- data/rdoc/graph.rdoc +2 -2
- data/rdoc/hist.rdoc +16 -16
- data/rdoc/hist2d.rdoc +4 -4
- data/rdoc/hist3d.rdoc +3 -3
- data/rdoc/integration.rdoc +16 -16
- data/rdoc/interp.rdoc +11 -11
- data/rdoc/intro.rdoc +3 -3
- data/rdoc/linalg.rdoc +20 -20
- data/rdoc/linalg_complex.rdoc +1 -1
- data/rdoc/math.rdoc +13 -13
- data/rdoc/matrix.rdoc +22 -22
- data/rdoc/min.rdoc +9 -9
- data/rdoc/monte.rdoc +3 -3
- data/rdoc/multimin.rdoc +12 -12
- data/rdoc/multiroot.rdoc +12 -12
- data/rdoc/narray.rdoc +9 -9
- data/rdoc/ndlinear.rdoc +4 -4
- data/rdoc/nonlinearfit.rdoc +17 -17
- data/rdoc/ntuple.rdoc +5 -5
- data/rdoc/odeiv.rdoc +12 -12
- data/rdoc/perm.rdoc +11 -11
- data/rdoc/poly.rdoc +17 -17
- data/rdoc/qrng.rdoc +9 -9
- data/rdoc/randist.rdoc +10 -10
- data/rdoc/ref.rdoc +49 -49
- data/rdoc/rng.rdoc +9 -9
- data/rdoc/roots.rdoc +12 -12
- data/rdoc/sf.rdoc +35 -35
- data/rdoc/siman.rdoc +3 -3
- data/rdoc/sort.rdoc +6 -6
- data/rdoc/start.rdoc +2 -2
- data/rdoc/stats.rdoc +13 -13
- data/rdoc/sum.rdoc +4 -4
- data/rdoc/tensor.rdoc +3 -3
- data/rdoc/tut.rdoc +1 -1
- data/rdoc/use.rdoc +3 -3
- data/rdoc/vector.rdoc +28 -28
- data/rdoc/vector_complex.rdoc +6 -6
- data/rdoc/wavelet.rdoc +8 -8
- data/test/gsl/blas_test.rb +1 -1
- data/test/gsl/index_test.rb +61 -0
- data/test/gsl/matrix_test.rb +21 -0
- data/uncrustify.cfg +1693 -0
- metadata +212 -243
- data/README +0 -28
- data/ext/gsl/bspline.c +0 -130
- data/ext/gsl/const.c +0 -672
- data/ext/gsl/cqp.c +0 -283
- data/ext/gsl/fcmp.c +0 -64
- data/ext/gsl/fresnel.c +0 -312
- data/ext/gsl/jacobi.c +0 -739
- data/ext/gsl/ool.c +0 -879
- data/ext/gsl/oper_complex_source.c +0 -251
- data/ext/gsl/sf_mathieu.c +0 -238
- data/rdoc/index.rdoc +0 -50
@@ -13,56 +13,50 @@
|
|
13
13
|
#include "include/rb_gsl_function.h"
|
14
14
|
#include <gsl/gsl_min.h>
|
15
15
|
|
16
|
-
double rb_gsl_function_f(double x, void *p);
|
16
|
+
double rb_gsl_function_f(double x, void *p);
|
17
17
|
|
18
18
|
enum {
|
19
19
|
GSL_MIN_FMINIMIZER_GOLDENSECTION,
|
20
20
|
GSL_MIN_FMINIMIZER_BRENT,
|
21
|
-
#ifdef GSL_1_13_LATER
|
22
21
|
GSL_MIN_FMINIMIZER_QUAD_GOLDEN,
|
23
|
-
#endif
|
24
22
|
};
|
25
23
|
static const gsl_min_fminimizer_type* rb_gsl_min_fminimizer_type_get(VALUE t);
|
26
24
|
|
27
|
-
static const gsl_min_fminimizer_type* rb_gsl_min_fminimizer_type_get(VALUE t)
|
25
|
+
static const gsl_min_fminimizer_type* rb_gsl_min_fminimizer_type_get(VALUE t)
|
28
26
|
{
|
29
27
|
char name[32];
|
30
28
|
switch (TYPE(t)) {
|
31
29
|
case T_STRING:
|
32
30
|
strcpy(name, STR2CSTR(t));
|
33
|
-
if (str_tail_grep(name, "goldensection") == 0)
|
31
|
+
if (str_tail_grep(name, "goldensection") == 0)
|
34
32
|
return gsl_min_fminimizer_goldensection;
|
35
|
-
else if (str_tail_grep(name, "brent") == 0)
|
33
|
+
else if (str_tail_grep(name, "brent") == 0)
|
36
34
|
return gsl_min_fminimizer_brent;
|
37
|
-
|
38
|
-
else if (str_tail_grep(name, "quad_golden") == 0)
|
35
|
+
else if (str_tail_grep(name, "quad_golden") == 0)
|
39
36
|
return gsl_min_fminimizer_quad_golden;
|
40
|
-
|
41
|
-
else
|
37
|
+
else
|
42
38
|
rb_raise(rb_eTypeError, "unknown type %s (goldensection, brent or quad_golden expected)",
|
43
|
-
|
39
|
+
name);
|
44
40
|
break;
|
45
41
|
case T_FIXNUM:
|
46
42
|
switch (FIX2INT(t)) {
|
47
|
-
case GSL_MIN_FMINIMIZER_GOLDENSECTION:
|
48
|
-
return gsl_min_fminimizer_goldensection;
|
43
|
+
case GSL_MIN_FMINIMIZER_GOLDENSECTION:
|
44
|
+
return gsl_min_fminimizer_goldensection;
|
49
45
|
break;
|
50
|
-
case GSL_MIN_FMINIMIZER_BRENT:
|
51
|
-
return gsl_min_fminimizer_brent;
|
46
|
+
case GSL_MIN_FMINIMIZER_BRENT:
|
47
|
+
return gsl_min_fminimizer_brent;
|
52
48
|
break;
|
53
|
-
|
54
|
-
|
55
|
-
return gsl_min_fminimizer_quad_golden;
|
49
|
+
case GSL_MIN_FMINIMIZER_QUAD_GOLDEN:
|
50
|
+
return gsl_min_fminimizer_quad_golden;
|
56
51
|
break;
|
57
|
-
|
58
|
-
|
59
|
-
rb_raise(rb_eTypeError, "unknown type (GOLDENSECION or BRENT or QUAD_GOLDEN expected)");
|
52
|
+
default:
|
53
|
+
rb_raise(rb_eTypeError, "unknown type (GOLDENSECION or BRENT or QUAD_GOLDEN expected)");
|
60
54
|
break;
|
61
55
|
}
|
62
56
|
break;
|
63
57
|
default:
|
64
58
|
rb_raise(rb_eTypeError, "wrong argument type %s (String of Fixnum)",
|
65
|
-
|
59
|
+
rb_class2name(CLASS_OF(t)));
|
66
60
|
break;
|
67
61
|
}
|
68
62
|
}
|
@@ -83,35 +77,35 @@ static VALUE rb_gsl_min_fminimizer_name(VALUE obj)
|
|
83
77
|
return rb_str_new2(gsl_min_fminimizer_name(gmf));
|
84
78
|
}
|
85
79
|
|
86
|
-
static VALUE rb_gsl_min_fminimizer_set(VALUE obj, VALUE ff, VALUE xmin,
|
87
|
-
|
80
|
+
static VALUE rb_gsl_min_fminimizer_set(VALUE obj, VALUE ff, VALUE xmin,
|
81
|
+
VALUE xl, VALUE xu)
|
88
82
|
{
|
89
83
|
gsl_min_fminimizer *gmf = NULL;
|
90
84
|
gsl_function *f = NULL;
|
91
|
-
Need_Float(xmin); Need_Float(xl); Need_Float(xu);
|
85
|
+
Need_Float(xmin); Need_Float(xl); Need_Float(xu);
|
92
86
|
CHECK_FUNCTION(ff);
|
93
87
|
Data_Get_Struct(obj, gsl_min_fminimizer, gmf);
|
94
88
|
Data_Get_Struct(ff, gsl_function, f);
|
95
|
-
return INT2FIX(gsl_min_fminimizer_set(gmf, f, NUM2DBL(xmin),
|
96
|
-
|
89
|
+
return INT2FIX(gsl_min_fminimizer_set(gmf, f, NUM2DBL(xmin),
|
90
|
+
NUM2DBL(xl), NUM2DBL(xu)));
|
97
91
|
}
|
98
92
|
|
99
|
-
static VALUE rb_gsl_min_fminimizer_set_with_values(VALUE obj, VALUE ff,
|
100
|
-
|
101
|
-
|
102
|
-
|
93
|
+
static VALUE rb_gsl_min_fminimizer_set_with_values(VALUE obj, VALUE ff,
|
94
|
+
VALUE xmin, VALUE fmin,
|
95
|
+
VALUE xl, VALUE fl,
|
96
|
+
VALUE xu, VALUE fu)
|
103
97
|
{
|
104
98
|
gsl_min_fminimizer *gmf = NULL;
|
105
99
|
gsl_function *f = NULL;
|
106
|
-
Need_Float(xmin); Need_Float(xl); Need_Float(xu);
|
107
|
-
Need_Float(fl); Need_Float(fu);
|
100
|
+
Need_Float(xmin); Need_Float(xl); Need_Float(xu);
|
101
|
+
Need_Float(fl); Need_Float(fu);
|
108
102
|
CHECK_FUNCTION(ff);
|
109
103
|
Data_Get_Struct(obj, gsl_min_fminimizer, gmf);
|
110
104
|
Data_Get_Struct(ff, gsl_function, f);
|
111
|
-
return INT2FIX(gsl_min_fminimizer_set_with_values(gmf, f, NUM2DBL(xmin),
|
112
|
-
|
113
|
-
|
114
|
-
|
105
|
+
return INT2FIX(gsl_min_fminimizer_set_with_values(gmf, f, NUM2DBL(xmin),
|
106
|
+
NUM2DBL(fmin),
|
107
|
+
NUM2DBL(xl), NUM2DBL(fl),
|
108
|
+
NUM2DBL(xu), NUM2DBL(fu)));
|
115
109
|
}
|
116
110
|
|
117
111
|
static VALUE rb_gsl_min_fminimizer_iterate(VALUE obj)
|
@@ -135,29 +129,6 @@ static VALUE rb_gsl_min_fminimizer_x_upper(VALUE obj)
|
|
135
129
|
return rb_float_new(gsl_min_fminimizer_x_upper(gmf));
|
136
130
|
}
|
137
131
|
|
138
|
-
#ifndef GSL_1_2_LATER
|
139
|
-
static double gsl_min_fminimizer_x_minimum(const gsl_min_fminimizer * s)
|
140
|
-
{
|
141
|
-
/* return s->x_minimum;*/
|
142
|
-
return s->minimum;
|
143
|
-
}
|
144
|
-
|
145
|
-
static double gsl_min_fminimizer_f_minimum(const gsl_min_fminimizer * s)
|
146
|
-
{
|
147
|
-
return s->f_minimum;
|
148
|
-
}
|
149
|
-
|
150
|
-
static double gsl_min_fminimizer_f_lower(const gsl_min_fminimizer * s)
|
151
|
-
{
|
152
|
-
return s->f_lower;
|
153
|
-
}
|
154
|
-
|
155
|
-
static double gsl_min_fminimizer_f_upper(const gsl_min_fminimizer * s)
|
156
|
-
{
|
157
|
-
return s->f_upper;
|
158
|
-
}
|
159
|
-
#endif
|
160
|
-
|
161
132
|
static VALUE rb_gsl_min_fminimizer_x_minimum(VALUE obj)
|
162
133
|
{
|
163
134
|
gsl_min_fminimizer *gmf = NULL;
|
@@ -198,12 +169,12 @@ static VALUE rb_gsl_min_fminimizer_test_interval(VALUE obj, VALUE ea, VALUE er)
|
|
198
169
|
}
|
199
170
|
|
200
171
|
static VALUE rb_gsl_fminimizer_test_interval(VALUE obj, VALUE xl, VALUE xu,
|
201
|
-
|
172
|
+
VALUE ea, VALUE er)
|
202
173
|
{
|
203
174
|
Need_Float(xl); Need_Float(xu);
|
204
175
|
Need_Float(ea); Need_Float(er);
|
205
176
|
return INT2FIX(gsl_min_test_interval(NUM2DBL(xl), NUM2DBL(xu),
|
206
|
-
|
177
|
+
NUM2DBL(ea), NUM2DBL(er)));
|
207
178
|
}
|
208
179
|
|
209
180
|
void Init_gsl_min(VALUE module)
|
@@ -211,21 +182,19 @@ void Init_gsl_min(VALUE module)
|
|
211
182
|
VALUE mgsl_min, cgsl_fminimizer;
|
212
183
|
|
213
184
|
mgsl_min = rb_define_module_under(module, "Min");
|
214
|
-
|
185
|
+
|
215
186
|
cgsl_fminimizer = rb_define_class_under(mgsl_min, "FMinimizer", cGSL_Object);
|
216
187
|
|
217
|
-
rb_define_const(cgsl_fminimizer, "GOLDENSECTION",
|
218
|
-
|
219
|
-
rb_define_const(cgsl_fminimizer, "Goldensection",
|
220
|
-
|
188
|
+
rb_define_const(cgsl_fminimizer, "GOLDENSECTION",
|
189
|
+
INT2FIX(GSL_MIN_FMINIMIZER_GOLDENSECTION));
|
190
|
+
rb_define_const(cgsl_fminimizer, "Goldensection",
|
191
|
+
INT2FIX(GSL_MIN_FMINIMIZER_GOLDENSECTION));
|
221
192
|
rb_define_const(cgsl_fminimizer, "BRENT",
|
222
|
-
|
193
|
+
INT2FIX(GSL_MIN_FMINIMIZER_BRENT));
|
223
194
|
rb_define_const(cgsl_fminimizer, "Brent",
|
224
|
-
|
225
|
-
#ifdef GSL_1_13_LATER
|
195
|
+
INT2FIX(GSL_MIN_FMINIMIZER_BRENT));
|
226
196
|
rb_define_const(cgsl_fminimizer, "QUAD_GOLDEN",
|
227
|
-
|
228
|
-
#endif
|
197
|
+
INT2FIX(GSL_MIN_FMINIMIZER_QUAD_GOLDEN));
|
229
198
|
|
230
199
|
rb_define_singleton_method(cgsl_fminimizer, "new", rb_gsl_min_fminimizer_new, 1);
|
231
200
|
rb_define_singleton_method(cgsl_fminimizer, "alloc", rb_gsl_min_fminimizer_new, 1);
|
@@ -239,8 +208,8 @@ void Init_gsl_min(VALUE module)
|
|
239
208
|
rb_define_method(cgsl_fminimizer, "x_upper", rb_gsl_min_fminimizer_x_upper, 0);
|
240
209
|
rb_define_method(cgsl_fminimizer, "test_interval", rb_gsl_min_fminimizer_test_interval, 2);
|
241
210
|
|
242
|
-
rb_define_singleton_method(mgsl_min, "test_interval",
|
243
|
-
|
211
|
+
rb_define_singleton_method(mgsl_min, "test_interval",
|
212
|
+
rb_gsl_fminimizer_test_interval, 4);
|
244
213
|
|
245
214
|
rb_define_method(cgsl_fminimizer, "x_minimum", rb_gsl_min_fminimizer_x_minimum, 0);
|
246
215
|
rb_define_method(cgsl_fminimizer, "f_minimum", rb_gsl_min_fminimizer_f_minimum, 0);
|
@@ -16,7 +16,7 @@
|
|
16
16
|
#include <gsl/gsl_monte_vegas.h>
|
17
17
|
|
18
18
|
#ifndef CHECK_MONTE_FUNCTION
|
19
|
-
#define CHECK_MONTE_FUNCTION(x) if(!rb_obj_is_kind_of(x,cgsl_monte_function))\
|
19
|
+
#define CHECK_MONTE_FUNCTION(x) if(!rb_obj_is_kind_of(x,cgsl_monte_function)) \
|
20
20
|
rb_raise(rb_eTypeError, "wrong type (Function expected)");
|
21
21
|
#endif
|
22
22
|
|
@@ -24,9 +24,7 @@ static VALUE cgsl_monte_plain;
|
|
24
24
|
static VALUE cgsl_monte_miser;
|
25
25
|
static VALUE cgsl_monte_vegas;
|
26
26
|
static VALUE cgsl_monte_function;
|
27
|
-
#ifdef GSL_1_13_LATER
|
28
27
|
static VALUE cgsl_monte_miser_params, cgsl_monte_vegas_params;
|
29
|
-
#endif
|
30
28
|
EXTERN VALUE cgsl_vector;
|
31
29
|
|
32
30
|
enum {
|
@@ -102,7 +100,7 @@ static VALUE rb_gsl_monte_function_new(int argc, VALUE *argv, VALUE klass)
|
|
102
100
|
obj = Data_Wrap_Struct(klass, gsl_monte_function_mark, gsl_monte_function_free, f);
|
103
101
|
rb_gsl_monte_function_set_f(argc, argv, obj);
|
104
102
|
return obj;
|
105
|
-
}
|
103
|
+
}
|
106
104
|
|
107
105
|
static double rb_gsl_monte_function_f(double *x, size_t dim, void *p)
|
108
106
|
{
|
@@ -237,16 +235,16 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
|
|
237
235
|
int itmp = 0, flagr = 0, type;
|
238
236
|
double result, abserr;
|
239
237
|
|
240
|
-
if (argc < 4)
|
238
|
+
if (argc < 4)
|
241
239
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for >= 4)", argc);
|
242
240
|
switch (TYPE(obj)) {
|
243
241
|
case T_MODULE:
|
244
242
|
case T_CLASS:
|
245
243
|
case T_OBJECT:
|
246
244
|
if (!rb_obj_is_kind_of(argv[0], cgsl_monte_function))
|
247
|
-
rb_raise(rb_eTypeError,
|
248
|
-
|
249
|
-
|
245
|
+
rb_raise(rb_eTypeError,
|
246
|
+
"wrong type argument %s (GSL::Monte::Function expected)",
|
247
|
+
rb_class2name(CLASS_OF(argv[0])));
|
250
248
|
Data_Get_Struct(argv[0], gsl_monte_function, F);
|
251
249
|
itmp = 1;
|
252
250
|
break;
|
@@ -267,14 +265,12 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
|
|
267
265
|
dim = F->dim;
|
268
266
|
calls = FIX2INT(argv[itmp+2]);
|
269
267
|
}
|
270
|
-
|
271
268
|
if (rb_obj_is_kind_of(argv[argc-2], cgsl_rng)) {
|
272
269
|
Data_Get_Struct(argv[argc-2], gsl_rng, r);
|
273
270
|
} else {
|
274
271
|
r = gsl_rng_alloc(gsl_rng_default);
|
275
272
|
flagr = 1;
|
276
273
|
}
|
277
|
-
|
278
274
|
type = get_monte_type(argv[argc-1]);
|
279
275
|
|
280
276
|
switch (type) {
|
@@ -285,8 +281,8 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
|
|
285
281
|
gsl_monte_plain_init(plain);
|
286
282
|
} else {
|
287
283
|
if (!rb_obj_is_kind_of(argv[argc-1], cgsl_monte_plain))
|
288
|
-
|
289
|
-
|
284
|
+
rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Plain expected)",
|
285
|
+
rb_class2name(CLASS_OF(argv[argc-1])));
|
290
286
|
Data_Get_Struct(argv[argc-1], gsl_monte_plain_state, plain);
|
291
287
|
}
|
292
288
|
gsl_monte_plain_integrate(F, xl->data, xu->data, dim, calls, r, plain, &result, &abserr);
|
@@ -299,8 +295,8 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
|
|
299
295
|
gsl_monte_miser_init(miser);
|
300
296
|
} else {
|
301
297
|
if (!rb_obj_is_kind_of(argv[argc-1], cgsl_monte_miser))
|
302
|
-
|
303
|
-
|
298
|
+
rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Miser expected)",
|
299
|
+
rb_class2name(CLASS_OF(argv[argc-1])));
|
304
300
|
Data_Get_Struct(argv[argc-1], gsl_monte_miser_state, miser);
|
305
301
|
}
|
306
302
|
gsl_monte_miser_integrate(F, xl->data, xu->data, dim, calls, r, miser, &result, &abserr);
|
@@ -312,10 +308,9 @@ static VALUE rb_gsl_monte_integrate(int argc, VALUE *argv, VALUE obj)
|
|
312
308
|
vegas = gsl_monte_vegas_alloc(dim);
|
313
309
|
gsl_monte_vegas_init(vegas);
|
314
310
|
} else { if (!rb_obj_is_kind_of(argv[argc-1], cgsl_monte_vegas))
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
}
|
311
|
+
rb_raise(rb_eTypeError, "wrong argument type %s (Monte::Vegas expected)",
|
312
|
+
rb_class2name(CLASS_OF(argv[argc-1])));
|
313
|
+
Data_Get_Struct(argv[argc-1], gsl_monte_vegas_state, vegas); }
|
319
314
|
gsl_monte_vegas_integrate(F, xl->data, xu->data, dim, calls, r, vegas, &result, &abserr);
|
320
315
|
if (type > 100) gsl_monte_vegas_free(vegas);
|
321
316
|
break;
|
@@ -334,7 +329,7 @@ static VALUE rb_gsl_monte_plain_integrate(int argc, VALUE *argv, VALUE obj)
|
|
334
329
|
int flagr = 0;
|
335
330
|
double result, abserr;
|
336
331
|
|
337
|
-
if (argc < 4)
|
332
|
+
if (argc < 4)
|
338
333
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 4, 5 or 6)", argc);
|
339
334
|
CHECK_MONTE_FUNCTION(argv[0]);
|
340
335
|
CHECK_VECTOR(argv[1]); CHECK_VECTOR(argv[2]);
|
@@ -349,15 +344,14 @@ static VALUE rb_gsl_monte_plain_integrate(int argc, VALUE *argv, VALUE obj)
|
|
349
344
|
dim = F->dim;
|
350
345
|
calls = FIX2INT(argv[3]);
|
351
346
|
}
|
352
|
-
|
353
347
|
if (rb_obj_is_kind_of(argv[argc-1], cgsl_rng)) {
|
354
348
|
Data_Get_Struct(argv[argc-1], gsl_rng, r);
|
355
349
|
} else {
|
356
350
|
r = gsl_rng_alloc(gsl_rng_default);
|
357
351
|
flagr = 1;
|
358
352
|
}
|
359
|
-
gsl_monte_plain_integrate(F, xl->data, xu->data, dim, calls, r, plain,
|
360
|
-
|
353
|
+
gsl_monte_plain_integrate(F, xl->data, xu->data, dim, calls, r, plain,
|
354
|
+
&result, &abserr);
|
361
355
|
if (flagr == 1) gsl_rng_free(r);
|
362
356
|
return rb_ary_new3(2, rb_float_new(result), rb_float_new(abserr));
|
363
357
|
}
|
@@ -387,15 +381,14 @@ static VALUE rb_gsl_monte_miser_integrate(int argc, VALUE *argv, VALUE obj)
|
|
387
381
|
dim = F->dim;
|
388
382
|
calls = FIX2INT(argv[3]);
|
389
383
|
}
|
390
|
-
|
391
384
|
if (rb_obj_is_kind_of(argv[argc-1], cgsl_rng)) {
|
392
385
|
Data_Get_Struct(argv[argc-1], gsl_rng, r);
|
393
386
|
} else {
|
394
387
|
r = gsl_rng_alloc(gsl_rng_default);
|
395
388
|
flagr = 1;
|
396
389
|
}
|
397
|
-
gsl_monte_miser_integrate(F, xl->data, xu->data, dim, calls, r, miser,
|
398
|
-
|
390
|
+
gsl_monte_miser_integrate(F, xl->data, xu->data, dim, calls, r, miser,
|
391
|
+
&result, &abserr);
|
399
392
|
if (flagr == 1) gsl_rng_free(r);
|
400
393
|
return rb_ary_new3(2, rb_float_new(result), rb_float_new(abserr));
|
401
394
|
}
|
@@ -410,7 +403,7 @@ static VALUE rb_gsl_monte_vegas_integrate(int argc, VALUE *argv, VALUE obj)
|
|
410
403
|
int flagr = 0;
|
411
404
|
double result, abserr;
|
412
405
|
|
413
|
-
if (argc < 4)
|
406
|
+
if (argc < 4)
|
414
407
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for >= 4)", argc);
|
415
408
|
CHECK_MONTE_FUNCTION(argv[0]);
|
416
409
|
CHECK_VECTOR(argv[1]); CHECK_VECTOR(argv[2]);
|
@@ -425,15 +418,14 @@ static VALUE rb_gsl_monte_vegas_integrate(int argc, VALUE *argv, VALUE obj)
|
|
425
418
|
dim = F->dim;
|
426
419
|
calls = FIX2INT(argv[3]);
|
427
420
|
}
|
428
|
-
|
429
421
|
if (rb_obj_is_kind_of(argv[argc-1], cgsl_rng)) {
|
430
422
|
Data_Get_Struct(argv[argc-1], gsl_rng, r);
|
431
423
|
} else {
|
432
424
|
r = gsl_rng_alloc(gsl_rng_default);
|
433
425
|
flagr = 1;
|
434
426
|
}
|
435
|
-
gsl_monte_vegas_integrate(F, xl->data, xu->data, dim, calls, r, vegas,
|
436
|
-
|
427
|
+
gsl_monte_vegas_integrate(F, xl->data, xu->data, dim, calls, r, vegas,
|
428
|
+
&result, &abserr);
|
437
429
|
if (flagr == 1) gsl_rng_free(r);
|
438
430
|
return rb_ary_new3(2, rb_float_new(result), rb_float_new(abserr));
|
439
431
|
}
|
@@ -447,7 +439,6 @@ static int get_monte_type(VALUE vt)
|
|
447
439
|
else {
|
448
440
|
/* do next */
|
449
441
|
}
|
450
|
-
|
451
442
|
switch(TYPE(vt)) {
|
452
443
|
case T_STRING:
|
453
444
|
strcpy(name, STR2CSTR(vt));
|
@@ -555,8 +546,8 @@ static VALUE rb_gsl_monte_miser_state(VALUE obj)
|
|
555
546
|
gsl_monte_miser_state *s = NULL;
|
556
547
|
Data_Get_Struct(obj, gsl_monte_miser_state, s);
|
557
548
|
return rb_ary_new3(5, rb_float_new(s->estimate_frac), INT2FIX(s->min_calls),
|
558
|
-
|
559
|
-
|
549
|
+
INT2FIX(s->min_calls_per_bisection), rb_float_new(s->alpha),
|
550
|
+
rb_float_new(s->dither));
|
560
551
|
}
|
561
552
|
|
562
553
|
static VALUE rb_gsl_monte_vegas_result(VALUE obj)
|
@@ -655,20 +646,19 @@ static VALUE rb_gsl_monte_vegas_state(VALUE obj)
|
|
655
646
|
{
|
656
647
|
gsl_monte_vegas_state *s = NULL;
|
657
648
|
Data_Get_Struct(obj, gsl_monte_vegas_state, s);
|
658
|
-
return rb_ary_new3(8, rb_float_new(s->result), rb_float_new(s->sigma),
|
659
|
-
|
660
|
-
|
661
|
-
|
649
|
+
return rb_ary_new3(8, rb_float_new(s->result), rb_float_new(s->sigma),
|
650
|
+
rb_float_new(s->chisq), rb_float_new(s->alpha),
|
651
|
+
INT2FIX(s->iterations), INT2FIX(s->stage),
|
652
|
+
INT2FIX(s->mode), INT2FIX(s->verbose));
|
662
653
|
}
|
663
654
|
|
664
|
-
#ifdef GSL_1_13_LATER
|
665
655
|
static VALUE rb_gsl_monte_miser_params_get(VALUE obj)
|
666
656
|
{
|
667
657
|
gsl_monte_miser_state *s = NULL;
|
668
658
|
gsl_monte_miser_params *p = NULL;
|
669
659
|
Data_Get_Struct(obj, gsl_monte_miser_state, s);
|
670
660
|
p = (gsl_monte_miser_params *) malloc(sizeof(gsl_monte_miser_params));
|
671
|
-
gsl_monte_miser_params_get(s, p);
|
661
|
+
gsl_monte_miser_params_get(s, p);
|
672
662
|
return Data_Wrap_Struct(cgsl_monte_miser_params, 0, free, p);
|
673
663
|
}
|
674
664
|
static VALUE rb_gsl_monte_miser_params_set(VALUE obj, VALUE params)
|
@@ -677,7 +667,7 @@ static VALUE rb_gsl_monte_miser_params_set(VALUE obj, VALUE params)
|
|
677
667
|
gsl_monte_miser_params *p = NULL;
|
678
668
|
Data_Get_Struct(obj, gsl_monte_miser_state, s);
|
679
669
|
Data_Get_Struct(params, gsl_monte_miser_params, p);
|
680
|
-
gsl_monte_miser_params_set(s, p);
|
670
|
+
gsl_monte_miser_params_set(s, p);
|
681
671
|
return Qtrue;
|
682
672
|
}
|
683
673
|
static VALUE rb_gsl_monte_miser_params_get_estimate_frac(VALUE obj)
|
@@ -752,7 +742,7 @@ static VALUE rb_gsl_monte_vegas_params_get(VALUE obj)
|
|
752
742
|
gsl_monte_vegas_params *p = NULL;
|
753
743
|
Data_Get_Struct(obj, gsl_monte_vegas_state, s);
|
754
744
|
p = (gsl_monte_vegas_params *) malloc(sizeof(gsl_monte_vegas_params));
|
755
|
-
gsl_monte_vegas_params_get(s, p);
|
745
|
+
gsl_monte_vegas_params_get(s, p);
|
756
746
|
return Data_Wrap_Struct(cgsl_monte_vegas_params, 0, free, p);
|
757
747
|
}
|
758
748
|
static VALUE rb_gsl_monte_vegas_params_set(VALUE obj, VALUE params)
|
@@ -761,7 +751,7 @@ static VALUE rb_gsl_monte_vegas_params_set(VALUE obj, VALUE params)
|
|
761
751
|
gsl_monte_vegas_params *p = NULL;
|
762
752
|
Data_Get_Struct(obj, gsl_monte_vegas_state, s);
|
763
753
|
Data_Get_Struct(params, gsl_monte_vegas_params, p);
|
764
|
-
gsl_monte_vegas_params_set(s, p);
|
754
|
+
gsl_monte_vegas_params_set(s, p);
|
765
755
|
return Qtrue;
|
766
756
|
}
|
767
757
|
static VALUE rb_gsl_monte_vegas_params_get_alpha(VALUE obj)
|
@@ -841,7 +831,6 @@ static VALUE rb_gsl_monte_vegas_runval(VALUE obj)
|
|
841
831
|
rb_ary_store(ary, 1, rb_float_new(sig));
|
842
832
|
return ary;
|
843
833
|
}
|
844
|
-
#endif
|
845
834
|
|
846
835
|
void Init_gsl_monte(VALUE module)
|
847
836
|
{
|
@@ -926,20 +915,19 @@ void Init_gsl_monte(VALUE module)
|
|
926
915
|
|
927
916
|
|
928
917
|
/*****/
|
929
|
-
rb_define_singleton_method(cgsl_monte_plain, "integrate",
|
930
|
-
|
931
|
-
rb_define_method(cgsl_monte_plain, "integrate",
|
932
|
-
|
933
|
-
rb_define_singleton_method(cgsl_monte_miser, "integrate",
|
934
|
-
|
935
|
-
rb_define_method(cgsl_monte_miser, "integrate",
|
936
|
-
|
937
|
-
rb_define_singleton_method(cgsl_monte_vegas, "integrate",
|
938
|
-
|
939
|
-
rb_define_method(cgsl_monte_vegas, "integrate",
|
940
|
-
|
941
|
-
|
942
|
-
#ifdef GSL_1_13_LATER
|
918
|
+
rb_define_singleton_method(cgsl_monte_plain, "integrate",
|
919
|
+
rb_gsl_monte_integrate, -1);
|
920
|
+
rb_define_method(cgsl_monte_plain, "integrate",
|
921
|
+
rb_gsl_monte_plain_integrate, -1);
|
922
|
+
rb_define_singleton_method(cgsl_monte_miser, "integrate",
|
923
|
+
rb_gsl_monte_integrate, -1);
|
924
|
+
rb_define_method(cgsl_monte_miser, "integrate",
|
925
|
+
rb_gsl_monte_miser_integrate, -1);
|
926
|
+
rb_define_singleton_method(cgsl_monte_vegas, "integrate",
|
927
|
+
rb_gsl_monte_integrate, -1);
|
928
|
+
rb_define_method(cgsl_monte_vegas, "integrate",
|
929
|
+
rb_gsl_monte_vegas_integrate, -1);
|
930
|
+
|
943
931
|
cgsl_monte_miser_params = rb_define_class_under(cgsl_monte_miser, "Params", cGSL_Object);
|
944
932
|
cgsl_monte_vegas_params = rb_define_class_under(cgsl_monte_vegas, "Params", cGSL_Object);
|
945
933
|
|
@@ -982,10 +970,8 @@ void Init_gsl_monte(VALUE module)
|
|
982
970
|
rb_define_method(cgsl_monte_vegas, "runval", rb_gsl_monte_vegas_runval, 0);
|
983
971
|
|
984
972
|
rb_define_const(cgsl_monte_vegas, "MODE_IMPORTANCE", INT2FIX(GSL_VEGAS_MODE_IMPORTANCE));
|
985
|
-
rb_define_const(cgsl_monte_vegas, "MODE_IMPORTANCE_ONLY", INT2FIX(GSL_VEGAS_MODE_IMPORTANCE_ONLY));
|
973
|
+
rb_define_const(cgsl_monte_vegas, "MODE_IMPORTANCE_ONLY", INT2FIX(GSL_VEGAS_MODE_IMPORTANCE_ONLY));
|
986
974
|
rb_define_const(cgsl_monte_vegas, "MODE_STRATIFIED", INT2FIX(GSL_VEGAS_MODE_STRATIFIED));
|
987
|
-
#endif
|
988
|
-
|
989
975
|
}
|
990
976
|
#ifdef CHECK_MONTE_FUNCTION
|
991
977
|
#undef CHECK_MONTE_FUNCTION
|