diff options
Diffstat (limited to 'numpy/random/src/legacy')
| -rw-r--r-- | numpy/random/src/legacy/legacy-distributions.c | 10 | ||||
| -rw-r--r-- | numpy/random/src/legacy/legacy-distributions.h | 49 |
2 files changed, 5 insertions, 54 deletions
diff --git a/numpy/random/src/legacy/legacy-distributions.c b/numpy/random/src/legacy/legacy-distributions.c index 684b3d762..fd067fe8d 100644 --- a/numpy/random/src/legacy/legacy-distributions.c +++ b/numpy/random/src/legacy/legacy-distributions.c @@ -1,4 +1,4 @@ -#include "legacy-distributions.h" +#include "include/legacy-distributions.h" static NPY_INLINE double legacy_double(aug_bitgen_t *aug_state) { @@ -294,8 +294,8 @@ static RAND_INT_TYPE random_hypergeometric_hrua(bitgen_t *bitgen_state, d7 = sqrt((double)(popsize - m) * sample * d4 * d5 / (popsize - 1) + 0.5); d8 = D1 * d7 + D2; d9 = (RAND_INT_TYPE)floor((double)(m + 1) * (mingoodbad + 1) / (popsize + 2)); - d10 = (loggam(d9 + 1) + loggam(mingoodbad - d9 + 1) + loggam(m - d9 + 1) + - loggam(maxgoodbad - m + d9 + 1)); + d10 = (random_loggam(d9 + 1) + random_loggam(mingoodbad - d9 + 1) + + random_loggam(m - d9 + 1) + random_loggam(maxgoodbad - m + d9 + 1)); d11 = MIN(MIN(m, mingoodbad) + 1.0, floor(d6 + 16 * d7)); /* 16 for 16-decimal-digit precision in D1 and D2 */ @@ -309,8 +309,8 @@ static RAND_INT_TYPE random_hypergeometric_hrua(bitgen_t *bitgen_state, continue; Z = (RAND_INT_TYPE)floor(W); - T = d10 - (loggam(Z + 1) + loggam(mingoodbad - Z + 1) + loggam(m - Z + 1) + - loggam(maxgoodbad - m + Z + 1)); + T = d10 - (random_loggam(Z + 1) + random_loggam(mingoodbad - Z + 1) + + random_loggam(m - Z + 1) + random_loggam(maxgoodbad - m + Z + 1)); /* fast acceptance: */ if ((X * (4.0 - X) - 3.0) <= T) diff --git a/numpy/random/src/legacy/legacy-distributions.h b/numpy/random/src/legacy/legacy-distributions.h deleted file mode 100644 index 4bc15d58e..000000000 --- a/numpy/random/src/legacy/legacy-distributions.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef _RANDOMDGEN__DISTRIBUTIONS_LEGACY_H_ -#define _RANDOMDGEN__DISTRIBUTIONS_LEGACY_H_ - - -#include "../distributions/distributions.h" - -typedef struct aug_bitgen { - bitgen_t *bit_generator; - int has_gauss; - double gauss; -} aug_bitgen_t; - -extern double legacy_gauss(aug_bitgen_t *aug_state); -extern double legacy_standard_exponential(aug_bitgen_t *aug_state); -extern double legacy_pareto(aug_bitgen_t *aug_state, double a); -extern double legacy_weibull(aug_bitgen_t *aug_state, double a); -extern double legacy_power(aug_bitgen_t *aug_state, double a); -extern double legacy_gamma(aug_bitgen_t *aug_state, double shape, double scale); -extern double legacy_chisquare(aug_bitgen_t *aug_state, double df); -extern double legacy_noncentral_chisquare(aug_bitgen_t *aug_state, double df, - double nonc); -extern double legacy_noncentral_f(aug_bitgen_t *aug_state, double dfnum, - double dfden, double nonc); -extern double legacy_wald(aug_bitgen_t *aug_state, double mean, double scale); -extern double legacy_lognormal(aug_bitgen_t *aug_state, double mean, - double sigma); -extern double legacy_standard_t(aug_bitgen_t *aug_state, double df); -extern double legacy_standard_cauchy(aug_bitgen_t *state); -extern double legacy_beta(aug_bitgen_t *aug_state, double a, double b); -extern double legacy_f(aug_bitgen_t *aug_state, double dfnum, double dfden); -extern double legacy_normal(aug_bitgen_t *aug_state, double loc, double scale); -extern double legacy_standard_gamma(aug_bitgen_t *aug_state, double shape); -extern double legacy_exponential(aug_bitgen_t *aug_state, double scale); -extern int64_t legacy_random_binomial(bitgen_t *bitgen_state, double p, - int64_t n, binomial_t *binomial); -extern int64_t legacy_negative_binomial(aug_bitgen_t *aug_state, double n, - double p); -extern int64_t legacy_random_hypergeometric(bitgen_t *bitgen_state, - int64_t good, int64_t bad, - int64_t sample); -extern int64_t legacy_random_logseries(bitgen_t *bitgen_state, double p); -extern int64_t legacy_random_poisson(bitgen_t *bitgen_state, double lam); -extern int64_t legacy_random_zipf(bitgen_t *bitgen_state, double a); -extern int64_t legacy_random_geometric(bitgen_t *bitgen_state, double p); -void legacy_random_multinomial(bitgen_t *bitgen_state, RAND_INT_TYPE n, - RAND_INT_TYPE *mnix, double *pix, npy_intp d, - binomial_t *binomial); - -#endif |