Skip to content

bench: update random value generation #7748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
// MODULES //

var bench = require( '@stdlib/bench' );
var randu = require( '@stdlib/random/base/randu' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var EPS = require( '@stdlib/constants/float64/eps' );
var Float64Array = require( '@stdlib/array/float64' );
var uniform = require( '@stdlib/random/base/uniform' );
var pkg = require( './../package.json' ).name;
var Triangular = require( './../lib' );

Expand All @@ -32,16 +33,27 @@ var Triangular = require( './../lib' );

bench( pkg+'::instantiation', function benchmark( bm ) {
var dist;
var as = new Float64Array(bm.iterations);
var bs = new Float64Array(bm.iterations);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be changed to follow what is done in https://github.com/stdlib-js/stdlib/blob/develop/lib/node_modules/%40stdlib/stats/base/dists/arcsine/ctor/benchmark/benchmark.js

Like:

	var dist;
    var len;
	var a;
	var b;
	var c;
	var i;

    len = 100;
	a = new Float64Array( len );
	b = new Float64Array( len );
	c = new Float64Array( len );
    for ( i = 0; i < len; i++ ) {
		a[ i ] = uniform( EPS, 10.0 );
		b[ i ] = uniform( a[ i ] + EPS, a[ i ] + 10.0 + EPS );
        c[ i ] = uniform( a[ i ], b[ i ] );
	}

var cs = new Float64Array(bm.iterations);
var a;
var b;
var c;
var i;
for ( i = 0; i < bm.iterations; i++ ) {
a = uniform(EPS, 10.0);
b = uniform(a + EPS, a + 10.0);
c = uniform(a, b);
as[i] = a;
bs[i] = b;
cs[i] = c;
}

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
a = ( randu() * 10.0 ) + EPS;
b = ( randu() * 10.0 ) + a + EPS;
c = ( randu() * ( b-a ) ) + a;
a = as[i];
b = bs[i];
c = cs[i];
dist = new Triangular( a, b, c );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dist = new Triangular( a, b, c );
dist = new Triangular( a[ i%len ], b[ i%len ], c[ i%len ] );

After the above changes have been made.

if ( !( dist instanceof Triangular ) ) {
bm.fail( 'should return a distribution instance' );
Expand Down Expand Up @@ -98,7 +110,7 @@ bench( pkg+'::set:a', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
y = ( 100.0*randu() ) + EPS;
y = uniform(EPS, 100.0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be moved outside the benchmarking loop, similar to what's being done above.

dist.a = y;
if ( dist.a !== y ) {
bm.fail( 'should return set value' );
Expand Down Expand Up @@ -155,7 +167,7 @@ bench( pkg+'::set:b', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
y = ( 100.0*randu() ) + c + EPS;
y = uniform(EPS+c, 100.0+c+EPS);
dist.b = y;
if ( dist.b !== y ) {
bm.fail( 'should return set value' );
Expand Down Expand Up @@ -212,7 +224,7 @@ bench( pkg+'::set:c', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
y = ( randu() * ( b-a ) ) + a;
y = uniform(a, b);
dist.c = y;
if ( dist.c !== y ) {
bm.fail( 'should return set value' );
Expand Down Expand Up @@ -241,7 +253,7 @@ bench( pkg+':entropy', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0, c);
y = dist.entropy;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -270,7 +282,7 @@ bench( pkg+':kurtosis', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0.0, c);
y = dist.kurtosis;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -299,7 +311,7 @@ bench( pkg+':mean', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0.0, c);
y = dist.mean;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -328,7 +340,7 @@ bench( pkg+':median', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0.0, c);
y = dist.median;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -357,7 +369,7 @@ bench( pkg+':skewness', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0.0, c);
y = dist.skewness;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -386,7 +398,7 @@ bench( pkg+':stdev', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0.0, c);
y = dist.stdev;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -415,7 +427,7 @@ bench( pkg+':variance', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
dist.a = randu() * c;
dist.a = uniform(0.0, c);
y = dist.variance;
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -445,7 +457,7 @@ bench( pkg+':cdf', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
x = randu() * 60.0;
x = uniform(0.0, 60.0);
y = dist.cdf( x );
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -475,7 +487,7 @@ bench( pkg+':mgf', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
x = randu();
x = uniform(0.0, 1.0);
y = dist.mgf( x );
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -505,7 +517,7 @@ bench( pkg+':pdf', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
x = randu() * 60.0;
x = uniform(0.0, 60.0);
y = dist.pdf( x );
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down Expand Up @@ -535,7 +547,7 @@ bench( pkg+':quantile', function benchmark( bm ) {

bm.tic();
for ( i = 0; i < bm.iterations; i++ ) {
x = randu();
x = uniform(0.0, 1.0);
y = dist.quantile( x );
if ( isnan( y ) ) {
bm.fail( 'should not return NaN' );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var EPS = require( '@stdlib/constants/float64/eps' );
var uniform = require( '@stdlib/random/base/uniform' );
var pkg = require( './../package.json' ).name;
var entropy = require( './../lib' );

Expand All @@ -44,9 +44,9 @@ bench( pkg, function benchmark( b ) {
max = new Float64Array( len );
mode = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
min[ i ] = ( randu()*10.0 );
max[ i ] = ( randu()*10.0 ) + min[ i ] + EPS;
mode[ i ] = ( ( max[ i ] - min[ i ] ) * randu() ) + min[ i ];
min[ i ] = uniform( 0.0, 10.0 );
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
max[ i ] = uniform( min[ i ] + EPS, min[ i ] + 10.0 + EPS );

Just to be consistent with the other benchmarks. This change applies throughout the PR.

mode[ i ] = uniform( min[ i ], max[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
var resolve = require( 'path' ).resolve;
var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var EPS = require( '@stdlib/constants/float64/eps' );
var uniform = require( '@stdlib/random/base/uniform' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var tryRequire = require( '@stdlib/utils/try-require' );
var EPS = require( '@stdlib/constants/float64/eps' );
var pkg = require( './../package.json' ).name;


Expand All @@ -53,9 +53,9 @@ bench( pkg+'::native', opts, function benchmark( b ) {
max = new Float64Array( len );
mode = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
min[ i ] = ( randu()*10.0 );
max[ i ] = ( randu()*10.0 ) + min[ i ] + EPS;
mode[ i ] = ( ( max[ i ] - min[ i ] ) * randu() ) + min[ i ];
min[ i ] = uniform( 0.0, 10.0 );
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above. Rest looks good :)

mode[ i ] = uniform( min[ i ], max[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
// MODULES //

var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var EPS = require( '@stdlib/constants/float64/eps' );
var Float64Array = require( '@stdlib/array/float64' );
var uniform = require( '@stdlib/random/base/uniform' );
var pkg = require( './../package.json' ).name;
var kurtosis = require( './../lib' );

Expand All @@ -44,9 +44,9 @@ bench( pkg, function benchmark( b ) {
max = new Float64Array( len );
mode = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
min[ i ] = ( randu()*10.0 );
max[ i ] = ( randu()*10.0 ) + min[ i ] + EPS;
mode[ i ] = ( ( max[ i ] - min[ i ] ) * randu() ) + min[ i ];
min[ i ] = uniform( 0.0, 10.0 );
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
mode[ i ] = uniform( min[ i ], max[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
var resolve = require( 'path' ).resolve;
var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var EPS = require( '@stdlib/constants/float64/eps' );
var uniform = require( '@stdlib/random/base/uniform' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var tryRequire = require( '@stdlib/utils/try-require' );
var EPS = require( '@stdlib/constants/float64/eps' );
var pkg = require( './../package.json' ).name;


Expand All @@ -53,9 +53,9 @@ bench( pkg+'::native', opts, function benchmark( b ) {
max = new Float64Array( len );
mode = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
min[ i ] = ( randu()*10.0 );
max[ i ] = ( randu()*10.0 ) + min[ i ] + EPS;
mode[ i ] = ( ( max[ i ] - min[ i ] ) * randu() ) + min[ i ];
min[ i ] = uniform( 0.0, 10.0 );
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
mode[ i ] = uniform( min[ i ], max[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
// MODULES //

var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var Float64Array = require( '@stdlib/array/float64' );
var uniform = require( '@stdlib/random/base/uniform' );
var pkg = require( './../package.json' ).name;
var mean = require( './../lib' );

Expand All @@ -43,9 +43,9 @@ bench( pkg, function benchmark( b ) {
bnd = new Float64Array( len );
c = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
a[ i ] = randu() * 20.0;
bnd[ i ] = ( randu() * 20.0 ) + a[ i ];
c[ i ] = ( randu() * ( bnd[i] - a[i] ) ) + a[i];
a[ i ] = uniform( 0.0, 20.0 );
bnd[ i ] = uniform( a[ i ], 20.0 + a[ i ] );
c[ i ] = uniform( a[ i ], bnd[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
var resolve = require( 'path' ).resolve;
var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var uniform = require( '@stdlib/random/base/uniform' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var tryRequire = require( '@stdlib/utils/try-require' );
var pkg = require( './../package.json' ).name;
Expand Down Expand Up @@ -52,9 +52,9 @@ bench( pkg+'::native', opts, function benchmark( b ) {
bnd = new Float64Array( len );
c = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
a[ i ] = ( randu() * 20.0 );
bnd[ i ] = ( randu() * 20.0 ) + a[ i ];
c[ i ] = ( randu() * ( bnd[i] - a[i] ) ) + a[i];
a[ i ] = uniform( 0.0, 20.0 );
bnd[ i ] = uniform( a[ i ], 20.0 + a[ i ] );
c[ i ] = uniform( a[ i ], bnd[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
// MODULES //

var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var EPS = require( '@stdlib/constants/float64/eps' );
var Float64Array = require( '@stdlib/array/float64' );
var uniform = require( '@stdlib/random/base/uniform' );
var pkg = require( './../package.json' ).name;
var median = require( './../lib' );

Expand All @@ -44,9 +44,9 @@ bench( pkg, function benchmark( b ) {
max = new Float64Array( len );
mode = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
min[ i ] = ( randu()*10.0 );
max[ i ] = ( randu()*10.0 ) + min[ i ] + EPS;
mode[ i ] = ( ( max[ i ] - min[ i ] ) * randu() ) + min[ i ];
min[ i ] = uniform( 0.0, 10.0 );
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
mode[ i ] = uniform( min[ i ], max[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
var resolve = require( 'path' ).resolve;
var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var EPS = require( '@stdlib/constants/float64/eps' );
var uniform = require( '@stdlib/random/base/uniform' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var tryRequire = require( '@stdlib/utils/try-require' );
var EPS = require( '@stdlib/constants/float64/eps' );
var pkg = require( './../package.json' ).name;


Expand All @@ -53,9 +53,9 @@ bench( pkg+'::native', opts, function benchmark( b ) {
max = new Float64Array( len );
mode = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
min[ i ] = ( randu()*10.0 );
max[ i ] = ( randu()*10.0 ) + min[ i ] + EPS;
mode[ i ] = ( ( max[ i ] - min[ i ] ) * randu() ) + min[ i ];
min[ i ] = uniform( 0.0, 10.0);
max[ i ] = uniform( min[ i ] + EPS, 10.0 + min[ i ] + EPS );
mode[ i ] = uniform( min[ i ], max[ i ] );
}

b.tic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

var bench = require( '@stdlib/bench' );
var Float64Array = require( '@stdlib/array/float64' );
var randu = require( '@stdlib/random/base/randu' );
var uniform = require( '@stdlib/random/base/uniform' );
var isnan = require( '@stdlib/math/base/assert/is-nan' );
var pkg = require( './../package.json' ).name;
var mode = require( './../lib' );
Expand All @@ -43,9 +43,9 @@ bench( pkg, function benchmark( b ) {
bnd = new Float64Array( len );
c = new Float64Array( len );
for ( i = 0; i < len; i++ ) {
a[ i ] = randu() * 20.0;
bnd[ i ] = ( randu() * 20.0 ) + a[ i ];
c[ i ] = ( randu() * ( bnd[i] - a[i] ) ) + a[i];
a[ i ] = uniform( 0.0, 20.0 );
bnd[ i ] = uniform( a[ i ], 20.0 );
c[ i ] = uniform( a[ i ], bnd[ i ] );
}

b.tic();
Expand Down
Loading