From 4311c9c06c0692323e038a021495afdecdb5bd9b Mon Sep 17 00:00:00 2001 From: gururaj1512 Date: Sun, 20 Jul 2025 17:58:52 +0000 Subject: [PATCH 1/2] feat: add C ndarray interface and refactor implementation for `stats/base/snanmean` --- 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: passed - task: lint_package_json status: na - task: lint_repl_help status: passed - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: passed - task: lint_javascript_tests status: passed - task: lint_javascript_benchmarks status: passed - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: missing_dependencies - task: lint_c_examples status: missing_dependencies - task: lint_c_benchmarks status: missing_dependencies - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: passed - task: lint_typescript_tests status: na - task: lint_license_headers status: passed --- --- .../@stdlib/stats/base/snanmean/README.md | 179 ++++++++++++++---- .../base/snanmean/benchmark/benchmark.js | 30 +-- .../snanmean/benchmark/benchmark.native.js | 30 +-- .../snanmean/benchmark/benchmark.ndarray.js | 30 +-- .../benchmark/benchmark.ndarray.native.js | 30 +-- .../snanmean/benchmark/c/benchmark.length.c | 58 +++++- .../@stdlib/stats/base/snanmean/docs/repl.txt | 36 ++-- .../stats/base/snanmean/docs/types/index.d.ts | 12 +- .../stats/base/snanmean/examples/c/example.c | 9 +- .../stats/base/snanmean/examples/index.js | 21 +- .../include/stdlib/stats/base/snanmean.h | 9 +- .../@stdlib/stats/base/snanmean/lib/index.js | 9 +- .../stats/base/snanmean/lib/ndarray.js | 14 +- .../stats/base/snanmean/lib/ndarray.native.js | 22 +-- .../stats/base/snanmean/lib/snanmean.js | 12 +- .../base/snanmean/lib/snanmean.native.js | 9 +- .../@stdlib/stats/base/snanmean/manifest.json | 45 +++-- .../@stdlib/stats/base/snanmean/src/addon.c | 26 ++- .../@stdlib/stats/base/snanmean/src/main.c | 48 +++++ .../stats/base/snanmean/src/snanmean.c | 33 ---- .../stats/base/snanmean/test/test.ndarray.js | 13 +- .../base/snanmean/test/test.ndarray.native.js | 13 +- .../stats/base/snanmean/test/test.snanmean.js | 13 +- .../snanmean/test/test.snanmean.native.js | 13 +- 24 files changed, 449 insertions(+), 265 deletions(-) create mode 100644 lib/node_modules/@stdlib/stats/base/snanmean/src/main.c delete mode 100644 lib/node_modules/@stdlib/stats/base/snanmean/src/snanmean.c diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/README.md b/lib/node_modules/@stdlib/stats/base/snanmean/README.md index f4ff7acde953..6960636ccbc1 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/README.md +++ b/lib/node_modules/@stdlib/stats/base/snanmean/README.md @@ -51,17 +51,16 @@ The [arithmetic mean][arithmetic-mean] is defined as var snanmean = require( '@stdlib/stats/base/snanmean' ); ``` -#### snanmean( N, x, stride ) +#### snanmean( N, x, strideX ) -Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array `x`, ignoring `NaN` values. +Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values. ```javascript var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = snanmean( N, x, 1 ); +var v = snanmean( x.length, x, 1 ); // returns ~0.3333 ``` @@ -69,39 +68,34 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float32Array`][@stdlib/array/float32]. -- **stride**: index increment for `x`. +- **strideX**: stride length. -The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the [arithmetic mean][arithmetic-mean] of every other element in `x`, +The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the [arithmetic mean][arithmetic-mean] of every other element in `x`, ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0, NaN ] ); -var N = floor( x.length / 2 ); -var v = snanmean( N, x, 2 ); +var v = snanmean( 4, x, 2 ); // returns 1.25 ``` Note that indexing is relative to the first index. To introduce an offset, use [`typed array`][mdn-typed-array] views. - + ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); -var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] ); +var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = snanmean( N, x1, 2 ); +var v = snanmean( 5, x1, 2 ); // returns 1.25 ``` -#### snanmean.ndarray( N, x, stride, offset ) +#### snanmean.ndarray( N, x, strideX, offsetX ) Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. @@ -109,26 +103,25 @@ Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-p var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = snanmean.ndarray( N, x, 1, 0 ); +var v = snanmean.ndarray( x.length, x, 1, 0 ); // returns ~0.33333 ``` The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offsetX**: starting index. + +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, the offset parameter supports indexing semantics based on a starting index. For example, to calculate the [arithmetic mean][arithmetic-mean] for every other element in `x` starting from the second element -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to calculate the [arithmetic mean][arithmetic-mean] for every other value in `x` starting from the second value + ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); -var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] ); -var N = floor( x.length / 2 ); +var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); -var v = snanmean.ndarray( N, x, 2, 1 ); +var v = snanmean.ndarray( 5, x, 2, 1 ); // returns 1.25 ``` @@ -154,22 +147,19 @@ var v = snanmean.ndarray( N, x, 2, 1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); var snanmean = require( '@stdlib/stats/base/snanmean' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( (randu()*100.0) - 50.0 ); +function rand() { + if ( bernoulli( 0.8 ) < 1 ) { + return NaN; } + return uniform( -50.0, 50.0 ); } + +var x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var v = snanmean( x.length, x, 1 ); @@ -180,6 +170,123 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/stats/base/snanmean.h" +``` + +#### stdlib_strided_snanmean( N, \*X, strideX ) + +Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values. + +```c +const float x[] = { 1.0f, 2.0f, 3.0f, 0.0f/0.0f }; + +float v = stdlib_strided_snanmean( 4, x, 1 ); +// returns 2.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length. + +```c +float stdlib_strided_snanmean( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_snanmean_ndarray( N, \*X, strideX, offsetX ) + +Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. + +```c +const float x[] = { 1.0f, 2.0f, 3.0f, 0.0f/0.0f }; + +float v = stdlib_strided_snanmean_ndarray( 4, x, 1, 0 ); +// returns 2.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length. +- **offsetX**: `[in] CBLAS_INT` starting index. + +```c +float stdlib_strided_snanmean_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/snanmean.h" +#include + +int main( void ) { + // Create a strided array: + const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 3.0f, 0.0f/0.0f, 4.0f, 5.0f, 6.0f, 0.0f/0.0f, 7.0f, 8.0f, 0.0f/0.0f }; + + // Specify the number of elements: + const int N = 6; + + // Specify the stride length: + const int strideX = 2; + + // Compute the arithmetic mean: + float v = stdlib_strided_snanmean( N, x, strideX ); + + // Print the result: + printf( "mean: %f\n", v ); +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.js index 3b1302bef4bc..e3508e349f2b 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.js @@ -21,16 +21,30 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var snanmean = require( './../lib/snanmean.js' ); // FUNCTIONS // +/** +* Returns a random value or `NaN`. +* +* @private +* @returns {number} random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.8 ) < 1 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -39,17 +53,7 @@ var snanmean = require( './../lib/snanmean.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.native.js index 971a2c98d5ec..85ec61580225 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -40,6 +41,19 @@ var opts = { // FUNCTIONS // +/** +* Returns a random value or `NaN`. +* +* @private +* @returns {number} random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.8 ) < 1 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -48,17 +62,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.js index 0648f47a5504..4b9d5cb8f991 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.js @@ -21,16 +21,30 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var snanmean = require( './../lib/ndarray.js' ); // FUNCTIONS // +/** +* Returns a random value or `NaN`. +* +* @private +* @returns {number} random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.8 ) < 1 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -39,17 +53,7 @@ var snanmean = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.native.js index cf2a2adf66e0..5eb90d4acca5 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -40,6 +41,19 @@ var opts = { // FUNCTIONS // +/** +* Returns a random value or `NaN`. +* +* @private +* @returns {number} random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.8 ) < 1 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -48,17 +62,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/c/benchmark.length.c index 8b5994cd81c1..52dc63c2c1ed 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/snanmean/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static float rand_float( void ) { * @param len array length * @return elapsed time in seconds */ -static double benchmark( int iterations, int len ) { +static double benchmark1( int iterations, int len ) { double elapsed; float x[ len ]; float v; @@ -102,7 +102,11 @@ static double benchmark( int iterations, int len ) { int i; for ( i = 0; i < len; i++ ) { - x[ i ] = ( rand_float()*20000.0f ) - 10000.0f; + if ( rand_float() < 0.2 ) { + x[ i ] = 0.0f / 0.0f; // NaN + } else { + x[ i ] = ( rand_float() * 20000.0f ) - 10000.0f; + } } v = 0.0f; t = tic(); @@ -120,6 +124,43 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + float x[ len ]; + float v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + if ( rand_float() < 0.2 ) { + x[ i ] = 0.0f / 0.0f; // NaN + } else { + x[ i ] = ( rand_float() * 20000.0f ) - 10000.0f; + } + } + v = 0.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + v = stdlib_strided_snanmean_ndarray( len, x, 1, 0 ); + if ( v != v ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( v != v ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -142,7 +183,18 @@ int main( void ) { for ( j = 0; j < REPEATS; j++ ) { count += 1; printf( "# c::%s:len=%d\n", NAME, len ); - elapsed = benchmark( iter, len ); + elapsed = benchmark1( iter, len ); + print_results( iter, elapsed ); + printf( "ok %d benchmark finished\n", count ); + } + } + for ( i = MIN; i <= MAX; i++ ) { + len = pow( 10, i ); + iter = ITERATIONS / pow( 10, i-1 ); + for ( j = 0; j < REPEATS; j++ ) { + count += 1; + printf( "# c::%s:ndarray:len=%d\n", NAME, len ); + elapsed = benchmark2( iter, len ); print_results( iter, elapsed ); printf( "ok %d benchmark finished\n", count ); } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/snanmean/docs/repl.txt index d7be8ce46f73..526a8040ba2f 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/snanmean/docs/repl.txt @@ -1,10 +1,10 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values. - The `N` and `stride` parameters determine which elements in `x` are accessed - at runtime. + The `N` and stride parameters determine which elements in the strided array + are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -21,8 +21,8 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. Returns ------- @@ -36,22 +36,19 @@ > {{alias}}( x.length, x, 1 ) ~0.3333 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 4, x, 2 ) ~0.3333 // Using view offsets: - > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN ] ); + > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); > var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 4, x1, 2 ) ~-0.3333 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. @@ -67,10 +64,10 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. - offset: integer + offsetX: integer Starting index. Returns @@ -86,9 +83,8 @@ ~0.3333 // Using offset parameter: - > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); + > {{alias}}.ndarray( 4, x, 2, 1 ) ~-0.3333 See Also diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/snanmean/docs/types/index.d.ts index 3003fd8439f3..83977cfd7704 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/snanmean/docs/types/index.d.ts @@ -27,7 +27,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns arithmetic mean * * @example @@ -38,15 +38,15 @@ interface Routine { * var v = snanmean( x.length, x, 1 ); * // returns ~0.3333 */ - ( N: number, x: Float32Array, stride: number ): number; + ( N: number, x: Float32Array, strideX: number ): number; /** * Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns arithmetic mean * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = snanmean.ndarray( x.length, x, 1, 0 ); * // returns ~0.3333 */ - ndarray( N: number, x: Float32Array, stride: number, offset: number ): number; + ndarray( N: number, x: Float32Array, strideX: number, offsetX: number ): number; } /** @@ -65,7 +65,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array -* @param stride - stride length +* @param strideX - stride length * @returns arithmetic mean * * @example diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/examples/c/example.c b/lib/node_modules/@stdlib/stats/base/snanmean/examples/c/example.c index 2cad9f77fe6b..4d64e99acfda 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/examples/c/example.c +++ b/lib/node_modules/@stdlib/stats/base/snanmean/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/stats/base/snanmean.h" -#include #include int main( void ) { // Create a strided array: - float x[] = { 1.0, 2.0, 0.0/0.0, 3.0, 0.0/0.0, 4.0, 5.0, 6.0, 0.0/0.0, 7.0, 8.0, 0.0/0.0 }; + const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 3.0f, 0.0f/0.0f, 4.0f, 5.0f, 6.0f, 0.0f/0.0f, 7.0f, 8.0f, 0.0f/0.0f }; // Specify the number of elements: - int64_t N = 6; + const int N = 6; // Specify the stride length: - int64_t stride = 2; + const int strideX = 2; // Compute the arithmetic mean: - float v = stdlib_strided_snanmean( N, x, stride ); + float v = stdlib_strided_snanmean( N, x, strideX ); // Print the result: printf( "mean: %f\n", v ); diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/examples/index.js b/lib/node_modules/@stdlib/stats/base/snanmean/examples/index.js index e64f4b52ab1c..8ba7009a4d7f 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/examples/index.js @@ -18,22 +18,19 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); var snanmean = require( './../lib' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( (randu()*100.0) - 50.0 ); +function rand() { + if ( bernoulli( 0.8 ) < 1 ) { + return NaN; } + return uniform( -50.0, 50.0 ); } + +var x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var v = snanmean( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/include/stdlib/stats/base/snanmean.h b/lib/node_modules/@stdlib/stats/base/snanmean/include/stdlib/stats/base/snanmean.h index fedf62202db3..f9a70ee868de 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/include/stdlib/stats/base/snanmean.h +++ b/lib/node_modules/@stdlib/stats/base/snanmean/include/stdlib/stats/base/snanmean.h @@ -19,7 +19,7 @@ #ifndef STDLIB_STATS_BASE_SNANMEAN_H #define STDLIB_STATS_BASE_SNANMEAN_H -#include +#include "stdlib/blas/base/shared.h" /* * 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" { /** * Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values. */ -float stdlib_strided_snanmean( const int64_t N, const float *X, const int64_t stride ); +float API_SUFFIX(stdlib_strided_snanmean)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); + +/** +* Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. +*/ +float API_SUFFIX(stdlib_strided_snanmean_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/lib/index.js b/lib/node_modules/@stdlib/stats/base/snanmean/lib/index.js index b935fb31061e..5fc33faa012a 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/lib/index.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/lib/index.js @@ -28,20 +28,17 @@ * var snanmean = require( '@stdlib/stats/base/snanmean' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = snanmean( N, x, 1 ); +* var v = snanmean( x.length, x, 1 ); * // returns ~0.3333 * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var snanmean = require( '@stdlib/stats/base/snanmean' ); * -* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] ); -* var N = floor( x.length / 2 ); +* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); * -* var v = snanmean.ndarray( N, x, 2, 1 ); +* var v = snanmean.ndarray( 5, x, 2, 1 ); * // returns 1.25 */ diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.js index ee01f8c74f31..88f3f8a96a95 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.js @@ -30,22 +30,20 @@ var snanmeanpn = require( '@stdlib/stats/strided/snanmeanpn' ).ndarray; * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} arithmetic mean * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * -* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] ); -* var N = floor( x.length / 2 ); +* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); * -* var v = snanmean( N, x, 2, 1 ); +* var v = snanmean( 5, x, 2, 1 ); * // returns 1.25 */ -function snanmean( N, x, stride, offset ) { - return snanmeanpn( N, x, stride, offset ); +function snanmean( N, x, strideX, offsetX ) { + return snanmeanpn( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.native.js index 2f9b11a1e1ba..a142977b93be 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float32Array = require( '@stdlib/array/float32' ); -var addon = require( './snanmean.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,27 +30,20 @@ var addon = require( './snanmean.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} arithmetic mean * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * -* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] ); -* var N = floor( x.length / 2 ); +* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); * -* var v = snanmean( N, x, 2, 1 ); +* var v = snanmean( 5, x, 2, 1 ); * // returns 1.25 */ -function snanmean( N, x, stride, offset ) { - var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len - return addon( N, view, stride ); +function snanmean( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.js b/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.js index 998068c604d5..12b6c8538944 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.js @@ -20,7 +20,8 @@ // MODULES // -var snanmeanpn = require( '@stdlib/stats/strided/snanmeanpn' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -30,20 +31,19 @@ var snanmeanpn = require( '@stdlib/stats/strided/snanmeanpn' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} arithmetic mean * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = snanmean( N, x, 1 ); +* var v = snanmean( x.length, x, 1 ); * // returns ~0.3333 */ -function snanmean( N, x, stride ) { - return snanmeanpn( N, x, stride ); +function snanmean( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.native.js b/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.native.js index 18bf639fafb2..e0e0016d0ca8 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.native.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/lib/snanmean.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} arithmetic mean * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = snanmean( N, x, 1 ); +* var v = snanmean( x.length, x, 1 ); * // returns ~0.3333 */ -function snanmean( N, x, stride ) { - return addon( N, x, stride ); +function snanmean( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/manifest.json b/lib/node_modules/@stdlib/stats/base/snanmean/manifest.json index e995bc8acbce..8ce576f0bd0d 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/snanmean/manifest.json @@ -1,6 +1,7 @@ { "options": { - "task": "build" + "task": "build", + "wasm": false }, "fields": [ { @@ -27,17 +28,18 @@ "confs": [ { "task": "build", + "wasm": false, "src": [ - "./src/snanmean.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/stats/strided/snanmeanpn", "@stdlib/napi/export", "@stdlib/napi/argv", @@ -48,33 +50,52 @@ }, { "task": "benchmark", + "wasm": false, "src": [ - "./src/snanmean.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/stats/strided/snanmeanpn" ] }, { "task": "examples", + "wasm": false, "src": [ - "./src/snanmean.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/stats/strided/snanmeanpn" + ] + }, + { + "task": "", + "wasm": true, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/stats/strided/snanmeanpn" ] } diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/src/addon.c b/lib/node_modules/@stdlib/stats/base/snanmean/src/addon.c index 8c7fe19e67e7..bdbd6e0c13a4 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/snanmean/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/stats/base/snanmean.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" @@ -34,10 +35,27 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 3 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); - STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); - STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); - STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_snanmean( N, X, stride ), v ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(stdlib_strided_snanmean)( N, X, strideX ), v ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) +/** +* Receives JavaScript callback invocation data. +* +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon_method( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 4 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(stdlib_strided_snanmean_ndarray)( N, X, strideX, offsetX ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c b/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c new file mode 100644 index 000000000000..66dcf3403926 --- /dev/null +++ b/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c @@ -0,0 +1,48 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2020 The Stdlib Authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "stdlib/stats/base/snanmean.h" +#include "stdlib/stats/strided/snanmeanpn.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" + +/** +* Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @return output value +*/ +float API_SUFFIX(stdlib_strided_snanmean)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_snanmean_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @param offsetX starting index +* @return output value +*/ +float API_SUFFIX(stdlib_strided_snanmean_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + return API_SUFFIX(stdlib_strided_snanmeanpn_ndarray)( N, X, strideX, offsetX ); +} diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/src/snanmean.c b/lib/node_modules/@stdlib/stats/base/snanmean/src/snanmean.c deleted file mode 100644 index c574b44fc251..000000000000 --- a/lib/node_modules/@stdlib/stats/base/snanmean/src/snanmean.c +++ /dev/null @@ -1,33 +0,0 @@ -/** -* @license Apache-2.0 -* -* Copyright (c) 2020 The Stdlib Authors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -#include "stdlib/stats/base/snanmean.h" -#include "stdlib/stats/strided/snanmeanpn.h" -#include - -/** -* Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values. -* -* @param N number of indexed elements -* @param X input array -* @param stride stride length -* @return output value -*/ -float stdlib_strided_snanmean( const int64_t N, const float *X, const int64_t stride ) { - return stdlib_strided_snanmeanpn( N, X, stride ); -} diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.js index 25491eb00925..a139a44bcf19 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var snanmean = require( './../lib/ndarray.js' ); @@ -90,7 +89,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -106,15 +104,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN // 4 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, 2, 0 ); + v = snanmean( 5, x, 2, 0 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -130,8 +126,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) NaN // 0 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, -2, 6 ); + v = snanmean( 5, x, -2, 8 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -150,7 +145,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -166,9 +160,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, 2, 1 ); + v = snanmean( 5, x, 2, 1 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.native.js index 6f473d1c9177..72fe315b51fe 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.ndarray.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -99,7 +98,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -115,15 +113,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN // 4 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, 2, 0 ); + v = snanmean( 5, x, 2, 0 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -139,8 +135,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test NaN // 0 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, -2, 6 ); + v = snanmean( 5, x, -2, 8 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -159,7 +154,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -175,9 +169,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, 2, 1 ); + v = snanmean( 5, x, 2, 1 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.js b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.js index fbbd72bb07a1..db770272b196 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var snanmean = require( './../lib/snanmean.js' ); @@ -90,7 +89,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -106,15 +104,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN // 4 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, 2 ); + v = snanmean( 5, x, 2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -130,8 +126,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) NaN // 0 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, -2 ); + v = snanmean( 5, x, -2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -152,7 +147,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -169,9 +163,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = snanmean( N, x1, 2 ); + v = snanmean( 5, x1, 2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.native.js b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.native.js index b5598b063b5c..f70f63b7262b 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.native.js +++ b/lib/node_modules/@stdlib/stats/base/snanmean/test/test.snanmean.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -181,7 +180,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -197,15 +195,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN // 4 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, 2 ); + v = snanmean( 5, x, 2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -221,8 +217,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test NaN // 0 ]); - N = floor( x.length / 2 ); - v = snanmean( N, x, -2 ); + v = snanmean( 5, x, -2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -243,7 +238,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -260,9 +254,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = snanmean( N, x1, 2 ); + v = snanmean( 5, x1, 2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); From 73f0f013cc7ebf8c1a96439e5e98c605bbba3a88 Mon Sep 17 00:00:00 2001 From: stdlib-bot <82920195+stdlib-bot@users.noreply.github.com> Date: Sun, 27 Jul 2025 11:15:44 +0000 Subject: [PATCH 2/2] chore: update copyright years --- lib/node_modules/@stdlib/stats/base/snanmean/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c b/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c index 66dcf3403926..400b0388744b 100644 --- a/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c +++ b/lib/node_modules/@stdlib/stats/base/snanmean/src/main.c @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* Copyright (c) 2025 The Stdlib Authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.