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
@@ -1,17 +1,17 @@
|
|
1
1
|
/* histogram/find.c
|
2
|
-
*
|
2
|
+
*
|
3
3
|
* Copyright (C) 1996, 1997, 1998, 1999, 2000 Brian Gough
|
4
|
-
*
|
4
|
+
*
|
5
5
|
* This program is free software; you can redistribute it and/or modify
|
6
6
|
* it under the terms of the GNU General Public License as published by
|
7
7
|
* the Free Software Foundation; either version 2 of the License, or (at
|
8
8
|
* your option) any later version.
|
9
|
-
*
|
9
|
+
*
|
10
10
|
* This program is distributed in the hope that it will be useful, but
|
11
11
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
12
12
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
13
13
|
* General Public License for more details.
|
14
|
-
*
|
14
|
+
*
|
15
15
|
* You should have received a copy of the GNU General Public License
|
16
16
|
* along with this program; if not, write to the Free Software
|
17
17
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
@@ -26,7 +26,6 @@ int mygsl_find (const size_t n, const double range[], const double x, size_t * i
|
|
26
26
|
size_t i_linear, lower, upper, mid;
|
27
27
|
if (x < range[0]) return -1;
|
28
28
|
if (x >= range[n]) return +1;
|
29
|
-
|
30
29
|
/* optimize for linear case */
|
31
30
|
|
32
31
|
#ifdef LINEAR_OPT
|
@@ -36,47 +35,46 @@ int mygsl_find (const size_t n, const double range[], const double x, size_t * i
|
|
36
35
|
}
|
37
36
|
|
38
37
|
if (x >= range[i_linear] && x < range[i_linear + 1])
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
38
|
+
{
|
39
|
+
*i = i_linear;
|
40
|
+
return 0;
|
41
|
+
}
|
43
42
|
#endif
|
44
43
|
|
45
44
|
/* perform binary search */
|
46
45
|
|
47
|
-
upper = n
|
48
|
-
lower = 0
|
46
|
+
upper = n;
|
47
|
+
lower = 0;
|
49
48
|
|
50
49
|
while (upper - lower > 1)
|
50
|
+
{
|
51
|
+
mid = (upper + lower) / 2;
|
52
|
+
|
53
|
+
if (x >= range[mid])
|
51
54
|
{
|
52
|
-
|
53
|
-
|
54
|
-
if (x >= range[mid])
|
55
|
-
{
|
56
|
-
lower = mid ;
|
57
|
-
}
|
58
|
-
else
|
59
|
-
{
|
60
|
-
upper = mid ;
|
61
|
-
}
|
55
|
+
lower = mid;
|
62
56
|
}
|
57
|
+
else
|
58
|
+
{
|
59
|
+
upper = mid;
|
60
|
+
}
|
61
|
+
}
|
63
62
|
|
64
|
-
*i = lower
|
63
|
+
*i = lower;
|
65
64
|
|
66
65
|
/* sanity check the result */
|
67
66
|
|
68
67
|
if (x < range[lower] || x >= range[lower + 1])
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
68
|
+
{
|
69
|
+
GSL_ERROR ("x not found in range", GSL_ESANITY);
|
70
|
+
}
|
73
71
|
return 0;
|
74
72
|
}
|
75
73
|
|
76
74
|
int mygsl_find2d (const size_t nx, const double xrange[],
|
77
|
-
|
78
|
-
|
79
|
-
|
75
|
+
const size_t ny, const double yrange[],
|
76
|
+
const double x, const double y,
|
77
|
+
size_t * i, size_t * j)
|
80
78
|
{
|
81
79
|
int status = mygsl_find (nx, xrange, x, i);
|
82
80
|
if (status) return status;
|
@@ -86,10 +84,10 @@ int mygsl_find2d (const size_t nx, const double xrange[],
|
|
86
84
|
}
|
87
85
|
|
88
86
|
int mygsl_find3d (const size_t nx, const double xrange[],
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
87
|
+
const size_t ny, const double yrange[],
|
88
|
+
const size_t nz, const double zrange[],
|
89
|
+
const double x, const double y, const double z,
|
90
|
+
size_t * i, size_t * j, size_t *k)
|
93
91
|
{
|
94
92
|
int status = mygsl_find (nx, xrange, x, i);
|
95
93
|
if (status) return status;
|
@@ -18,11 +18,11 @@
|
|
18
18
|
*/
|
19
19
|
/***************************************************************
|
20
20
|
*
|
21
|
-
* File gsl_histogram_oper.c:
|
22
|
-
* Routine to make operation on histograms.
|
21
|
+
* File gsl_histogram_oper.c:
|
22
|
+
* Routine to make operation on histograms.
|
23
23
|
* Need GSL library and header.
|
24
24
|
* Contains the routines:
|
25
|
-
* gsl_histogram_same_binning check if two histograms have the same binning
|
25
|
+
* gsl_histogram_same_binning check if two histograms have the same binning
|
26
26
|
* gsl_histogram_add add two histograms
|
27
27
|
* gsl_histogram_sub subctract two histograms
|
28
28
|
* gsl_histogram_mult multiply two histograms
|
@@ -38,7 +38,7 @@
|
|
38
38
|
#include <gsl/gsl_math.h>
|
39
39
|
#include <gsl/gsl_histogram.h>
|
40
40
|
|
41
|
-
/*
|
41
|
+
/*
|
42
42
|
* gsl_histogram_same_binning:
|
43
43
|
* control if two histograms have the
|
44
44
|
* same binning
|
@@ -48,112 +48,103 @@ int
|
|
48
48
|
mygsl_histogram_equal_bins_p (const gsl_histogram * h1, const gsl_histogram * h2)
|
49
49
|
{
|
50
50
|
if (h1->n != h2->n)
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
51
|
+
{
|
52
|
+
return 0;
|
53
|
+
}
|
55
54
|
{
|
56
55
|
size_t i;
|
57
56
|
/* init ranges */
|
58
57
|
|
59
58
|
for (i = 0; i <= h1->n; i++)
|
59
|
+
{
|
60
|
+
if (gsl_fcmp(h1->range[i],h2->range[i], 1e-12))
|
60
61
|
{
|
61
|
-
|
62
|
-
{
|
63
|
-
return 0;
|
64
|
-
}
|
62
|
+
return 0;
|
65
63
|
}
|
64
|
+
}
|
66
65
|
}
|
67
66
|
|
68
67
|
return 1;
|
69
68
|
}
|
70
69
|
|
71
|
-
/*
|
70
|
+
/*
|
72
71
|
* gsl_histogram_add:
|
73
72
|
* add two histograms
|
74
73
|
*/
|
75
|
-
int
|
74
|
+
int
|
76
75
|
mygsl_histogram_add (gsl_histogram * h1, const gsl_histogram * h2)
|
77
76
|
{
|
78
77
|
size_t i;
|
79
78
|
|
80
79
|
if (!mygsl_histogram_equal_bins_p (h1, h2))
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
80
|
+
{
|
81
|
+
GSL_ERROR ("histograms have different binning", GSL_EINVAL);
|
82
|
+
}
|
85
83
|
for (i = 0; i < h1->n; i++)
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
84
|
+
{
|
85
|
+
h1->bin[i] += h2->bin[i];
|
86
|
+
}
|
90
87
|
return GSL_SUCCESS;
|
91
88
|
}
|
92
89
|
|
93
|
-
/*
|
90
|
+
/*
|
94
91
|
* gsl_histogram_sub:
|
95
92
|
* subtract two histograms
|
96
93
|
*/
|
97
94
|
|
98
|
-
int
|
95
|
+
int
|
99
96
|
mygsl_histogram_sub (gsl_histogram * h1, const gsl_histogram * h2)
|
100
97
|
{
|
101
98
|
size_t i;
|
102
99
|
|
103
100
|
if (!mygsl_histogram_equal_bins_p (h1, h2))
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
101
|
+
{
|
102
|
+
GSL_ERROR ("histograms have different binning", GSL_EINVAL);
|
103
|
+
}
|
108
104
|
for (i = 0; i < h1->n; i++)
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
105
|
+
{
|
106
|
+
h1->bin[i] -= h2->bin[i];
|
107
|
+
}
|
113
108
|
return GSL_SUCCESS;
|
114
109
|
|
115
110
|
}
|
116
111
|
|
117
|
-
/*
|
112
|
+
/*
|
118
113
|
* gsl_histogram_mult:
|
119
114
|
* multiply two histograms
|
120
115
|
*/
|
121
116
|
|
122
|
-
int
|
117
|
+
int
|
123
118
|
mygsl_histogram_mul (gsl_histogram * h1, const gsl_histogram * h2)
|
124
119
|
{
|
125
120
|
size_t i;
|
126
121
|
|
127
122
|
if (!mygsl_histogram_equal_bins_p (h1, h2))
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
123
|
+
{
|
124
|
+
GSL_ERROR ("histograms have different binning", GSL_EINVAL);
|
125
|
+
}
|
132
126
|
for (i = 0; i < h1->n; i++)
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
127
|
+
{
|
128
|
+
h1->bin[i] *= h2->bin[i];
|
129
|
+
}
|
137
130
|
return GSL_SUCCESS;
|
138
131
|
}
|
139
|
-
/*
|
132
|
+
/*
|
140
133
|
* gsl_histogram_div:
|
141
134
|
* divide two histograms
|
142
135
|
*/
|
143
|
-
int
|
136
|
+
int
|
144
137
|
mygsl_histogram_div (gsl_histogram * h1, const gsl_histogram * h2)
|
145
138
|
{
|
146
139
|
size_t i;
|
147
140
|
|
148
141
|
if (!mygsl_histogram_equal_bins_p (h1, h2))
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
142
|
+
{
|
143
|
+
GSL_ERROR ("histograms have different binning", GSL_EINVAL);
|
144
|
+
}
|
153
145
|
for (i = 0; i < h1->n; i++)
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
146
|
+
{
|
147
|
+
h1->bin[i] /= h2->bin[i];
|
148
|
+
}
|
158
149
|
return GSL_SUCCESS;
|
159
150
|
}
|
@@ -19,11 +19,7 @@ static VALUE rb_gsl_ieee_env_setup(VALUE obj)
|
|
19
19
|
|
20
20
|
static VALUE rb_gsl_ieee_fprintf_double(int argc, VALUE *argv, VALUE obj)
|
21
21
|
{
|
22
|
-
#ifdef HAVE_RUBY_IO_H
|
23
22
|
rb_io_t *fptr = NULL;
|
24
|
-
#else
|
25
|
-
OpenFile *fptr = NULL;
|
26
|
-
#endif
|
27
23
|
FILE *fp = NULL;
|
28
24
|
int flag = 0;
|
29
25
|
VALUE vtmp;
|
@@ -39,15 +35,11 @@ static VALUE rb_gsl_ieee_fprintf_double(int argc, VALUE *argv, VALUE obj)
|
|
39
35
|
case T_FILE:
|
40
36
|
GetOpenFile(argv[0], fptr);
|
41
37
|
rb_io_check_writable(fptr);
|
42
|
-
#ifdef HAVE_RUBY_IO_H
|
43
38
|
fp = rb_io_stdio_file(fptr);
|
44
|
-
#else
|
45
|
-
fp = GetWriteFile(fptr);
|
46
|
-
#endif
|
47
39
|
break;
|
48
40
|
default:
|
49
41
|
rb_raise(rb_eTypeError, "wrong type argument %s (IO or String expected)",
|
50
|
-
|
42
|
+
rb_class2name(CLASS_OF(argv[0])));
|
51
43
|
}
|
52
44
|
vtmp = argv[1];
|
53
45
|
break;
|
@@ -60,7 +52,7 @@ static VALUE rb_gsl_ieee_fprintf_double(int argc, VALUE *argv, VALUE obj)
|
|
60
52
|
}
|
61
53
|
if (TYPE(vtmp) != T_FLOAT)
|
62
54
|
rb_raise(rb_eTypeError, "wrong argument type %s (Float expected)",
|
63
|
-
|
55
|
+
rb_class2name(CLASS_OF(vtmp)));
|
64
56
|
ftmp = RFLOAT_VALUE(vtmp);
|
65
57
|
gsl_ieee_fprintf_double(fp, &ftmp);
|
66
58
|
if (fp == stdout) fprintf(stdout, "\n");
|
@@ -82,15 +74,15 @@ void Init_gsl_ieee(VALUE module)
|
|
82
74
|
mgsl_ieee = rb_define_module_under(module, "IEEE");
|
83
75
|
|
84
76
|
rb_define_singleton_method(mgsl_ieee, "env_setup",
|
85
|
-
|
77
|
+
rb_gsl_ieee_env_setup, 0);
|
86
78
|
rb_define_module_function(module, "ieee_env_setup", rb_gsl_ieee_env_setup, 0);
|
87
79
|
rb_define_singleton_method(mgsl_ieee, "fprintf_double",
|
88
|
-
|
80
|
+
rb_gsl_ieee_fprintf_double, -1);
|
89
81
|
rb_define_singleton_method(mgsl_ieee, "fprintf",
|
90
|
-
|
82
|
+
rb_gsl_ieee_fprintf_double, -1);
|
91
83
|
rb_define_singleton_method(mgsl_ieee, "printf",
|
92
|
-
|
84
|
+
rb_gsl_ieee_printf_double, -1);
|
93
85
|
rb_define_singleton_method(mgsl_ieee, "printf_double",
|
94
|
-
|
86
|
+
rb_gsl_ieee_printf_double, -1);
|
95
87
|
|
96
88
|
}
|
@@ -67,9 +67,7 @@ void Init_gsl_odeiv(VALUE module);
|
|
67
67
|
void Init_gsl_interp(VALUE module);
|
68
68
|
void Init_gsl_spline(VALUE module);
|
69
69
|
void Init_gsl_diff(VALUE module);
|
70
|
-
#ifdef GSL_1_4_9_LATER
|
71
70
|
void Init_gsl_deriv(VALUE module);
|
72
|
-
#endif
|
73
71
|
|
74
72
|
void Init_gsl_cheb(VALUE module);
|
75
73
|
void Init_gsl_sum(VALUE module);
|
@@ -123,9 +121,7 @@ void Init_cqp(VALUE module);
|
|
123
121
|
|
124
122
|
void Init_fresnel(VALUE module);
|
125
123
|
|
126
|
-
#ifdef GSL_1_9_LATER
|
127
124
|
void Init_bspline(VALUE module);
|
128
|
-
#endif
|
129
125
|
|
130
126
|
#ifdef HAVE_ALF_ALF_H
|
131
127
|
#include "alf/alf.h"
|
@@ -133,11 +129,8 @@ void Init_bspline(VALUE module);
|
|
133
129
|
void Init_alf(VALUE module);
|
134
130
|
void Init_geometry(VALUE module);
|
135
131
|
|
136
|
-
#ifdef GSL_1_14_LATER
|
137
132
|
#include <gsl/gsl_multiset.h>
|
138
133
|
extern VALUE cMultiset;
|
139
134
|
void Init_multiset(VALUE module);
|
140
135
|
|
141
136
|
#endif
|
142
|
-
|
143
|
-
#endif
|
@@ -109,14 +109,14 @@ double* get_vector_ptr(VALUE ary, size_t *stride, size_t *n);
|
|
109
109
|
|
110
110
|
gsl_matrix_complex* matrix_to_complex(const gsl_matrix *m);
|
111
111
|
|
112
|
-
void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *m,
|
113
|
-
|
112
|
+
void gsl_matrix_complex_mul(gsl_matrix_complex *mnew, const gsl_matrix_complex *m,
|
113
|
+
const gsl_matrix_complex *mb);
|
114
114
|
void gsl_matrix_mul(gsl_matrix *mnew, gsl_matrix *m, gsl_matrix *b);
|
115
|
-
void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew,
|
116
|
-
|
117
|
-
|
118
|
-
void gsl_matrix_mul_vector(gsl_vector *vnew,
|
119
|
-
|
115
|
+
void gsl_matrix_complex_mul_vector(gsl_vector_complex *vnew,
|
116
|
+
const gsl_matrix_complex *m,
|
117
|
+
const gsl_vector_complex *v);
|
118
|
+
void gsl_matrix_mul_vector(gsl_vector *vnew,
|
119
|
+
const gsl_matrix *m, const gsl_vector *v);
|
120
120
|
gsl_vector_complex* vector_to_complex(const gsl_vector *v);
|
121
121
|
|
122
122
|
gsl_vector* make_vector_clone(const gsl_vector *v);
|
@@ -150,8 +150,8 @@ gsl_matrix_int_view* rb_gsl_matrix_int_view_alloc();
|
|
150
150
|
void rb_gsl_matrix_int_view_free(gsl_matrix_int_view *v);
|
151
151
|
VALUE rb_gsl_matrix_to_i(VALUE obj);
|
152
152
|
VALUE rb_gsl_matrix_int_to_f(VALUE obj);
|
153
|
-
void gsl_matrix_int_mul_vector(gsl_vector_int *vnew,
|
154
|
-
|
153
|
+
void gsl_matrix_int_mul_vector(gsl_vector_int *vnew,
|
154
|
+
const gsl_matrix_int *m, const gsl_vector_int *v);
|
155
155
|
VALUE rb_gsl_vector_to_i(VALUE obj);
|
156
156
|
VALUE make_rarray_from_cvector_int(const gsl_vector_int *v);
|
157
157
|
VALUE rb_gsl_vector_int_to_f(VALUE obj);
|
@@ -160,34 +160,24 @@ VALUE rb_gsl_vector_print(VALUE obj);
|
|
160
160
|
void gsl_vector_print(const gsl_vector *v, VALUE klass);
|
161
161
|
int rbgsl_vector_equal(const gsl_vector *v1, const gsl_vector *v2, double eps);
|
162
162
|
|
163
|
-
#ifndef GSL_1_2_LATER
|
164
|
-
int gsl_matrix_complex_add(gsl_matrix_complex * a, const gsl_matrix_complex * b);
|
165
|
-
int gsl_matrix_complex_sub(gsl_matrix_complex * a, const gsl_matrix_complex * b);
|
166
|
-
int gsl_matrix_complex_mul_elements(gsl_matrix_complex * a, const gsl_matrix_complex * b);
|
167
|
-
int gsl_matrix_complex_div_elements(gsl_matrix_complex * a, const gsl_matrix_complex * b);
|
168
|
-
int gsl_matrix_complex_scale(gsl_matrix_complex * a, const gsl_complex x);
|
169
|
-
int gsl_matrix_complex_add_constant(gsl_matrix_complex * a, const gsl_complex x);
|
170
|
-
int gsl_matrix_complex_add_diagonal(gsl_matrix_complex * a, const gsl_complex x);
|
171
|
-
#endif
|
172
|
-
|
173
163
|
void Init_gsl_vector_init(VALUE module);
|
174
164
|
void Init_gsl_vector_int_init(VALUE module);
|
175
165
|
void Init_gsl_matrix_init(VALUE module);
|
176
166
|
void Init_gsl_matrix_int_init(VALUE module);
|
177
167
|
|
178
|
-
gsl_matrix* gsl_matrix_alloc_from_array_sizes(VALUE ary,
|
179
|
-
|
168
|
+
gsl_matrix* gsl_matrix_alloc_from_array_sizes(VALUE ary,
|
169
|
+
VALUE nn1, VALUE nn2);
|
180
170
|
gsl_matrix* gsl_matrix_alloc_from_arrays(int argc, VALUE *argv);
|
181
171
|
|
182
172
|
gsl_matrix* gsl_matrix_alloc_from_vector_sizes(VALUE ary,
|
183
|
-
|
173
|
+
VALUE nn1, VALUE nn2);
|
184
174
|
gsl_matrix* gsl_matrix_alloc_from_vectors(int argc, VALUE *argv);
|
185
|
-
gsl_matrix_int* gsl_matrix_int_alloc_from_array_sizes(VALUE ary,
|
186
|
-
|
175
|
+
gsl_matrix_int* gsl_matrix_int_alloc_from_array_sizes(VALUE ary,
|
176
|
+
VALUE nn1, VALUE nn2);
|
187
177
|
gsl_matrix_int* gsl_matrix_int_alloc_from_arrays(int argc, VALUE *argv);
|
188
178
|
|
189
179
|
gsl_matrix_int* gsl_matrix_int_alloc_from_vector_sizes(VALUE ary,
|
190
|
-
|
180
|
+
VALUE nn1, VALUE nn2);
|
191
181
|
gsl_matrix_int* gsl_matrix_int_alloc_from_vectors(int argc, VALUE *argv);
|
192
182
|
|
193
183
|
VALUE rb_gsl_matrix_do_something(VALUE obj, void (*f)(gsl_matrix *));
|