Skip to content

Commit b6a0250

Browse files
chore: clean up
1 parent e9ec76e commit b6a0250

File tree

15 files changed

+73
-77
lines changed

15 files changed

+73
-77
lines changed

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/README.md

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -168,27 +168,11 @@ for ( i = 0; i < 10; i++ ) {
168168

169169
#### stdlib_base_dists_bernoulli_mgf( t, p )
170170

171-
Evaluates the moment-generating function (MGF) for a Bernoulli distribution.
171+
Evaluates the moment-generating function (MGF) for a Bernoulli distribution with success probability `p`.
172172

173173
```c
174174
double y = stdlib_base_dists_bernoulli_mgf( 0.2, 0.5 );
175175
// returns ~1.111
176-
177-
y = stdlib_base_dists_bernoulli_mgf( 0.4, 0.5 );
178-
// returns ~1.0
179-
180-
y = stdlib_base_dists_bernoulli_mgf( NaN, 0.0 );
181-
// returns NaN
182-
183-
y = stdlib_base_dists_bernoulli_mgf( 0.0, NaN );
184-
// returns NaN
185-
186-
y = stdlib_base_dists_bernoulli_mgf( -2.0, -1.0 );
187-
// returns NaN
188-
189-
// Invalid probability
190-
y = stdlib_base_dists_bernoulli_mgf( 0.2, 2.0 );
191-
// returns NaN
192176
```
193177

194178
The function accepts the following arguments:
@@ -219,19 +203,24 @@ double stdlib_base_dists_bernoulli_mgf( const double t, const double p );
219203
### Examples
220204
221205
```c
222-
#include "stdlib/stats/base/dists/bernoulli/cdf.h"
206+
#include "stdlib/stats/base/dists/bernoulli/mgf.h"
223207
#include <stdlib.h>
224208
#include <stdio.h>
225209
210+
static double random_uniform( const double min, const double max ) {
211+
double v = (double)rand() / ( (double)RAND_MAX + 1.0 );
212+
return min + ( v*(max-min) );
213+
}
214+
226215
int main( void ) {
227216
double p;
228217
double t;
229218
double y;
230219
int i;
231220
232221
for ( i = 0; i < 10; i++ ) {
233-
t = ( ( (double)rand() / (double)RAND_MAX ) * 4.0 ) - 2.0;
234-
p = ( (double)rand() / (double)RAND_MAX ) ;
222+
t = random_uniform( 2.0, 4.0 );
223+
p = random_uniform( 0.0, 1.0 );
235224
y = stdlib_base_dists_bernoulli_mgf( t, p );
236225
printf( "t: %lf , p: %1f, M_X(t;p): %lf\n", t, p , y );
237226
}

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/benchmark/benchmark.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
var bench = require( '@stdlib/bench' );
2424
var randu = require( '@stdlib/random/base/randu' );
25+
var uniform = require( '@stdlib/random/base/uniform' );
26+
var Float64Array = require( '@stdlib/array/float64' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pkg = require( './../package.json' ).name;
2729
var mgf = require( './../lib' );
@@ -30,16 +32,25 @@ var mgf = require( './../lib' );
3032
// MAIN //
3133

3234
bench( pkg, function benchmark( b ) {
35+
var len;
3336
var p;
3437
var t;
3538
var y;
3639
var i;
3740

41+
len = 100;
42+
p = new Float64Array( len );
43+
for ( i = 0; i < len; i++ ) {
44+
p[ i ] = uniform( 0.0, 1.0 );
45+
}
46+
t = new Float64Array( len );
47+
for ( i = 0; i < len; i++ ) {
48+
t[ i ] = uniform( 0.0, 3.0 );
49+
}
50+
3851
b.tic();
3952
for ( i = 0; i < b.iterations; i++ ) {
40-
p = randu();
41-
t = randu() * 3.0;
42-
y = mgf( t, p );
53+
y = mgf( t[ i%100 ], p[ i%100 ] );
4354
if ( isnan( y ) ) {
4455
b.fail( 'should not return NaN' );
4556
}

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/benchmark/benchmark.native.js

Lines changed: 11 additions & 27 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 pkg = require( './../package.json' ).name;
@@ -39,42 +40,25 @@ var opts = {
3940
// MAIN //
4041

4142
bench( pkg+'::native', opts, function benchmark( b ) {
43+
var len;
4244
var p;
4345
var t;
4446
var y;
4547
var i;
4648

47-
b.tic();
48-
for ( i = 0; i < b.iterations; i++ ) {
49-
p = randu();
50-
t = randu() * 3.0;
51-
y = mgf( t, p );
52-
if ( isnan( y ) ) {
53-
b.fail( 'should not return NaN' );
54-
}
49+
len = 100;
50+
p = new Float64Array( len );
51+
for ( i = 0; i < len; i++ ) {
52+
p[ i ] = uniform( 0.0, 1.0 );
5553
}
56-
b.toc();
57-
if ( isnan( y ) ) {
58-
b.fail( 'should not return NaN' );
54+
p = new Float64Array( len );
55+
for ( i = 0; i < len; i++ ) {
56+
t[ i ] = uniform( 0.0, 3.0 );
5957
}
60-
b.pass( 'benchmark finished' );
61-
b.end();
62-
});
63-
64-
bench( pkg+':factory', opts, function benchmark( b ) {
65-
var mymgf;
66-
var p;
67-
var t;
68-
var y;
69-
var i;
70-
71-
p = 0.3;
72-
mymgf = mgf.factory( p );
7358

7459
b.tic();
7560
for ( i = 0; i < b.iterations; i++ ) {
76-
t = randu() * 3.0;
77-
y = mymgf( t );
61+
y = mgf( t[ i%100 ], p[ i%100 ] );
7862
if ( isnan( y ) ) {
7963
b.fail( 'should not return NaN' );
8064
}

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/benchmark/c/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,4 @@ run: $(c_targets)
143143
clean:
144144
$(QUIET) -rm -f *.o *.out
145145

146-
.PHONY: clean
146+
.PHONY: clean

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/benchmark/c/benchmark.c

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ static double tic( void ) {
7575
}
7676

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

8789
/**
@@ -91,17 +93,22 @@ static double rand_double( void ) {
9193
*/
9294
static double benchmark( void ) {
9395
double elapsed;
94-
double p;
96+
double p[ 100 ];
9597
double y;
96-
double t;
97-
double x;
98+
double t[ 100 ];
99+
double x;
98100
int i;
99101

102+
for ( i = 0; i < 100; i++ ) {
103+
p[ i ] = random_uniform( 0.0, 1.0 );
104+
}
105+
for ( i = 0; i < 100; i++ ) {
106+
t[ i ] = random_uniform( 0.0, 3.0 );
107+
}
108+
100109
x = tic();
101110
for ( i = 0; i < ITERATIONS; i++ ) {
102-
p = ( (double)rand() / (double)RAND_MAX );
103-
t = ( (double)rand() / (double)RAND_MAX )*3.0;
104-
y = stdlib_base_dists_bernoulli_mgf( t, p );
111+
y = stdlib_base_dists_bernoulli_mgf( t[ i%100 ], p[ i%100 ] );
105112
if ( y != y ) {
106113
printf( "should not return NaN\n" );
107114
break;

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@
167167
], # end actions
168168
}, # end target copy_addon
169169
], # end targets
170-
}
170+
}

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/examples/c/example.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,21 @@
2020
#include <stdlib.h>
2121
#include <stdio.h>
2222

23+
static double random_uniform( const double min, const double max ) {
24+
double v = (double)rand() / ( (double)RAND_MAX + 1.0 );
25+
return min + ( v*(max-min) );
26+
}
27+
2328
int main( void ) {
2429
double p;
25-
double t;
30+
double t;
2631
double y;
2732
int i;
2833

2934
for ( i = 0; i < 10; i++ ) {
30-
t = ( ( (double)rand() / (double)RAND_MAX ) * 4.0 ) - 2.0;
31-
p = ( (double)rand() / (double)RAND_MAX ) ;
35+
t = random_uniform( 2.0, 4.0 );
36+
p = random_uniform( 0.0, 1.0 );
3237
y = stdlib_base_dists_bernoulli_mgf( t, p );
3338
printf( "t: %lf , p: %1f, M_X(t;p): %lf\n", t, p , y );
3439
}
35-
}
40+
}

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/include.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@
5050
'<!@(node -e "var arr = require(\'@stdlib/utils/library-manifest\')(\'./manifest.json\',{},{\'basedir\':process.cwd(),\'paths\':\'posix\'}).libpath; for ( var i = 0; i < arr.length; i++ ) { console.log( arr[ i ] ); }")',
5151
],
5252
}, # end variables
53-
}
53+
}

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/include/stdlib/stats/base/dists/bernoulli/mgf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ extern "C" {
2727
#endif
2828

2929
/**
30-
Evaluates the moment-generating function (MGF) for a Bernoulli distribution with success probability `p` at a value `t`.
30+
c
3131
*/
3232
double stdlib_base_dists_bernoulli_mgf( const double t, const double p );
3333

3434
#ifdef __cplusplus
3535
}
3636
#endif
3737

38-
#endif // !STDLIB_STATS_BASE_DISTS_BERNOULLI_MGF_H
38+
#endif // !STDLIB_STATS_BASE_DISTS_BERNOULLI_MGF_H

lib/node_modules/@stdlib/stats/base/dists/bernoulli/mgf/lib/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var exp = require( '@stdlib/math/base/special/exp' );
2828
// MAIN //
2929

3030
/**
31-
* Evaluates the moment-generating function (MGF) for a Bernoulli distribution with success probability `p` at a value `t`.
31+
* Evaluates the moment-generating function (MGF) for a Bernoulli distribution with success probability `p`.
3232
*
3333
* @param {number} t - input value
3434
* @param {Probability} p - success probability

0 commit comments

Comments
 (0)