Skip to content

Commit cf8a885

Browse files
aayush0325aayush0325
committed
refactor: update js implementation
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: passed - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 919ecdf commit cf8a885

File tree

8 files changed

+85
-89
lines changed

8 files changed

+85
-89
lines changed

‎lib/node_modules/@stdlib/stats/base/snanmeanors/lib/index.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,17 @@
2828
* var snanmeanors = require( '@stdlib/stats/base/snanmeanors' );
2929
*
3030
* var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
31-
* var N = x.length;
3231
*
33-
* var v = snanmeanors( N, x, 1 );
32+
* var v = snanmeanors( x.length, x, 1 );
3433
* // returns ~0.3333
3534
*
3635
* @example
3736
* var Float32Array = require( '@stdlib/array/float32' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3937
* var snanmeanors = require( '@stdlib/stats/base/snanmeanors' );
4038
*
4139
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
42-
* var N = floor( x.length / 2 );
4340
*
44-
* var v = snanmeanors.ndarray( N, x, 2, 1 );
41+
* var v = snanmeanors.ndarray( 4, x, 2, 1 );
4542
* // returns 1.25
4643
*/
4744

‎lib/node_modules/@stdlib/stats/base/snanmeanors/lib/ndarray.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
3030
*
3131
* @param {PositiveInteger} N - number of indexed elements
3232
* @param {Float32Array} x - input array
33-
* @param {integer} stride - stride length
34-
* @param {NonNegativeInteger} offset - starting index
33+
* @param {integer} strideX - stride length
34+
* @param {NonNegativeInteger} offsetX - starting index
3535
* @returns {number} arithmetic mean
3636
*
3737
* @example
3838
* var Float32Array = require( '@stdlib/array/float32' );
39-
* var floor = require( '@stdlib/math/base/special/floor' );
4039
*
4140
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = snanmeanors( N, x, 2, 1 );
42+
* var v = snanmeanors( 4, x, 2, 1 );
4543
* // returns 1.25
4644
*/
47-
function snanmeanors( N, x, stride, offset ) {
45+
function snanmeanors( N, x, strideX, offsetX ) {
4846
var sum;
4947
var ix;
5048
var v;
@@ -54,10 +52,10 @@ function snanmeanors( N, x, stride, offset ) {
5452
if ( N <= 0 ) {
5553
return NaN;
5654
}
57-
if ( N === 1 || stride === 0 ) {
58-
return x[ offset ];
55+
if ( N === 1 || strideX === 0 ) {
56+
return x[ offsetX ];
5957
}
60-
ix = offset;
58+
ix = offsetX;
6159
sum = 0.0;
6260
n = 0;
6361
for ( i = 0; i < N; i++ ) {
@@ -66,7 +64,7 @@ function snanmeanors( N, x, stride, offset ) {
6664
sum = float64ToFloat32( sum + v );
6765
n += 1;
6866
}
69-
ix += stride;
67+
ix += strideX;
7068
}
7169
if ( n === 0 ) {
7270
return NaN;

‎lib/node_modules/@stdlib/stats/base/snanmeanors/lib/ndarray.native.js‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
// MODULES //
2222

23-
var Float32Array = require( '@stdlib/array/float32' );
24-
var addon = require( './snanmeanors.native.js' );
23+
var addon = require( './../src/addon.node' );
2524

2625

2726
// MAIN //
@@ -31,27 +30,20 @@ var addon = require( './snanmeanors.native.js' );
3130
*
3231
* @param {PositiveInteger} N - number of indexed elements
3332
* @param {Float32Array} x - input array
34-
* @param {integer} stride - stride length
35-
* @param {NonNegativeInteger} offset - starting index
33+
* @param {integer} strideX - stride length
34+
* @param {NonNegativeInteger} offsetX - starting index
3635
* @returns {number} arithmetic mean
3736
*
3837
* @example
3938
* var Float32Array = require( '@stdlib/array/float32' );
40-
* var floor = require( '@stdlib/math/base/special/floor' );
4139
*
4240
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
43-
* var N = floor( x.length / 2 );
4441
*
45-
* var v = snanmeanors( N, x, 2, 1 );
42+
* var v = snanmeanors( 4, x, 2, 1 );
4643
* // returns 1.25
4744
*/
48-
function snanmeanors( N, x, stride, offset ) {
49-
var view;
50-
if ( stride < 0 ) {
51-
offset += (N-1) * stride;
52-
}
53-
view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len
54-
return addon( N, view, stride );
45+
function snanmeanors( N, x, strideX, offsetX ) {
46+
return addon.ndarray( N, x, strideX, offsetX );
5547
}
5648

5749

‎lib/node_modules/@stdlib/stats/base/snanmeanors/lib/snanmeanors.js‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
// MODULES //
2222

23-
var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
23+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
24+
var ndarray = require( './ndarray.js' );
2425

2526

2627
// MAIN //
@@ -30,50 +31,19 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
3031
*
3132
* @param {PositiveInteger} N - number of indexed elements
3233
* @param {Float32Array} x - input array
33-
* @param {integer} stride - stride length
34+
* @param {integer} strideX - stride length
3435
* @returns {number} arithmetic mean
3536
*
3637
* @example
3738
* var Float32Array = require( '@stdlib/array/float32' );
3839
*
3940
* var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
40-
* var N = x.length;
4141
*
42-
* var v = snanmeanors( N, x, 1 );
42+
* var v = snanmeanors( x.length, x, 1 );
4343
* // returns ~0.3333
4444
*/
45-
function snanmeanors( N, x, stride ) {
46-
var sum;
47-
var ix;
48-
var v;
49-
var n;
50-
var i;
51-
52-
if ( N <= 0 ) {
53-
return NaN;
54-
}
55-
if ( N === 1 || stride === 0 ) {
56-
return x[ 0 ];
57-
}
58-
if ( stride < 0 ) {
59-
ix = (1-N) * stride;
60-
} else {
61-
ix = 0;
62-
}
63-
sum = 0.0;
64-
n = 0;
65-
for ( i = 0; i < N; i++ ) {
66-
v = x[ ix ];
67-
if ( v === v ) {
68-
sum = float64ToFloat32( sum + v );
69-
n += 1;
70-
}
71-
ix += stride;
72-
}
73-
if ( n === 0 ) {
74-
return NaN;
75-
}
76-
return float64ToFloat32( sum / n );
45+
function snanmeanors( N, x, strideX ) {
46+
return ndarray( N, x, strideX, stride2offset( N, strideX ) );
7747
}
7848

7949

‎lib/node_modules/@stdlib/stats/base/snanmeanors/lib/snanmeanors.native.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' );
3030
*
3131
* @param {PositiveInteger} N - number of indexed elements
3232
* @param {Float32Array} x - input array
33-
* @param {integer} stride - stride length
33+
* @param {integer} strideX - stride length
3434
* @returns {number} arithmetic mean
3535
*
3636
* @example
3737
* var Float32Array = require( '@stdlib/array/float32' );
3838
*
3939
* var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
40-
* var N = x.length;
4140
*
42-
* var v = snanmeanors( N, x, 1 );
41+
* var v = snanmeanors( x.length, x, 1 );
4342
* // returns ~0.3333
4443
*/
45-
function snanmeanors( N, x, stride ) {
46-
return addon( N, x, stride );
44+
function snanmeanors( N, x, strideX ) {
45+
return addon( N, x, strideX );
4746
}
4847

4948

‎lib/node_modules/@stdlib/stats/base/snanmeanors/manifest.json‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"options": {
3-
"task": "build"
3+
"task": "build",
4+
"wasm": false
45
},
56
"fields": [
67
{
@@ -27,17 +28,18 @@
2728
"confs": [
2829
{
2930
"task": "build",
31+
"wasm": false,
3032
"src": [
31-
"./src/snanmeanors.c"
33+
"./src/main.c"
3234
],
3335
"include": [
3436
"./include"
3537
],
36-
"libraries": [
37-
"-lm"
38-
],
38+
"libraries": [],
3939
"libpath": [],
4040
"dependencies": [
41+
"@stdlib/blas/base/shared",
42+
"@stdlib/strided/base/stride2offset",
4143
"@stdlib/napi/export",
4244
"@stdlib/napi/argv",
4345
"@stdlib/napi/argv-int64",
@@ -47,31 +49,51 @@
4749
},
4850
{
4951
"task": "benchmark",
52+
"wasm": false,
5053
"src": [
51-
"./src/snanmeanors.c"
54+
"./src/main.c"
5255
],
5356
"include": [
5457
"./include"
5558
],
56-
"libraries": [
57-
"-lm"
58-
],
59+
"libraries": [],
5960
"libpath": [],
60-
"dependencies": []
61+
"dependencies": [
62+
"@stdlib/blas/base/shared",
63+
"@stdlib/strided/base/stride2offset"
64+
]
6165
},
6266
{
6367
"task": "examples",
68+
"wasm": false,
6469
"src": [
65-
"./src/snanmeanors.c"
70+
"./src/main.c"
6671
],
6772
"include": [
6873
"./include"
6974
],
70-
"libraries": [
71-
"-lm"
75+
"libraries": [],
76+
"libpath": [],
77+
"dependencies": [
78+
"@stdlib/blas/base/shared",
79+
"@stdlib/strided/base/stride2offset"
80+
]
81+
},
82+
{
83+
"task": "",
84+
"wasm": true,
85+
"src": [
86+
"./src/main.c"
7287
],
88+
"include": [
89+
"./include"
90+
],
91+
"libraries": [],
7392
"libpath": [],
74-
"dependencies": []
93+
"dependencies": [
94+
"@stdlib/blas/base/shared",
95+
"@stdlib/strided/base/stride2offset"
96+
]
7597
}
7698
]
7799
}

‎lib/node_modules/@stdlib/stats/base/snanmeanors/src/addon.c‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919
#include "stdlib/stats/base/snanmeanors.h"
20+
#include "stdlib/blas/base/shared.h"
2021
#include "stdlib/napi/export.h"
2122
#include "stdlib/napi/argv.h"
2223
#include "stdlib/napi/argv_int64.h"
@@ -34,10 +35,27 @@
3435
static napi_value addon( napi_env env, napi_callback_info info ) {
3536
STDLIB_NAPI_ARGV( env, info, argv, argc, 3 );
3637
STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 );
37-
STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 );
38-
STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 );
39-
STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_snanmeanors( N, X, stride ), v );
38+
STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 );
39+
STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 );
40+
STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(stdlib_strided_snanmeanors)( N, X, strideX ), v );
4041
return v;
4142
}
4243

43-
STDLIB_NAPI_MODULE_EXPORT_FCN( addon )
44+
/**
45+
* Receives JavaScript callback invocation data.
46+
*
47+
* @param env environment under which the function is invoked
48+
* @param info callback data
49+
* @return Node-API value
50+
*/
51+
static napi_value addon_method( napi_env env, napi_callback_info info ) {
52+
STDLIB_NAPI_ARGV( env, info, argv, argc, 4 );
53+
STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 );
54+
STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 );
55+
STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 );
56+
STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 );
57+
STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(stdlib_strided_snanmeanors_ndarray)( N, X, strideX, offsetX ), v );
58+
return v;
59+
}
60+
61+
STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method )

lib/node_modules/@stdlib/stats/base/snanmeanors/src/snanmeanors.c renamed to lib/node_modules/@stdlib/stats/base/snanmeanors/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ float API_SUFFIX(stdlib_strided_snanmeanors)( const CBLAS_INT N, const float *X,
4242
* @param offsetX starting index
4343
* @return output value
4444
*/
45-
float API_SUFFIX(stdlib_strided_snanmeanors)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) {
45+
float API_SUFFIX(stdlib_strided_snanmeanors_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) {
4646
CBLAS_INT ix;
4747
CBLAS_INT i;
4848
CBLAS_INT n;

0 commit comments

Comments
 (0)