Skip to content

Commit 01b7ba7

Browse files
feat: ndarray-dnanmeanpn
1 parent bfded30 commit 01b7ba7

File tree

15 files changed

+197
-302
lines changed

15 files changed

+197
-302
lines changed

lib/node_modules/@stdlib/stats/base/dnanmeanpn/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/dnanmeanpn/include/stdlib/stats/base/dnanmeanpn.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef STDLIB_STATS_BASE_DNANMEANPN_H
2020
#define STDLIB_STATS_BASE_DNANMEANPN_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 arithmetic mean of a double-precision floating-point strided array, ignoring `NaN` values and using a two-pass error correction algorithm.
3333
*/
34-
double stdlib_strided_dnanmeanpn( const int64_t N, const double *X, const int64_t stride );
34+
double API_SUFFIX(stdlib_strided_dnanmeanpn)( 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_dnanmeanpn_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/dnanmeanpn/lib/dnanmeanpn.js

Lines changed: 8 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818

1919
'use strict';
2020

21+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
22+
var ndarray = require( './ndarray.js' );
23+
24+
2125
// MAIN //
2226

2327
/**
@@ -34,7 +38,7 @@
3438
*
3539
* @param {PositiveInteger} N - number of indexed elements
3640
* @param {Float64Array} x - input array
37-
* @param {integer} stride - stride length
41+
* @param {integer} strideX - stride length
3842
* @returns {number} arithmetic mean
3943
*
4044
* @example
@@ -43,58 +47,11 @@
4347
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
4448
* var N = x.length;
4549
*
46-
* var v = dnanmeanpn( N, x, 1 );
50+
* var v = dnanmeanpn( x.length, x, 1 );
4751
* // returns ~0.3333
4852
*/
49-
function dnanmeanpn( N, x, stride ) {
50-
var ix;
51-
var v;
52-
var s;
53-
var t;
54-
var n;
55-
var i;
56-
var o;
57-
58-
if ( N <= 0 ) {
59-
return NaN;
60-
}
61-
if ( N === 1 || stride === 0 ) {
62-
return x[ 0 ];
63-
}
64-
if ( stride < 0 ) {
65-
ix = (1-N) * stride;
66-
} else {
67-
ix = 0;
68-
}
69-
o = ix;
70-
71-
// Compute an estimate for the mean...
72-
s = 0.0;
73-
n = 0;
74-
for ( i = 0; i < N; i++ ) {
75-
v = x[ ix ];
76-
if ( v === v ) {
77-
n += 1;
78-
s += v;
79-
}
80-
ix += stride;
81-
}
82-
if ( n === 0 ) {
83-
return NaN;
84-
}
85-
s /= n;
86-
87-
// Compute an error term...
88-
t = 0.0;
89-
ix = o;
90-
for ( i = 0; i < N; i++ ) {
91-
v = x[ ix ];
92-
if ( v === v ) {
93-
t += v - s;
94-
}
95-
ix += stride;
96-
}
97-
return s + (t/n);
53+
function dnanmeanpn( N, x, strideX ) {
54+
return ndarray( N, x, strideX, stride2offset( N, strideX ) );
9855
}
9956

10057

lib/node_modules/@stdlib/stats/base/dnanmeanpn/lib/dnanmeanpn.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} arithmetic mean
3535
*
3636
* @example
@@ -39,11 +39,11 @@ var addon = require( './../src/addon.node' );
3939
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
4040
* var N = x.length;
4141
*
42-
* var v = dnanmeanpn( N, x, 1 );
42+
* var v = dnanmeanpn( x.length, x, 1 );
4343
* // returns ~0.3333
4444
*/
45-
function dnanmeanpn( N, x, stride ) {
46-
return addon( N, x, stride );
45+
function dnanmeanpn( N, x, strideX ) {
46+
return addon( N, x, strideX );
4747
}
4848

4949

lib/node_modules/@stdlib/stats/base/dnanmeanpn/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 = 3;
3232
*
33-
* var v = dnanmeanpn( N, x, 1 );
33+
* var v = dnanmeanpn( 5, x, 1 );
3434
* // returns ~0.3333
3535
*
3636
* @example
3737
* var Float64Array = require( '@stdlib/array/float64' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3938
* var dnanmeanpn = require( '@stdlib/stats/base/dnanmeanpn' );
4039
*
4140
* var x = new Float64Array( [ 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 = dnanmeanpn.ndarray( N, x, 2, 1 );
42+
* var v = dnanmeanpn.ndarray( 5, x, 2, 1 );
4543
* // returns 1.25
4644
*/
4745

lib/node_modules/@stdlib/stats/base/dnanmeanpn/lib/ndarray.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,19 @@
3434
*
3535
* @param {PositiveInteger} N - number of indexed elements
3636
* @param {Float64Array} x - input array
37-
* @param {integer} stride - stride length
38-
* @param {NonNegativeInteger} offset - starting index
37+
* @param {integer} strideX - stride length
38+
* @param {NonNegativeInteger} offsetX - starting index
3939
* @returns {number} arithmetic mean
4040
*
4141
* @example
4242
* var Float64Array = require( '@stdlib/array/float64' );
43-
* var floor = require( '@stdlib/math/base/special/floor' );
4443
*
4544
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
46-
* var N = floor( x.length / 2 );
4745
*
48-
* var v = dnanmeanpn( N, x, 2, 1 );
46+
* var v = dnanmeanpn( 5, x, 2, 1 );
4947
* // returns 1.25
5048
*/
51-
function dnanmeanpn( N, x, stride, offset ) {
49+
function dnanmeanpn( N, x, strideX, offsetX ) {
5250
var ix;
5351
var v;
5452
var s;
@@ -59,10 +57,10 @@ function dnanmeanpn( N, x, stride, offset ) {
5957
if ( N <= 0 ) {
6058
return NaN;
6159
}
62-
if ( N === 1 || stride === 0 ) {
63-
return x[ offset ];
60+
if ( N === 1 || strideX === 0 ) {
61+
return x[ offsetX ];
6462
}
65-
ix = offset;
63+
ix = offsetX;
6664

6765
// Compute an estimate for the mean...
6866
s = 0.0;
@@ -73,22 +71,22 @@ function dnanmeanpn( N, x, stride, offset ) {
7371
n += 1;
7472
s += v;
7573
}
76-
ix += stride;
74+
ix += strideX;
7775
}
7876
if ( n === 0 ) {
7977
return NaN;
8078
}
8179
s /= n;
8280

8381
// Compute an error term...
84-
ix = offset;
82+
ix = offsetX;
8583
t = 0.0;
8684
for ( i = 0; i < N; i++ ) {
8785
v = x[ ix ];
8886
if ( v === v ) {
8987
t += v - s;
9088
}
91-
ix += stride;
89+
ix += strideX;
9290
}
9391
return s + (t/n);
9492
}

lib/node_modules/@stdlib/stats/base/dnanmeanpn/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 Float64Array = require( '@stdlib/array/float64' );
24-
var addon = require( './dnanmeanpn.native.js' );
23+
var addon = require( './../src/addon.node' );
2524

2625

2726
// MAIN //
@@ -31,27 +30,20 @@ var addon = require( './dnanmeanpn.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} arithmetic mean
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 ] );
43-
* var N = floor( x.length / 2 );
4441
*
45-
* var v = dnanmeanpn( N, x, 2, 1 );
42+
* var v = dnanmeanpn( 5, x, 2, 1 );
4643
* // returns 1.25
4744
*/
48-
function dnanmeanpn( 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 dnanmeanpn( N, x, strideX, offsetX ) {
46+
return addon.ndarray( N, x, strideX, offsetX );
5547
}
5648

5749

lib/node_modules/@stdlib/stats/base/dnanmeanpn/manifest.json

Lines changed: 64 additions & 5 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,17 +27,73 @@
2427
],
2528
"confs": [
2629
{
30+
"task": "build",
31+
"wasm": false,
2732
"src": [
28-
"./src/dnanmeanpn.c"
33+
"./src/main.c"
2934
],
3035
"include": [
3136
"./include"
3237
],
33-
"libraries": [
34-
"-lm"
38+
"libraries": [],
39+
"libpath": [],
40+
"dependencies": [
41+
"@stdlib/blas/base/shared",
42+
"@stdlib/strided/base/stride2offset",
43+
"@stdlib/napi/export",
44+
"@stdlib/napi/argv",
45+
"@stdlib/napi/argv-int64",
46+
"@stdlib/napi/argv-strided-float64array",
47+
"@stdlib/napi/create-double"
48+
]
49+
},
50+
{
51+
"task": "benchmark",
52+
"wasm": false,
53+
"src": [
54+
"./src/main.c"
55+
],
56+
"include": [
57+
"./include"
58+
],
59+
"libraries": [],
60+
"libpath": [],
61+
"dependencies": [
62+
"@stdlib/blas/base/shared",
63+
"@stdlib/strided/base/stride2offset"
64+
]
65+
},
66+
{
67+
"task": "examples",
68+
"wasm": false,
69+
"src": [
70+
"./src/main.c"
71+
],
72+
"include": [
73+
"./include"
74+
],
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"
87+
],
88+
"include": [
89+
"./include"
3590
],
91+
"libraries": [],
3692
"libpath": [],
37-
"dependencies": []
93+
"dependencies": [
94+
"@stdlib/blas/base/shared",
95+
"@stdlib/strided/base/stride2offset"
96+
]
3897
}
3998
]
4099
}

0 commit comments

Comments
 (0)