Skip to content

Commit da89fb7

Browse files
refactor: update math/base/assert/is-odd to follow latest project conventions
PR-URL: #4670 Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent 3129e35 commit da89fb7

File tree

9 files changed

+97
-94
lines changed

9 files changed

+97
-94
lines changed

lib/node_modules/@stdlib/math/base/assert/is-odd/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,20 @@ bool = isOdd( NaN );
8585
<!-- eslint no-undef: "error" -->
8686

8787
```javascript
88-
var randu = require( '@stdlib/random/base/randu' );
89-
var round = require( '@stdlib/math/base/special/round' );
88+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
9089
var isOdd = require( '@stdlib/math/base/assert/is-odd' );
9190
9291
var bool;
92+
var len;
9393
var x;
9494
var i;
9595
96+
len = 100;
97+
x = discreteUniform( len, 0, 1000 );
98+
9699
for ( i = 0; i < 100; i++ ) {
97-
x = round( randu()*100.0 );
98-
bool = isOdd( x );
99-
console.log( '%d is %s', x, ( bool ) ? 'odd' : 'not odd' );
100+
bool = isOdd( x[ i ] );
101+
console.log( '%d is %s', x[ i ], ( bool ) ? 'odd' : 'not odd' );
100102
}
101103
```
102104

lib/node_modules/@stdlib/math/base/assert/is-odd/benchmark/benchmark.js

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

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
25-
var round = require( '@stdlib/math/base/special/round' );
24+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2625
var isBoolean = require( '@stdlib/assert/is-boolean' ).isPrimitive;
2726
var pkg = require( './../package.json' ).name;
2827
var isOdd = require( './../lib' );
@@ -31,14 +30,17 @@ var isOdd = require( './../lib' );
3130
// MAIN //
3231

3332
bench( pkg, function benchmark( b ) {
33+
var len;
3434
var x;
3535
var y;
3636
var i;
3737

38+
len = 100;
39+
x = discreteUniform( len, 5.0e6, -5.0e6 );
40+
3841
b.tic();
3942
for ( i = 0; i < b.iterations; i++ ) {
40-
x = round( (randu()*1.0e7) - 5.0e6 );
41-
y = isOdd( x );
43+
y = isOdd( x[ i % len ] );
4244
if ( typeof y !== 'boolean' ) {
4345
b.fail( 'should return a boolean' );
4446
}

lib/node_modules/@stdlib/math/base/assert/is-odd/benchmark/benchmark.native.js

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

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var randu = require( '@stdlib/random/base/randu' );
26-
var round = require( '@stdlib/math/base/special/round' );
25+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2726
var isBoolean = require( '@stdlib/assert/is-boolean' ).isPrimitive;
2827
var tryRequire = require( '@stdlib/utils/try-require' );
2928
var pkg = require( './../package.json' ).name;
@@ -40,14 +39,17 @@ var opts = {
4039
// MAIN //
4140

4241
bench( pkg+'::native', opts, function benchmark( b ) {
42+
var len;
4343
var x;
4444
var y;
4545
var i;
4646

47+
len = 100;
48+
x = discreteUniform( len, 5.0e6, -5.0e6 );
49+
4750
b.tic();
4851
for ( i = 0; i < b.iterations; i++ ) {
49-
x = round( (randu()*1.0e7) - 5.0e6 );
50-
y = isOdd( x );
52+
y = isOdd( x[ i % len ] );
5153
if ( typeof y !== 'boolean' ) {
5254
b.fail( 'should return a boolean' );
5355
}

lib/node_modules/@stdlib/math/base/assert/is-odd/benchmark/c/native/benchmark.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,18 @@ static double rand_double( void ) {
9292
*/
9393
static double benchmark( void ) {
9494
double elapsed;
95-
double x;
95+
double x[ 100 ];
9696
double t;
9797
bool b;
9898
int i;
9999

100+
for ( i = 0; i < 100; i++ ) {
101+
x[ i ] = round( (rand_double()*200.0) - 100.0 );
102+
}
103+
100104
t = tic();
101105
for ( i = 0; i < ITERATIONS; i++ ) {
102-
x = ( rand_double() * 200.0 ) - 100.0;
103-
b = stdlib_base_is_odd( x );
106+
b = stdlib_base_is_odd( x[ i % 100 ] );
104107
if ( b != true && b != false ) {
105108
printf( "should return either true or false\n" );
106109
break;

lib/node_modules/@stdlib/math/base/assert/is-odd/examples/index.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@
1818

1919
'use strict';
2020

21-
var randu = require( '@stdlib/random/base/randu' );
22-
var round = require( '@stdlib/math/base/special/round' );
21+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2322
var isOdd = require( './../lib' );
2423

2524
var bool;
25+
var len;
2626
var x;
2727
var i;
2828

29+
len = 100;
30+
x = discreteUniform( len, 0, 1000 );
31+
2932
for ( i = 0; i < 100; i++ ) {
30-
x = round( randu()*100.0 );
31-
bool = isOdd( x );
32-
console.log( '%d is %s', x, ( bool ) ? 'odd' : 'not odd' );
33+
bool = isOdd( x[ i ] );
34+
console.log( '%d is %s', x[ i ], ( bool ) ? 'odd' : 'not odd' );
3335
}

lib/node_modules/@stdlib/math/base/assert/is-odd/manifest.json

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
2-
"options": {},
2+
"options": {
3+
"task": "build"
4+
},
35
"fields": [
46
{
57
"field": "src",
@@ -24,6 +26,43 @@
2426
],
2527
"confs": [
2628
{
29+
"task": "build",
30+
"src": [
31+
"./src/main.c"
32+
],
33+
"include": [
34+
"./include"
35+
],
36+
"libraries": [
37+
"-lm"
38+
],
39+
"libpath": [],
40+
"dependencies": [
41+
"@stdlib/math/base/assert/is-even",
42+
"@stdlib/napi/export",
43+
"@stdlib/napi/argv",
44+
"@stdlib/napi/argv-double",
45+
"@stdlib/napi/create-int32"
46+
]
47+
},
48+
{
49+
"task": "benchmark",
50+
"src": [
51+
"./src/main.c"
52+
],
53+
"include": [
54+
"./include"
55+
],
56+
"libraries": [
57+
"-lm"
58+
],
59+
"libpath": [],
60+
"dependencies": [
61+
"@stdlib/math/base/assert/is-even"
62+
]
63+
},
64+
{
65+
"task": "examples",
2766
"src": [
2867
"./src/main.c"
2968
],

lib/node_modules/@stdlib/math/base/assert/is-odd/src/addon.c

Lines changed: 9 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717
*/
1818

1919
#include "stdlib/math/base/assert/is_odd.h"
20+
#include "stdlib/napi/argv.h"
21+
#include "stdlib/napi/argv_double.h"
22+
#include "stdlib/napi/create_int32.h"
23+
#include "stdlib/napi/export.h"
2024
#include <node_api.h>
2125
#include <stdint.h>
22-
#include <assert.h>
2326

2427
/**
2528
* Receives JavaScript callback invocation data.
@@ -29,60 +32,10 @@
2932
* @return Node-API value
3033
*/
3134
static napi_value addon( napi_env env, napi_callback_info info ) {
32-
napi_status status;
33-
34-
// Get callback arguments:
35-
size_t argc = 1;
36-
napi_value argv[ 1 ];
37-
status = napi_get_cb_info( env, info, &argc, argv, NULL, NULL );
38-
assert( status == napi_ok );
39-
40-
// Check whether we were provided the correct number of arguments:
41-
if ( argc < 1 ) {
42-
status = napi_throw_error( env, NULL, "invalid invocation. Insufficient arguments." );
43-
assert( status == napi_ok );
44-
return NULL;
45-
}
46-
if ( argc > 1 ) {
47-
status = napi_throw_error( env, NULL, "invalid invocation. Too many arguments." );
48-
assert( status == napi_ok );
49-
return NULL;
50-
}
51-
52-
napi_valuetype vtype0;
53-
status = napi_typeof( env, argv[ 0 ], &vtype0 );
54-
assert( status == napi_ok );
55-
if ( vtype0 != napi_number ) {
56-
status = napi_throw_type_error( env, NULL, "invalid argument. First argument must be a number." );
57-
assert( status == napi_ok );
58-
return NULL;
59-
}
60-
61-
double x;
62-
status = napi_get_value_double( env, argv[ 0 ], &x );
63-
assert( status == napi_ok );
64-
65-
bool result = stdlib_base_is_odd( x );
66-
67-
napi_value v;
68-
status = napi_create_int32( env, (int32_t)result, &v );
69-
assert( status == napi_ok );
70-
71-
return v;
72-
}
73-
74-
/**
75-
* Initializes a Node-API module.
76-
*
77-
* @param env environment under which the function is invoked
78-
* @param exports exports object
79-
* @return main export
80-
*/
81-
static napi_value init( napi_env env, napi_value exports ) {
82-
napi_value fcn;
83-
napi_status status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, addon, NULL, &fcn );
84-
assert( status == napi_ok );
85-
return fcn;
35+
STDLIB_NAPI_ARGV( env, info, argv, argc, 1 );
36+
STDLIB_NAPI_ARGV_DOUBLE( env, x, argv, 0 );
37+
STDLIB_NAPI_CREATE_INT32( env, (int32_t)stdlib_base_is_odd( x ), out );
38+
return out;
8639
}
8740

88-
NAPI_MODULE( NODE_GYP_MODULE_NAME, init )
41+
STDLIB_NAPI_MODULE_EXPORT_FCN( addon )

lib/node_modules/@stdlib/math/base/assert/is-odd/test/test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tape( 'the function returns `false` if provided an even number', function test(
4444
x = round( randu()*1.0e6 ) - 5.0e5;
4545
x *= 2; // always even
4646
bool = isOdd( x );
47-
t.equal( bool, false, 'returns false when provided '+x );
47+
t.equal( bool, false, 'returns expected value when provided '+x );
4848
}
4949
t.end();
5050
});
@@ -59,29 +59,29 @@ tape( 'the function returns `true` if provided an odd number', function test( t
5959
x += 1;
6060
}
6161
bool = isOdd( x );
62-
t.equal( bool, true, 'returns true when provided '+x );
62+
t.equal( bool, true, 'returns expected value when provided '+x );
6363
}
6464
t.end();
6565
});
6666

6767
tape( 'the function returns `false` if provided `+-0`', function test( t ) {
68-
t.equal( isOdd( +0.0 ), false, 'returns false' );
69-
t.equal( isOdd( -0.0 ), false, 'returns false' );
68+
t.equal( isOdd( +0.0 ), false, 'returns expected value' );
69+
t.equal( isOdd( -0.0 ), false, 'returns expected value' );
7070
t.end();
7171
});
7272

7373
tape( 'WARNING: the function returns `true` if provided `+infinity`', function test( t ) {
74-
t.equal( isOdd( PINF ), true, 'returns true' );
74+
t.equal( isOdd( PINF ), true, 'returns expected value' );
7575
t.end();
7676
});
7777

7878
tape( 'WARNING: the function returns `true` if provided `-infinity`', function test( t ) {
79-
t.equal( isOdd( NINF ), true, 'returns true' );
79+
t.equal( isOdd( NINF ), true, 'returns expected value' );
8080
t.end();
8181
});
8282

8383
tape( 'the function returns `false` if provided `NaN`', function test( t ) {
84-
t.equal( isOdd( NaN ), false, 'returns false' );
85-
t.equal( isOdd( 0.0/0.0 ), false, 'returns false' );
84+
t.equal( isOdd( NaN ), false, 'returns expected value' );
85+
t.equal( isOdd( 0.0/0.0 ), false, 'returns expected value' );
8686
t.end();
8787
});

lib/node_modules/@stdlib/math/base/assert/is-odd/test/test.native.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ tape( 'the function returns `false` if provided an even number', opts, function
5353
x = round( randu()*1.0e6 ) - 5.0e5;
5454
x *= 2; // always even
5555
bool = isOdd( x );
56-
t.equal( bool, false, 'returns false when provided '+x );
56+
t.equal( bool, false, 'returns expected value when provided '+x );
5757
}
5858
t.end();
5959
});
@@ -68,29 +68,29 @@ tape( 'the function returns `true` if provided an odd number', opts, function te
6868
x += 1;
6969
}
7070
bool = isOdd( x );
71-
t.equal( bool, true, 'returns true when provided '+x );
71+
t.equal( bool, true, 'returns expected value when provided '+x );
7272
}
7373
t.end();
7474
});
7575

7676
tape( 'the function returns `false` if provided `+-0`', opts, function test( t ) {
77-
t.equal( isOdd( +0.0 ), false, 'returns false' );
78-
t.equal( isOdd( -0.0 ), false, 'returns false' );
77+
t.equal( isOdd( +0.0 ), false, 'returns expected value' );
78+
t.equal( isOdd( -0.0 ), false, 'returns expected value' );
7979
t.end();
8080
});
8181

8282
tape( 'WARNING: the function returns `true` if provided `+infinity`', opts, function test( t ) {
83-
t.equal( isOdd( PINF ), true, 'returns true' );
83+
t.equal( isOdd( PINF ), true, 'returns expected value' );
8484
t.end();
8585
});
8686

8787
tape( 'WARNING: the function returns `true` if provided `-infinity`', opts, function test( t ) {
88-
t.equal( isOdd( NINF ), true, 'returns true' );
88+
t.equal( isOdd( NINF ), true, 'returns expected value' );
8989
t.end();
9090
});
9191

9292
tape( 'the function returns `false` if provided `NaN`', opts, function test( t ) {
93-
t.equal( isOdd( NaN ), false, 'returns false' );
94-
t.equal( isOdd( 0.0/0.0 ), false, 'returns false' );
93+
t.equal( isOdd( NaN ), false, 'returns expected value' );
94+
t.equal( isOdd( 0.0/0.0 ), false, 'returns expected value' );
9595
t.end();
9696
});

0 commit comments

Comments
 (0)