Skip to content

Commit 0f9d898

Browse files
chore: clean up
1 parent 094d2eb commit 0f9d898

File tree

6 files changed

+60
-43
lines changed

6 files changed

+60
-43
lines changed

lib/node_modules/@stdlib/stats/base/dists/gamma/entropy/README.md

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -177,24 +177,6 @@ Evaluates the differential entropy for a gamma distribution with shape parameter
177177
```c
178178
double y = stdlib_base_dists_gamma_entropy( 1.0, 1.0 );
179179
// returns ~1.0
180-
181-
y = stdlib_base_dists_gamma_entropy( 4.0, 12.0 );
182-
// returns ~-0.462
183-
184-
y = stdlib_base_dists_gamma_entropy( 8.0, 2.0 );
185-
// returns ~1.723
186-
187-
y = stdlib_base_dists_gamma_entropy( 1.0, -0.1 );
188-
// returns NaN
189-
190-
y = stdlib_base_dists_gamma_entropy( -0.1, 1.0 );
191-
// returns NaN
192-
193-
y = stdlib_base_dists_gamma_entropy( 2.0, NaN );
194-
// returns NaN
195-
196-
y = stdlib_base_dists_gamma_entropy( NaN, 2.0 );
197-
* // returns NaN
198180
```
199181

200182
The function accepts the following arguments:
@@ -230,17 +212,22 @@ double stdlib_base_dists_gamma_entropy( const double alpha, const double beta );
230212
#include <stdlib.h>
231213
#include <stdio.h>
232214
215+
static double random_uniform( const double min, const double max ) {
216+
double v = (double)rand() / ( (double)RAND_MAX + 1.0 );
217+
return min + ( v*(max-min) );
218+
}
219+
233220
int main( void ) {
234221
double alpha;
235222
double beta;
236223
double y;
237224
int i;
238225
239226
for ( i = 0; i < 10; i++ ) {
240-
alpha = ( ( (double)rand() / (double)RAND_MAX ) * 10.0 ) + STDLIB_CONSTANT_FLOAT64_EPS;
241-
beta = ( ( (double)rand() / (double)RAND_MAX ) * 10.0 ) + STDLIB_CONSTANT_FLOAT64_EPS ;
227+
alpha = random_uniform( STDLIB_CONSTANT_FLOAT64_EPS, 10.0 );
228+
beta = random_uniform( STDLIB_CONSTANT_FLOAT64_EPS, 10.0 ) ;
242229
y = stdlib_base_dists_gamma_entropy( alpha, beta );
243-
printf( "α: %1f, β: %1f, h(X;α,β): %lf\n", x, alpha , beta , y );
230+
printf( "α: %1f, β: %1f, h(X;α,β): %lf\n", alpha , beta , y );
244231
}
245232
}
246233
```

lib/node_modules/@stdlib/stats/base/dists/gamma/entropy/benchmark/benchmark.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/base/uniform' );
25+
var Float64Array = require( '@stdlib/array/float64' );
2526
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2627
var EPS = require( '@stdlib/constants/float64/eps' );
2728
var pkg = require( './../package.json' ).name;
@@ -36,11 +37,19 @@ bench( pkg, function benchmark( b ) {
3637
var y;
3738
var i;
3839

40+
len = 100;
41+
alpha = new Float64Array( len );
42+
for ( i = 0; i < len; i++ ) {
43+
alpha[ i ] = uniform( EPS, 10.0 );
44+
}
45+
beta = new Float64Array( len );
46+
for ( i = 0; i < len; i++ ) {
47+
beta[ i ] = uniform( EPS, 10.0 );
48+
}
49+
3950
b.tic();
4051
for ( i = 0; i < b.iterations; i++ ) {
41-
alpha = ( randu()*10.0 ) + EPS;
42-
beta = ( randu()*10.0 ) + EPS;
43-
y = entropy( alpha, beta );
52+
y = entropy( alpha[ i%100 ], beta[ i%100 ] );
4453
if ( isnan( y ) ) {
4554
b.fail( 'should not return NaN' );
4655
}

lib/node_modules/@stdlib/stats/base/dists/gamma/entropy/benchmark/benchmark.native.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var randu = require( '@stdlib/random/base/randu' );
25+
var uniform = require( '@stdlib/random/base/uniform' );
26+
var Float64Array = require( '@stdlib/array/float64' );
2627
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2728
var tryRequire = require( '@stdlib/utils/try-require' );
2829
var EPS = require( '@stdlib/constants/float64/eps' );
@@ -45,11 +46,19 @@ bench( pkg+'::native', opts, function benchmark( b ) {
4546
var y;
4647
var i;
4748

49+
len = 100;
50+
alpha = new Float64Array( len );
51+
for ( i = 0; i < len; i++ ) {
52+
alpha[ i ] = uniform( EPS, 10.0 );
53+
}
54+
beta = new Float64Array( len );
55+
for ( i = 0; i < len; i++ ) {
56+
beta[ i ] = uniform( EPS, 10.0 );
57+
}
58+
4859
b.tic();
4960
for ( i = 0; i < b.iterations; i++ ) {
50-
alpha = ( randu()*10.0 ) + EPS;
51-
beta = ( randu()*10.0 ) + EPS;
52-
y = entropy( alpha, beta );
61+
y = entropy( alpha[ i%100 ], beta[ i%100 ] );
5362
if ( isnan( y ) ) {
5463
b.fail( 'should not return NaN' );
5564
}

lib/node_modules/@stdlib/stats/base/dists/gamma/entropy/benchmark/c/benchmark.c

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,15 @@ static double tic( void ) {
7676
}
7777

7878
/**
79-
* Generates a random number on the interval [0,1).
79+
* Generates a random number on the interval [min,max).
8080
*
81-
* @return random number
81+
* @param min minimum value (inclusive)
82+
* @param max maximum value (exclusive)
83+
* @return random number
8284
*/
83-
static double rand_double( void ) {
84-
int r = rand();
85-
return (double)r / ( (double)RAND_MAX + 1.0 );
85+
static double random_uniform( const double min, const double max ) {
86+
double v = (double)rand() / ( (double)RAND_MAX + 1.0 );
87+
return min + ( v*(max-min) );
8688
}
8789

8890
/**
@@ -92,17 +94,22 @@ static double rand_double( void ) {
9294
*/
9395
static double benchmark( void ) {
9496
double elapsed;
95-
double alpha;
96-
double beta;
97+
double alpha[ 100 ];
98+
double beta[ 100 ];
9799
double y;
98100
double t;
99101
int i;
100102

103+
for ( i = 0; i < 100; i++ ) {
104+
alpha[ i ] = random_uniform( STDLIB_CONSTANT_FLOAT64_EPS, 10.0 );
105+
}
106+
for ( i = 0; i < 100; i++ ) {
107+
beta[ i ] = random_uniform( STDLIB_CONSTANT_FLOAT64_EPS, 10.0 );
108+
}
109+
101110
t = tic();
102111
for ( i = 0; i < ITERATIONS; i++ ) {
103-
alpha = ( (double)rand() / (double)RAND_MAX )*10.0 + STDLIB_CONSTANT_FLOAT64_EPS;
104-
beta = ( (double)rand() / (double)RAND_MAX )* 10.0 + STDLIB_CONSTANT_FLOAT64_EPS;
105-
y = stdlib_base_dists_gamma_entropy( alpha, beta );
112+
y = stdlib_base_dists_gamma_entropy( alpha[ i%100 ], beta[ i%100 ] );
106113
if ( y != y ) {
107114
printf( "should not return NaN\n" );
108115
break;

lib/node_modules/@stdlib/stats/base/dists/gamma/entropy/examples/c/example.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,20 @@
2121
#include <stdlib.h>
2222
#include <stdio.h>
2323

24+
static double random_uniform( const double min, const double max ) {
25+
double v = (double)rand() / ( (double)RAND_MAX + 1.0 );
26+
return min + ( v*(max-min) );
27+
}
28+
2429
int main( void ) {
2530
double alpha;
26-
double beta;
31+
double beta;
2732
double y;
2833
int i;
2934

3035
for ( i = 0; i < 10; i++ ) {
31-
alpha = ( ( (double)rand() / (double)RAND_MAX ) * 10.0 ) + STDLIB_CONSTANT_FLOAT64_EPS;
32-
beta = ( ( (double)rand() / (double)RAND_MAX ) * 10.0 ) + STDLIB_CONSTANT_FLOAT64_EPS ;
36+
alpha = random_uniform( STDLIB_CONSTANT_FLOAT64_EPS, 10.0 );
37+
beta = random_uniform( STDLIB_CONSTANT_FLOAT64_EPS, 10.0 ) ;
3338
y = stdlib_base_dists_gamma_entropy( alpha, beta );
3439
printf( "α: %1f, β: %1f, h(X;α,β): %lf\n", alpha , beta , y );
3540
}

lib/node_modules/@stdlib/stats/base/dists/gamma/entropy/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "stdlib/math/base/special/digamma.h"
2323

2424
/**
25-
* Evaluates the cumulative distribution function (CDF) for a Bernoulli distribution with success probability `p` at a value `x`.
25+
* Evaluates the differential entropy for a gamma distribution with shape parameter `alpha` and rate parameter `beta`.
2626
*
2727
* @param alpha Shape parameter
2828
* @param beta Rate parameter

0 commit comments

Comments
 (0)