From cf9103870e009c5d792641fc53bc0822712b0b25 Mon Sep 17 00:00:00 2001 From: JoyBoy <144602492+0PrashantYadav0@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:01:10 +0530 Subject: [PATCH 1/3] refactor: updated stats/base/dsmeanlipw native addon from C++ to C --- .../@stdlib/stats/base/dmeanlipw/README.md | 146 ++++++++++++++---- .../base/dmeanlipw/benchmark/benchmark.js | 18 +-- .../dmeanlipw/benchmark/benchmark.native.js | 14 +- .../dmeanlipw/benchmark/benchmark.ndarray.js | 18 +-- .../benchmark/benchmark.ndarray.native.js | 14 +- .../dmeanlipw/benchmark/c/benchmark.length.c | 48 +++++- .../stats/base/dmeanlipw/docs/repl.txt | 33 ++-- .../base/dmeanlipw/docs/types/index.d.ts | 12 +- .../stats/base/dmeanlipw/examples/c/example.c | 9 +- .../stats/base/dmeanlipw/examples/index.js | 14 +- .../include/stdlib/stats/base/dmeanlipw.h | 9 +- .../stats/base/dmeanlipw/lib/dmeanlipw.js | 25 +-- .../base/dmeanlipw/lib/dmeanlipw.native.js | 9 +- .../@stdlib/stats/base/dmeanlipw/lib/index.js | 7 +- .../stats/base/dmeanlipw/lib/ndarray.js | 16 +- .../base/dmeanlipw/lib/ndarray.native.js | 20 +-- .../stats/base/dmeanlipw/manifest.json | 45 ++++-- .../@stdlib/stats/base/dmeanlipw/src/addon.c | 26 +++- .../dmeanlipw/src/{dmeanlipw.c => mean.c} | 38 +++-- .../base/dmeanlipw/test/test.dmeanlipw.js | 13 +- .../dmeanlipw/test/test.dmeanlipw.native.js | 13 +- .../stats/base/dmeanlipw/test/test.ndarray.js | 13 +- .../dmeanlipw/test/test.ndarray.native.js | 13 +- 23 files changed, 340 insertions(+), 233 deletions(-) rename lib/node_modules/@stdlib/stats/base/dmeanlipw/src/{dmeanlipw.c => mean.c} (50%) diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/README.md b/lib/node_modules/@stdlib/stats/base/dmeanlipw/README.md index c2f21a70aff2..d12bc922bccd 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/README.md @@ -51,7 +51,7 @@ The [arithmetic mean][arithmetic-mean] is defined as var dmeanlipw = require( '@stdlib/stats/base/dmeanlipw' ); ``` -#### dmeanlipw( N, x, stride ) +#### dmeanlipw( N, x, strideX ) Computes the [arithmetic mean][arithmetic-mean] of a double-precision floating-point strided array `x` using a one-pass trial mean algorithm with pairwise summation. @@ -59,9 +59,8 @@ Computes the [arithmetic mean][arithmetic-mean] of a double-precision floating-p var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = dmeanlipw( N, x, 1 ); +var v = dmeanlipw( x.length, x, 1 ); // returns ~0.3333 ``` @@ -69,18 +68,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float64Array`][@stdlib/array/float64]. -- **stride**: index increment for `x`. +- **strideX**: stride length for `x`. -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 Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = dmeanlipw( N, x, 2 ); +var v = dmeanlipw( 4, x, 2 ); // returns 1.25 ``` @@ -90,18 +87,15 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = dmeanlipw( N, x1, 2 ); +var v = dmeanlipw( 4, x1, 2 ); // returns 1.25 ``` -#### dmeanlipw.ndarray( N, x, stride, offset ) +#### dmeanlipw.ndarray( N, x, strideX, offsetX ) Computes the [arithmetic mean][arithmetic-mean] of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation and alternative indexing semantics. @@ -109,26 +103,23 @@ Computes the [arithmetic mean][arithmetic-mean] of a double-precision floating-p var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = dmeanlipw.ndarray( N, x, 1, 0 ); +var v = dmeanlipw.ndarray( x.length, x, 1, 0 ); // returns ~0.33333 ``` The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offsetX**: starting index for `x`. -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 +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 ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -var N = floor( x.length / 2 ); -var v = dmeanlipw.ndarray( N, x, 2, 1 ); +var v = dmeanlipw.ndarray( 4, x, 2, 1 ); // returns 1.25 ``` @@ -154,18 +145,12 @@ var v = dmeanlipw.ndarray( N, x, 2, 1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float64Array = require( '@stdlib/array/float64' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var dmeanlipw = require( '@stdlib/stats/base/dmeanlipw' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float64' +}); console.log( x ); var v = dmeanlipw( x.length, x, 1 ); @@ -176,6 +161,107 @@ console.log( v ); + + +
+ +### Usage + +```c +#include "stdlib/stats/base/dmeanlipw.h" +``` + +#### stdlib_strided_dmeanlipw( N, \*X, strideX ) + +Computes the [arithmetic mean][arithmetic-mean] of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation. + +```c +const double x[] = { 1.0, -2.0, 2.0 }; + +double v = stdlib_strided_dmeanlipw( 3, x, 1 ); +// returns ~0.3333 +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. + +```c +double stdlib_strided_dmeanlipw( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_dmeanlipw_ndarray( N, \*X, strideX, offsetX ) + +Computes the [arithmetic mean][arithmetic-mean] of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation and alternative indexing semantics. + +```c +const double x[] = { 1.0, -2.0, 2.0 }; + +double v = stdlib_strided_dmeanlipw_ndarray( 3, x, 1, 0 ); +// returns ~0.3333 +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +double stdlib_strided_dmeanlipw_ndarray( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/dmeanlipw.h" +#include + +int main( void ) { + // Create a strided array: + const double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 }; + + // Specify the number of elements: + const int N = 4; + + // Specify the stride length: + const int strideX = 2; + + // Compute the arithmetic mean: + double v = stdlib_strided_dmeanlipw( N, x, strideX ); + + // Print the result: + printf( "mean: %lf\n", v ); +} +``` + +
+ + + + + + + * * *
diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.js index 4b4bbbc2f30e..9df866ed9971 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); var pkg = require( './../package.json' ).name; var dmeanlipw = require( './../lib/dmeanlipw.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float64' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var dmeanlipw = require( './../lib/dmeanlipw.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.native.js index 98ca4a980388..d1dd6dae5732 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var dmeanlipw = tryRequire( resolve( __dirname, './../lib/dmeanlipw.native.js' ) var opts = { 'skip': ( dmeanlipw instanceof Error ) }; +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -48,13 +50,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.js index db5c6bfc7729..aabf89445169 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); var pkg = require( './../package.json' ).name; var dmeanlipw = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float64' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var dmeanlipw = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.native.js index f18164771c17..eab905c84d57 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var dmeanlipw = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ) var opts = { 'skip': ( dmeanlipw instanceof Error ) }; +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -48,13 +50,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c index 7c1db7158753..ac391686346e 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static double rand_double( 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; double x[ len ]; double v; @@ -120,6 +120,39 @@ 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; + double x[ len ]; + double v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_double() * 20000.0 ) - 10000.0; + } + v = 0.0; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + v = stdlib_strided_dmeanlipw_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 +175,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/dmeanlipw/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dmeanlipw/docs/repl.txt index 586728b776ab..12de0e2246c7 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/docs/repl.txt @@ -1,10 +1,10 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the arithmetic mean of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation. - 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. @@ -19,8 +19,8 @@ x: Float64Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. Returns ------- @@ -34,22 +34,19 @@ > {{alias}}( x.length, x, 1 ) ~0.3333 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float64}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 3, x, 2 ) ~0.3333 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 3, x1, 2 ) ~-0.3333 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the arithmetic mean of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation and alternative indexing semantics. @@ -66,10 +63,10 @@ x: Float64Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. - offset: integer + offsetX: integer Starting index. Returns @@ -86,10 +83,8 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1 ) ~-0.3333 See Also -------- - diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/dmeanlipw/docs/types/index.d.ts index f02850bcdd23..27b286f897c6 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/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 = dmeanlipw( x.length, x, 1 ); * // returns ~0.3333 */ - ( N: number, x: Float64Array, stride: number ): number; + ( N: number, x: Float64Array, strideX: number ): number; /** * Computes the arithmetic mean of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation and 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 = dmeanlipw.ndarray( x.length, x, 1, 0 ); * // returns ~0.3333 */ - ndarray( N: number, x: Float64Array, stride: number, offset: number ): number; + ndarray( N: number, x: Float64Array, 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/dmeanlipw/examples/c/example.c b/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/c/example.c index a1ce68c3da56..18bae12d87d0 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/c/example.c +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/stats/base/dmeanlipw.h" -#include #include int main( void ) { // Create a strided array: - double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 }; + const double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 }; // Specify the number of elements: - int64_t N = 4; + const int N = 4; // Specify the stride length: - int64_t stride = 2; + const int strideX = 2; // Compute the arithmetic mean: - double v = stdlib_strided_dmeanlipw( N, x, stride ); + double v = stdlib_strided_dmeanlipw( N, x, strideX ); // Print the result: printf( "mean: %lf\n", v ); diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/index.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/index.js index 163f25cf0557..1cdf11eed922 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/examples/index.js @@ -18,18 +18,12 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float64Array = require( '@stdlib/array/float64' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var dmeanlipw = require( './../lib' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float64' +}); console.log( x ); var v = dmeanlipw( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/include/stdlib/stats/base/dmeanlipw.h b/lib/node_modules/@stdlib/stats/base/dmeanlipw/include/stdlib/stats/base/dmeanlipw.h index 73f2efd4e793..1f462b8bd877 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/include/stdlib/stats/base/dmeanlipw.h +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/include/stdlib/stats/base/dmeanlipw.h @@ -19,7 +19,7 @@ #ifndef STDLIB_STATS_BASE_DMEANLIPW_H #define STDLIB_STATS_BASE_DMEANLIPW_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 double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation. */ -double stdlib_strided_dmeanlipw( const int64_t N, const double *X, const int64_t stride ); +double API_SUFFIX(stdlib_strided_dmeanlipw)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); + +/** +* Computes the arithmetic mean of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation and alternative indexing semantics. +*/ +double API_SUFFIX(stdlib_strided_dmeanlipw_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.js index b1109a7057ec..b32855aaaa38 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.js @@ -20,7 +20,8 @@ // MODULES // -var dapxsumpw = require( '@stdlib/blas/ext/base/dapxsumpw' ).ndarray; +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -34,33 +35,19 @@ var dapxsumpw = require( '@stdlib/blas/ext/base/dapxsumpw' ).ndarray; * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} arithmetic mean * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = dmeanlipw( N, x, 1 ); +* var v = dmeanlipw( x.length, x, 1 ); * // returns ~0.3333 */ -function dmeanlipw( N, x, stride ) { - var ix; - - if ( N <= 0 ) { - return NaN; - } - if ( N === 1 || stride === 0 ) { - return x[ 0 ]; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - return x[ ix ] + ( dapxsumpw( N-1, -x[ ix ], x, stride, ix+stride ) / N ); +function dmeanlipw( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.native.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.native.js index f5f11841642d..8f1209c11ef0 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/dmeanlipw.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} arithmetic mean * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = dmeanlipw( N, x, 1 ); +* var v = dmeanlipw( x.length, x, 1 ); * // returns ~0.3333 */ -function dmeanlipw( N, x, stride ) { - return addon( N, x, stride ); +function dmeanlipw( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/index.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/index.js index e10cafd52ff4..9a34e1cf9857 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/index.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/index.js @@ -28,20 +28,17 @@ * var dmeanlipw = require( '@stdlib/stats/base/dmeanlipw' ); * * var x = new Float64Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = dmeanlipw( N, x, 1 ); +* var v = dmeanlipw( x.length, x, 1 ); * // returns ~0.3333 * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var dmeanlipw = require( '@stdlib/stats/base/dmeanlipw' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = dmeanlipw.ndarray( N, x, 2, 1 ); +* var v = dmeanlipw.ndarray( 4, x, 2, 1 ); * // returns 1.25 */ diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.js index d16348079fc2..4a0cb96ffa79 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.js @@ -34,28 +34,26 @@ var dapxsumpw = require( '@stdlib/blas/ext/base/dapxsumpw' ).ndarray; * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} 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 Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = dmeanlipw( N, x, 2, 1 ); +* var v = dmeanlipw( 4, x, 2, 1 ); * // returns 1.25 */ -function dmeanlipw( N, x, stride, offset ) { +function dmeanlipw( N, x, strideX, offsetX ) { if ( N <= 0 ) { return NaN; } - if ( N === 1 || stride === 0 ) { - return x[ offset ]; + if ( N === 1 || strideX === 0 ) { + return x[ offsetX ]; } - return x[ offset ] + ( dapxsumpw( N-1, -x[ offset ], x, stride, offset+stride ) / N ); // eslint-disable-line max-len + return x[ offsetX ] + ( dapxsumpw( N-1, -x[ offsetX ], x, strideX, offsetX+strideX ) / N ); // eslint-disable-line max-len } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.native.js index 31b45a6723e8..d1e1f8a88ecb 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float64Array = require( '@stdlib/array/float64' ); -var addon = require( './dmeanlipw.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,27 +30,20 @@ var addon = require( './dmeanlipw.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} 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 Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = dmeanlipw( N, x, 2, 1 ); +* var v = dmeanlipw( 4, x, 2, 1 ); * // returns 1.25 */ -function dmeanlipw( N, x, stride, offset ) { - var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float64Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len - return addon( N, view, stride ); +function dmeanlipw( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/manifest.json b/lib/node_modules/@stdlib/stats/base/dmeanlipw/manifest.json index 12d854e12d99..24ee3c58cfdf 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/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/dmeanlipw.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/blas/ext/base/dapxsumpw", "@stdlib/napi/export", "@stdlib/napi/argv", @@ -48,33 +50,52 @@ }, { "task": "benchmark", + "wasm": false, "src": [ - "./src/dmeanlipw.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/blas/ext/base/dapxsumpw" ] }, { "task": "examples", + "wasm": false, "src": [ - "./src/dmeanlipw.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/ext/base/dapxsumpw" + ] + }, + { + "task": "", + "wasm": true, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/blas/ext/base/dapxsumpw" ] } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/addon.c b/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/addon.c index 47f85a335546..a1c5ae7dcb67 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/stats/base/dmeanlipw.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_FLOAT64ARRAY( env, X, N, stride, argv, 1 ); - STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dmeanlipw( N, X, stride ), v ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, API_SUFFIX(stdlib_strided_dmeanlipw)( 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_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, API_SUFFIX(stdlib_strided_dmeanlipw_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/dmeanlipw/src/dmeanlipw.c b/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/mean.c similarity index 50% rename from lib/node_modules/@stdlib/stats/base/dmeanlipw/src/dmeanlipw.c rename to lib/node_modules/@stdlib/stats/base/dmeanlipw/src/mean.c index ea0a0ca995a0..1654c169d920 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/dmeanlipw.c +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/mean.c @@ -18,7 +18,8 @@ #include "stdlib/stats/base/dmeanlipw.h" #include "stdlib/blas/ext/base/dapxsumpw.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the arithmetic mean of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation. @@ -27,24 +28,31 @@ * * - Ling, Robert F. 1974. "Comparison of Several Algorithms for Computing Sample Means and Variances." _Journal of the American Statistical Association_ 69 (348). American Statistical Association, Taylor & Francis, Ltd.: 859–66. doi:[10.2307/2286154](https://doi.org/10.2307/2286154). * -* @param N number of indexed elements -* @param X input array -* @param stride stride length -* @return output value +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @return output value */ -double stdlib_strided_dmeanlipw( const int64_t N, const double *X, const int64_t stride ) { - int64_t ix; +double API_SUFFIX(stdlib_strided_dmeanlipw)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_dmeanlipw_ndarray)( N, X, strideX, ox ); +} +/** +* Computes the arithmetic mean of a double-precision floating-point strided array using a one-pass trial mean algorithm with pairwise summation and alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @param offsetX starting index for X +* @return output value +*/ +double API_SUFFIX(stdlib_strided_dmeanlipw_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { if ( N <= 0 ) { return 0.0 / 0.0; // NaN } - if ( N == 1 || stride == 0 ) { - return X[ 0 ]; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; + if ( N == 1 || strideX == 0 ) { + return X[ offsetX ]; } - return X[ ix ] + ( stdlib_strided_dapxsumpw( N-1, -X[ ix ], X+( (stride > 0) ? stride : 0 ), stride ) / (double)N ); + return X[ offsetX ] + ( API_SUFFIX(stdlib_strided_dapxsumpw_ndarray)( N-1, -X[ offsetX ], X, strideX, offsetX + strideX ) / (double)N ); } diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.js index 21b407c0bbe6..a4eda36fa52a 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.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 Float64Array = require( '@stdlib/array/float64' ); var dmeanlipw = require( './../lib/dmeanlipw.js' ); @@ -87,7 +86,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; @@ -102,15 +100,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, 2 ); + v = dmeanlipw( 4, 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; @@ -125,8 +121,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, -2 ); + v = dmeanlipw( 4, x, -2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -147,7 +142,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 Float64Array([ @@ -163,9 +157,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = dmeanlipw( N, x1, 2 ); + v = dmeanlipw( 4, x1, 2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.native.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.native.js index 64d8ddf97020..9c279330eb93 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.dmeanlipw.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 Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -178,7 +177,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; @@ -193,15 +191,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, 2 ); + v = dmeanlipw( 4, 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; @@ -216,8 +212,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, -2 ); + v = dmeanlipw( 4, x, -2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -238,7 +233,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 Float64Array([ @@ -254,9 +248,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { ]); x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = dmeanlipw( N, x1, 2 ); + v = dmeanlipw( 4, x1, 2 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.ndarray.js index 294ccfed8008..c8a8ed081a1a 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/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 Float64Array = require( '@stdlib/array/float64' ); var dmeanlipw = require( './../lib/ndarray.js' ); @@ -87,7 +86,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; @@ -102,15 +100,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, 2, 0 ); + v = dmeanlipw( 4, 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; @@ -125,8 +121,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, -2, 6 ); + v = dmeanlipw( 4, x, -2, 6 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -145,7 +140,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; @@ -159,9 +153,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, 2, 1 ); + v = dmeanlipw( 4, x, 2, 1 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.ndarray.native.js index 11121ef1e9d1..973422c64b28 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/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 Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -96,7 +95,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; @@ -111,15 +109,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, 2, 0 ); + v = dmeanlipw( 4, 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; @@ -134,8 +130,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, -2, 6 ); + v = dmeanlipw( 4, x, -2, 6 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); @@ -154,7 +149,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; @@ -168,9 +162,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = dmeanlipw( N, x, 2, 1 ); + v = dmeanlipw( 4, x, 2, 1 ); t.strictEqual( v, 1.25, 'returns expected value' ); t.end(); From 2b341ea4b6c5d11ccf64f2238f8b9431c87250eb Mon Sep 17 00:00:00 2001 From: JoyBoy <144602492+0PrashantYadav0@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:10:11 +0530 Subject: [PATCH 2/3] feat: add C ndarray interface and refactor 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: na - 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 --- --- type: pre_push_report description: Results of running various checks prior to pushing changes. report: - task: run_javascript_examples status: na - task: run_c_examples status: na - task: run_cpp_examples status: na - task: run_javascript_readme_examples status: na - task: run_c_benchmarks status: na - task: run_cpp_benchmarks status: na - task: run_fortran_benchmarks status: na - task: run_javascript_benchmarks status: na - task: run_julia_benchmarks status: na - task: run_python_benchmarks status: na - task: run_r_benchmarks status: na - task: run_javascript_tests status: na --- --- .../@stdlib/stats/base/dmeanlipw/src/{mean.c => main.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/node_modules/@stdlib/stats/base/dmeanlipw/src/{mean.c => main.c} (100%) diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/mean.c b/lib/node_modules/@stdlib/stats/base/dmeanlipw/src/main.c similarity index 100% rename from lib/node_modules/@stdlib/stats/base/dmeanlipw/src/mean.c rename to lib/node_modules/@stdlib/stats/base/dmeanlipw/src/main.c From 1487ac8effc7fd4385397b9a1acf5b293a545dc0 Mon Sep 17 00:00:00 2001 From: JoyBoy <144602492+0PrashantYadav0@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:28:49 +0530 Subject: [PATCH 3/3] chore: added comments --- 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: na - 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: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: passed - 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 --- --- type: pre_push_report description: Results of running various checks prior to pushing changes. report: - task: run_javascript_examples status: na - task: run_c_examples status: na - task: run_cpp_examples status: na - task: run_javascript_readme_examples status: na - task: run_c_benchmarks status: passed - task: run_cpp_benchmarks status: na - task: run_fortran_benchmarks status: na - task: run_javascript_benchmarks status: na - task: run_julia_benchmarks status: na - task: run_python_benchmarks status: na - task: run_r_benchmarks status: na - task: run_javascript_tests status: na --- --- .../@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c index ac391686346e..d63a8b298623 100644 --- a/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/dmeanlipw/benchmark/c/benchmark.length.c @@ -107,6 +107,7 @@ static double benchmark1( int iterations, int len ) { v = 0.0; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_dmeanlipw( len, x, 1 ); if ( v != v ) { printf( "should not return NaN\n" ); @@ -140,6 +141,7 @@ static double benchmark2( int iterations, int len ) { v = 0.0; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_dmeanlipw_ndarray( len, x, 1, 0 ); if ( v != v ) { printf( "should not return NaN\n" );