Skip to content

Commit 62251fa

Browse files
Neerajpathak07Neerajpathak07
committed
feat: ndarray-dnanrange
1 parent a9c3cee commit 62251fa

File tree

15 files changed

+199
-256
lines changed

15 files changed

+199
-256
lines changed

‎lib/node_modules/@stdlib/stats/base/dnanrange/include.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Source files:
3838
'src_files': [
39-
'<(src_dir)/addon.cpp',
39+
'<(src_dir)/addon.c',
4040
'<!@(node -e "var arr = require(\'@stdlib/utils/library-manifest\')(\'./manifest.json\',{},{\'basedir\':process.cwd(),\'paths\':\'posix\'}).src; for ( var i = 0; i < arr.length; i++ ) { console.log( arr[ i ] ); }")',
4141
],
4242

‎lib/node_modules/@stdlib/stats/base/dnanrange/include/stdlib/stats/base/dnanrange.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef STDLIB_STATS_BASE_DNANRANGE_H
2020
#define STDLIB_STATS_BASE_DNANRANGE_H
2121

22-
#include <stdint.h>
22+
#include "stdlib/blas/base/shared.h"
2323

2424
/*
2525
* If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler.
@@ -31,7 +31,12 @@ extern "C" {
3131
/**
3232
* Computes the range of a double-precision floating-point strided array, ignoring `NaN` values.
3333
*/
34-
double stdlib_strided_dnanrange( const int64_t N, const double *X, const int64_t stride );
34+
double API_SUFFIX(stdlib_strided_dnanrange)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX );
35+
36+
/**
37+
* Computes the maximum absolute value of a double-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics .
38+
*/
39+
double API_SUFFIX(stdlib_strided_dnanrange_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX );
3540

3641
#ifdef __cplusplus
3742
}

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

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

2121
// MODULES //
2222

23-
var isnan = require( '@stdlib/math/base/assert/is-nan' );
23+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
24+
var ndarray = require( './ndarray.js' );
2425

2526

2627
// MAIN //
@@ -30,7 +31,7 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' );
3031
*
3132
* @param {PositiveInteger} N - number of indexed elements
3233
* @param {Float64Array} x - input array
33-
* @param {integer} stride - stride length
34+
* @param {integer} strideX - stride length
3435
* @returns {number} range
3536
*
3637
* @example
@@ -39,56 +40,11 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' );
3940
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
4041
* var N = x.length;
4142
*
42-
* var v = dnanrange( N, x, 1 );
43+
* var v = dnanrange( x.length, x, 1 );
4344
* // returns 4.0
4445
*/
45-
function dnanrange( N, x, stride ) {
46-
var max;
47-
var min;
48-
var ix;
49-
var v;
50-
var i;
51-
52-
if ( N <= 0 ) {
53-
return NaN;
54-
}
55-
if ( N === 1 || stride === 0 ) {
56-
if ( isnan( x[ 0 ] ) ) {
57-
return NaN;
58-
}
59-
return 0.0;
60-
}
61-
if ( stride < 0 ) {
62-
ix = (1-N) * stride;
63-
} else {
64-
ix = 0;
65-
}
66-
for ( i = 0; i < N; i++ ) {
67-
v = x[ ix ];
68-
if ( v === v ) {
69-
break;
70-
}
71-
ix += stride;
72-
}
73-
if ( i === N ) {
74-
return NaN;
75-
}
76-
min = v;
77-
max = min;
78-
i += 1;
79-
for ( i; i < N; i++ ) {
80-
ix += stride;
81-
v = x[ ix ];
82-
if ( isnan( v ) ) {
83-
continue;
84-
}
85-
if ( v < min ) {
86-
min = v;
87-
} else if ( v > max ) {
88-
max = v;
89-
}
90-
}
91-
return max - min;
46+
function dnanrange( N, x, strideX ) {
47+
return ndarray( N, x, strideX, stride2offset( N, strideX ) );
9248
}
9349

9450

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var addon = require( './../src/addon.node' );
3030
*
3131
* @param {PositiveInteger} N - number of indexed elements
3232
* @param {Float64Array} x - input array
33-
* @param {integer} stride - stride length
33+
* @param {integer} strideX - stride length
3434
* @returns {number} range
3535
*
3636
* @example
@@ -39,11 +39,11 @@ var addon = require( './../src/addon.node' );
3939
* var x = new Float64Array( [ 1.0, -2.0, 2.0, NaN ] );
4040
* var N = x.length;
4141
*
42-
* var v = dnanrange( N, x, 1 );
42+
* var v = dnanrange( x.length, x, 1 );
4343
* // returns 4.0
4444
*/
45-
function dnanrange( N, x, stride ) {
46-
return addon( N, x, stride );
45+
function dnanrange( N, x, strideX ) {
46+
return addon( N, x, strideX );
4747
}
4848

4949

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,16 @@
3030
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
3131
* var N = x.length;
3232
*
33-
* var v = dnanrange( N, x, 1 );
33+
* var v = dnanrange( x.length, x, 1 );
3434
* // returns 4.0
3535
*
3636
* @example
3737
* var Float64Array = require( '@stdlib/array/float64' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3938
* var dnanrange = require( '@stdlib/stats/base/dnanrange' );
4039
*
4140
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = dnanrange.ndarray( N, x, 2, 1 );
42+
* var v = dnanrange.ndarray( 5, x, 2, 1 );
4543
* // returns 6.0
4644
*/
4745

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' );
3030
*
3131
* @param {PositiveInteger} N - number of indexed elements
3232
* @param {Float64Array} 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} range
3636
*
3737
* @example
3838
* var Float64Array = require( '@stdlib/array/float64' );
39-
* var floor = require( '@stdlib/math/base/special/floor' );
4039
*
4140
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = dnanrange( N, x, 2, 1 );
42+
* var v = dnanrange( 5, x, 2, 1 );
4543
* // returns 6.0
4644
*/
47-
function dnanrange( N, x, stride, offset ) {
45+
function dnanrange( N, x, strideX, offsetX ) {
4846
var max;
4947
var min;
5048
var ix;
@@ -54,19 +52,19 @@ function dnanrange( N, x, stride, offset ) {
5452
if ( N <= 0 ) {
5553
return NaN;
5654
}
57-
if ( N === 1 || stride === 0 ) {
58-
if ( isnan( x[ offset ] ) ) {
59-
return x[ offset ];
55+
if ( N === 1 || strideX === 0 ) {
56+
if ( isnan( x[ offsetX ] ) ) {
57+
return x[ offsetX ];
6058
}
6159
return 0.0;
6260
}
63-
ix = offset;
61+
ix = offsetX;
6462
for ( i = 0; i < N; i++ ) {
6563
v = x[ ix ];
6664
if ( v === v ) {
6765
break;
6866
}
69-
ix += stride;
67+
ix += strideX;
7068
}
7169
if ( i === N ) {
7270
return NaN;
@@ -75,7 +73,7 @@ function dnanrange( N, x, stride, offset ) {
7573
max = min;
7674
i += 1;
7775
for ( i; i < N; i++ ) {
78-
ix += stride;
76+
ix += strideX;
7977
v = x[ ix ];
8078
if ( isnan( v ) ) {
8179
continue;

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

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

2121
// MODULES //
2222

23-
var Float64Array = require( '@stdlib/array/float64' );
24-
var addon = require( './dnanrange.native.js' );
23+
var addon = require( './../src/addon.node' );
2524

2625

2726
// MAIN //
@@ -31,27 +30,20 @@ var addon = require( './dnanrange.native.js' );
3130
*
3231
* @param {PositiveInteger} N - number of indexed elements
3332
* @param {Float64Array} 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} range
3736
*
3837
* @example
3938
* var Float64Array = require( '@stdlib/array/float64' );
40-
* var floor = require( '@stdlib/math/base/special/floor' );
4139
*
4240
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
43-
* var N = floor( x.length / 2 );
4441
*
4542
* var v = dnanrange( N, x, 2, 1 );
4643
* // returns 6.0
4744
*/
48-
function dnanrange( N, x, stride, offset ) {
49-
var view;
50-
if ( stride < 0 ) {
51-
offset += (N-1) * stride;
52-
}
53-
view = new Float64Array( 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 dnanrange( N, x, strideX, offsetX ) {
46+
return addon.ndarray( N, x, strideX, offsetX );
5547
}
5648

5749

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

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
2-
"options": {},
2+
"options": {
3+
"task": "build",
4+
"wasm": false
5+
},
36
"fields": [
47
{
58
"field": "src",
@@ -24,8 +27,10 @@
2427
],
2528
"confs": [
2629
{
30+
"task": "build",
31+
"wasm":false,
2732
"src": [
28-
"./src/dnanrange.c"
33+
"./src/main.c"
2934
],
3035
"include": [
3136
"./include"
@@ -35,6 +40,64 @@
3540
],
3641
"libpath": [],
3742
"dependencies": [
43+
"@stdlib/math/base/assert/is-nan",
44+
"@stdlib/blas/base/shared",
45+
"@stdlib/strided/base/stride2offset",
46+
"@stdlib/napi/export",
47+
"@stdlib/napi/argv",
48+
"@stdlib/napi/argv-int64",
49+
"@stdlib/napi/argv-strided-float64array",
50+
"@stdlib/napi/create-double"
51+
]
52+
},
53+
{
54+
"task": "benchmark",
55+
"wasm": false,
56+
"src": [
57+
"./src/main.c"
58+
],
59+
"include": [
60+
"./include"
61+
],
62+
"libraries": [],
63+
"libpath": [],
64+
"dependencies": [
65+
"@stdlib/blas/base/shared",
66+
"@stdlib/strided/base/stride2offset",
67+
"@stdlib/math/base/assert/is-nan"
68+
]
69+
},
70+
{
71+
"task": "examples",
72+
"wasm": false,
73+
"src": [
74+
"./src/main.c"
75+
],
76+
"include": [
77+
"./include"
78+
],
79+
"libraries": [],
80+
"libpath": [],
81+
"dependencies": [
82+
"@stdlib/blas/base/shared",
83+
"@stdlib/strided/base/stride2offset",
84+
"@stdlib/math/base/assert/is-nan"
85+
]
86+
},
87+
{
88+
"task": "",
89+
"wasm": true,
90+
"src": [
91+
"./src/main.c"
92+
],
93+
"include": [
94+
"./include"
95+
],
96+
"libraries": [],
97+
"libpath": [],
98+
"dependencies": [
99+
"@stdlib/blas/base/shared",
100+
"@stdlib/strided/base/stride2offset",
38101
"@stdlib/math/base/assert/is-nan"
39102
]
40103
}

0 commit comments

Comments
 (0)