From 9e338561bdceaee95bce409ef1c686167da4b36b Mon Sep 17 00:00:00 2001 From: aayush0325 Date: Tue, 24 Dec 2024 09:08:01 +0000 Subject: [PATCH 1/6] 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: 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: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: passed - task: lint_c_examples status: passed - task: lint_c_benchmarks status: passed - 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/dminsorted/README.md | 147 ++++++++++++++---- .../dminsorted/benchmark/c/benchmark.length.c | 52 ++++++- .../stats/base/dminsorted/docs/repl.txt | 26 ++-- .../base/dminsorted/docs/types/index.d.ts | 12 +- .../base/dminsorted/examples/c/example.c | 9 +- .../stats/base/dminsorted/examples/index.js | 12 +- .../stats/base/dminsorted/include.gypi | 2 +- .../include/stdlib/stats/base/dminsorted.h | 9 +- .../stats/base/dminsorted/lib/dminsorted.js | 41 +---- .../base/dminsorted/lib/dminsorted.native.js | 9 +- .../stats/base/dminsorted/lib/index.js | 7 +- .../stats/base/dminsorted/lib/ndarray.js | 16 +- .../base/dminsorted/lib/ndarray.native.js | 20 +-- .../stats/base/dminsorted/manifest.json | 74 ++++++++- .../@stdlib/stats/base/dminsorted/src/addon.c | 60 +++++++ .../stats/base/dminsorted/src/addon.cpp | 117 -------------- .../dminsorted/src/{dminsorted.c => main.c} | 38 +++-- .../base/dminsorted/test/test.dminsorted.js | 13 +- .../dminsorted/test/test.dminsorted.native.js | 13 +- .../base/dminsorted/test/test.ndarray.js | 13 +- .../dminsorted/test/test.ndarray.native.js | 13 +- 21 files changed, 389 insertions(+), 314 deletions(-) create mode 100644 lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c delete mode 100644 lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.cpp rename lib/node_modules/@stdlib/stats/base/dminsorted/src/{dminsorted.c => main.c} (55%) diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/README.md b/lib/node_modules/@stdlib/stats/base/dminsorted/README.md index dd2101aa24ec..34941765b9cb 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/README.md +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/README.md @@ -36,7 +36,7 @@ limitations under the License. var dminsorted = require( '@stdlib/stats/base/dminsorted' ); ``` -#### dminsorted( N, x, stride ) +#### dminsorted( N, x, strideX ) Computes the minimum value of a sorted double-precision floating-point strided array `x`. @@ -44,15 +44,13 @@ Computes the minimum value of a sorted double-precision floating-point strided a var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, 2.0, 3.0 ] ); -var N = x.length; -var v = dminsorted( N, x, 1 ); +var v = dminsorted( x.length, x, 1 ); // returns 1.0 x = new Float64Array( [ 3.0, 2.0, 1.0 ] ); -N = x.length; -v = dminsorted( N, x, 1 ); +v = dminsorted( x.length, x, 1 ); // returns 1.0 ``` @@ -60,18 +58,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: sorted 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 minimum value 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 minimum value 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, 3.0, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = dminsorted( N, x, 2 ); +var v = dminsorted( 4, x, 2 ); // returns 1.0 ``` @@ -81,18 +77,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 = dminsorted( N, x1, 2 ); +var v = dminsorted( 4, x1, 2 ); // returns 1.0 ``` -#### dminsorted.ndarray( N, x, stride, offset ) +#### dminsorted.ndarray( N, x, strideX, offsetX ) Computes the minimum value of a sorted double-precision floating-point strided array using alternative indexing semantics. @@ -100,26 +93,23 @@ Computes the minimum value of a sorted double-precision floating-point strided a var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, 2.0, 3.0 ] ); -var N = x.length; -var v = dminsorted.ndarray( N, x, 1, 0 ); +var v = dminsorted.ndarray( x.length, x, 1, 0 ); // returns 1.0 ``` 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 minimum value 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 minimum value for every other value in `x` starting from the second value ```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 = dminsorted.ndarray( N, x, 2, 1 ); +var v = dminsorted.ndarray( 4, x, 2, 1 ); // returns 1.0 ``` @@ -145,16 +135,12 @@ var v = dminsorted.ndarray( N, x, 2, 1 ); ```javascript -var Float64Array = require( '@stdlib/array/float64' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var dminsorted = require( '@stdlib/stats/base/dminsorted' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = i - 5.0; -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float64' +}); console.log( x ); var v = dminsorted( x.length, x, 1 ); @@ -165,6 +151,107 @@ console.log( v ); + + +
+ +### Usage + +```c +#include "stdlib/stats/base/dminsorted.h" +``` + +#### stdlib_strided_dminsorted( N, \*X, strideX ) + +Computes the minimum value of a sorted double-precision floating-point strided array. + +```c +const double x[] = { 1.0, 2.0, 3.0 }; + +double v = stdlib_strided_dmax( 3, x, 1 ); +// returns 1.0 +``` + +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_dminsorted( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_dminsorted_ndarray( N, \*X, strideX, offsetX ) + +Computes the minimum value of a sorted double-precision floating-point strided array using alternative indexing semantics. + +```c +const double x[] = { 1.0, 2.0, 3.0 }; + +double v = stdlib_strided_dminsorted_ndarray( 3, x, 1, 0 ); +// returns 1.0 +``` + +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_dminsorted_ndarray( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/dminsorted.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 minimum value: + double v = stdlib_strided_dminsorted( N, x, strideX ); + + // Print the result: + printf( "min: %lf\n", v ); +} +``` + +
+ + + + + + +
diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/c/benchmark.length.c index 28de260f96bd..11f4b5a044c5 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/c/benchmark.length.c @@ -92,9 +92,9 @@ static double rand_double( void ) { * * @param iterations number of iterations * @param len array length -* @return elapsed time in seconds +* @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; @@ -107,6 +107,7 @@ static double benchmark( int iterations, int len ) { v = 0.0; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_dminsorted( len, x, 1 ); if ( v != v ) { printf( "should not return NaN\n" ); @@ -120,6 +121,40 @@ 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 ] = i; + } + v = 0.0; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar + v = stdlib_strided_dminsorted_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 +177,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/dminsorted/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt index a8c75a6241ff..62c3af69e721 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt @@ -1,12 +1,12 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the minimum value of a sorted double-precision floating-point strided array. The input strided array must be sorted in either strictly ascending or descending order. - The `N` and `stride` parameters determine which elements in `x` are accessed + The `N` and stride parameters determine which elements in `x` are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed @@ -22,7 +22,7 @@ x: Float64Array Sorted input array. - stride: integer + strideX: integer Index increment. Returns @@ -37,22 +37,19 @@ > {{alias}}( x.length, x, 1 ) 1.0 - // 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 ) -2.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, 3.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 ) -2.0 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the minimum value of a sorted double-precision floating-point strided array using alternative indexing semantics. @@ -68,10 +65,10 @@ x: Float64Array Sorted input array. - stride: integer + strideX: integer Index increment. - offset: integer + offsetX: integer Starting index. Returns @@ -88,8 +85,7 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, 3.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1 ) -2.0 See Also diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/dminsorted/docs/types/index.d.ts index 509a175c89aa..dc1fc8470079 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/docs/types/index.d.ts @@ -27,7 +27,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - sorted input array - * @param stride - stride length + * @param strideX - stride length * @returns minimum value * * @example @@ -38,15 +38,15 @@ interface Routine { * var v = dminsorted( x.length, x, 1 ); * // returns 1.0 */ - ( N: number, x: Float64Array, stride: number ): number; + ( N: number, x: Float64Array, strideX: number ): number; /** * Computes the minimum value of a sorted double-precision floating-point strided array using alternative indexing semantics. * * @param N - number of indexed elements * @param x - sorted input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns minimum value * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = dminsorted.ndarray( x.length, x, 1, 0 ); * // returns 1.0 */ - 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 - sorted input array -* @param stride - stride length +* @param strideX - stride length * @returns minimum value * * @example diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/examples/c/example.c b/lib/node_modules/@stdlib/stats/base/dminsorted/examples/c/example.c index 2673519870b3..0e5c657e2864 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/examples/c/example.c +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/stats/base/dminsorted.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 minimum value: - double v = stdlib_strided_dminsorted( N, x, stride ); + double v = stdlib_strided_dminsorted( N, x, strideX ); // Print the result: printf( "min: %lf\n", v ); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js b/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js index c4a9be487cce..158b03b5c323 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js @@ -18,16 +18,12 @@ 'use strict'; -var Float64Array = require( '@stdlib/array/float64' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var dminsorted = require( './../lib' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = i - 5.0; -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float64' +}); console.log( x ); var v = dminsorted( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/include.gypi b/lib/node_modules/@stdlib/stats/base/dminsorted/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/include.gypi +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' +#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 minimum value of a sorted double-precision floating-point strided array. */ -double stdlib_strided_dminsorted( const int64_t N, const double *X, const int64_t stride ); +double API_SUFFIX(stdlib_strided_dminsorted)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); + +/** +* Computes the minimum value of a sorted double-precision floating-point strided array using alternative indexing semantics. +*/ +double API_SUFFIX(stdlib_strided_dminsorted_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/dminsorted/lib/dminsorted.js b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.js index b3e5d95f53fe..9d4deae34b6c 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.js @@ -20,8 +20,8 @@ // MODULES // -var isnan = require( '@stdlib/math/base/assert/is-nan' ); -var isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -31,48 +31,19 @@ var isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - sorted input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} minimum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, 2.0, 3.0 ] ); -* var N = x.length; * -* var v = dminsorted( N, x, 1 ); +* var v = dminsorted( x.length, x, 1 ); * // returns 1.0 */ -function dminsorted( N, x, stride ) { - var v1; - var v2; - - if ( N <= 0 ) { - return NaN; - } - if ( N === 1 || stride === 0 ) { - return x[ 0 ]; - } - if ( stride < 0 ) { - v1 = x[ (1-N) * stride ]; - v2 = x[ 0 ]; - } else { - v1 = x[ 0 ]; - v2 = x[ (N-1) * stride ]; - } - if ( isnan( v1 ) || isnan( v2 ) ) { - return NaN; - } - if ( v1 === v2 ) { - if ( isNegativeZero( v1 ) || isNegativeZero( v2 ) ) { - return -0.0; - } - return v1; - } - if ( v1 < v2 ) { - return v1; - } - return v2; +function dminsorted( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.native.js b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.native.js index 058184aa2c07..514252613c15 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.native.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/dminsorted.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - sorted input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} minimum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, 2.0, 3.0 ] ); -* var N = x.length; * -* var v = dminsorted( N, x, 1 ); +* var v = dminsorted( x.length, x, 1 ); * // returns 1.0 */ -function dminsorted( N, x, stride ) { - return addon( N, x, stride ); +function dminsorted( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/index.js b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/index.js index 4f5a123bf49e..49d6559c2f25 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/index.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/index.js @@ -28,20 +28,17 @@ * var dminsorted = require( '@stdlib/stats/base/dminsorted' ); * * var x = new Float64Array( [ 1.0, 2.0, 3.0 ] ); -* var N = x.length; * -* var v = dminsorted( N, x, 1 ); +* var v = dminsorted( x.length, x, 1 ); * // returns 1.0 * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var dminsorted = require( '@stdlib/stats/base/dminsorted' ); * * var x = new Float64Array( [ 2.0, -3.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = dminsorted.ndarray( N, x, 2, 1 ); +* var v = dminsorted.ndarray( 4, x, 2, 1 ); * // returns -3.0 */ diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.js index 65427fab99ea..7f6d85781721 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.js @@ -31,32 +31,30 @@ var isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - sorted input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} minimum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, -3.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = dminsorted( N, x, 2, 1 ); +* var v = dminsorted( 4, x, 2, 1 ); * // returns -3.0 */ -function dminsorted( N, x, stride, offset ) { +function dminsorted( N, x, strideX, offsetX ) { var v1; var v2; if ( N <= 0 ) { return NaN; } - if ( N === 1 || stride === 0 ) { + if ( N === 1 || strideX === 0 ) { return x[ 0 ]; } - v1 = x[ offset ]; - v2 = x[ offset + ((N-1)*stride) ]; + v1 = x[ offsetX ]; + v2 = x[ offsetX + ((N-1)*strideX) ]; if ( isnan( v1 ) || isnan( v2 ) ) { return NaN; } diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.native.js index 2503636150dc..2e898ee3cdbe 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float64Array = require( '@stdlib/array/float64' ); -var addon = require( './dminsorted.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,27 +30,20 @@ var addon = require( './dminsorted.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - sorted input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} minimum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, -3.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = dminsorted( N, x, 2, 1 ); +* var v = dminsorted( 4, x, 2, 1 ); * // returns -3.0 */ -function dminsorted( 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 dminsorted( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/manifest.json b/lib/node_modules/@stdlib/stats/base/dminsorted/manifest.json index 4e090b2f2400..badf40fc022a 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/manifest.json @@ -1,5 +1,8 @@ { - "options": {}, + "options": { + "task": "build", + "wasm": false + }, "fields": [ { "field": "src", @@ -24,19 +27,80 @@ ], "confs": [ { + "task": "build", + "wasm": false, "src": [ - "./src/dminsorted.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nan", + "@stdlib/math/base/assert/is-negative-zero", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float64array", + "@stdlib/napi/create-double" + ] + }, + { + "task": "benchmark", + "wasm": false, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" + ], + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nan", + "@stdlib/math/base/assert/is-negative-zero", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] + }, + { + "task": "examples", + "wasm": false, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" + ], + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nan", + "@stdlib/math/base/assert/is-negative-zero", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] + }, + { + "task": "", + "wasm": true, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" ], + "libraries": [], "libpath": [], "dependencies": [ "@stdlib/math/base/assert/is-nan", - "@stdlib/math/base/assert/is-negative-zero" + "@stdlib/math/base/assert/is-negative-zero", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] } ] diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c b/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c new file mode 100644 index 000000000000..860445b2c923 --- /dev/null +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c @@ -0,0 +1,60 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2024 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/dminsorted.h" +#include "stdlib/napi/export.h" +#include "stdlib/napi/argv.h" +#include "stdlib/napi/argv_int64.h" +#include "stdlib/napi/argv_strided_float64array.h" +#include "stdlib/napi/create_double.h" +#include + +/** +* 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( 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, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dminsorted( N, X, strideX ), v ); + return v; +} + +/** +* 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, stdlib_strided_dminsorted_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/dminsorted/src/addon.cpp b/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.cpp deleted file mode 100644 index 756f45cb695e..000000000000 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.cpp +++ /dev/null @@ -1,117 +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/dminsorted.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_stats_base_dminsorted { - - /** - * Computes the minimum value of a sorted double-precision floating-point strided array. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: sorted input array - * - `stride`: stride length - */ - napi_value node_dminsorted( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 3; - napi_value argv[ 3 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 3 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 3 arguments." ); - return nullptr; - } - - napi_valuetype vtype0; - status = napi_typeof( env, argv[ 0 ], &vtype0 ); - assert( status == napi_ok ); - if ( vtype0 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. First argument must be a number." ); - return nullptr; - } - - bool res; - status = napi_is_typedarray( env, argv[ 1 ], &res ); - assert( status == napi_ok ); - if ( res == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - return nullptr; - } - - napi_valuetype vtype2; - status = napi_typeof( env, argv[ 2 ], &vtype2 ); - assert( status == napi_ok ); - if ( vtype2 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a number." ); - return nullptr; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - int64_t stride; - status = napi_get_value_int64( env, argv[ 2 ], &stride ); - assert( status == napi_ok ); - - napi_typedarray_type vtype1; - size_t xlen; - void *X; - status = napi_get_typedarray_info( env, argv[ 1 ], &vtype1, &xlen, &X, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype1 != napi_float64_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - return nullptr; - } - if ( (N-1)*llabs(stride) >= (int64_t)xlen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Second argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - napi_value v; - status = napi_create_double( env, stdlib_strided_dminsorted( N, (double *)X, stride ), &v ); - assert( status == napi_ok ); - - return v; - } - - napi_value Init( napi_env env, napi_value exports ) { - napi_status status; - napi_value fcn; - status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, node_dminsorted, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_stats_base_dminsorted diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/src/dminsorted.c b/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c similarity index 55% rename from lib/node_modules/@stdlib/stats/base/dminsorted/src/dminsorted.c rename to lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c index 36161f0d450c..a035e31f7e8e 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/src/dminsorted.c +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c @@ -19,33 +19,43 @@ #include "stdlib/stats/base/dminsorted.h" #include "stdlib/math/base/assert/is_nan.h" #include "stdlib/math/base/assert/is_negative_zero.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the minimum value of a sorted double-precision floating-point strided array. * -* @param N number of indexed elements -* @param X sorted input array -* @param stride stride length -* @return output value +* @param N number of indexed elements +* @param X sorted input array +* @param strideX stride length +* @return output value */ -double stdlib_strided_dminsorted( const int64_t N, const double *X, const int64_t stride ) { +double API_SUFFIX(stdlib_strided_dminsorted)( 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_dminsorted_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the minimum value of a sorted double-precision floating-point strided array. +* +* @param N number of indexed elements +* @param X sorted input array +* @param strideX stride length +* @param offsetX starting index for X +* @return output value +*/ +double API_SUFFIX(stdlib_strided_dminsorted_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { double v1; double v2; if ( N <= 0 ) { return 0.0 / 0.0; // NaN } - if ( N == 1 || stride == 0 ) { + if ( N == 1 || strideX == 0 ) { return X[ 0 ]; } - if ( stride < 0 ) { - v1 = X[ (1-N) * stride ]; - v2 = X[ 0 ]; - } else { - v1 = X[ 0 ]; - v2 = X[ (N-1) * stride ]; - } + v1 = X[ offsetX ]; + v2 = X[ (N-1) * strideX + offsetX ]; if ( stdlib_base_is_nan( v1 ) || stdlib_base_is_nan( v2 ) ) { return 0.0 / 0.0; // NaN } diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.js b/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.js index 3eda0ff9c531..1232989ca5d3 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.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 isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -116,7 +115,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; @@ -131,15 +129,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, 2 ); + v = dminsorted( 3, x, 2 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -154,8 +150,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, -2 ); + v = dminsorted( 4, x, -2 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); @@ -176,7 +171,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([ @@ -192,9 +186,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 = dminsorted( N, x1, 2 ); + v = dminsorted( 4, x1, 2 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.native.js b/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.native.js index 9388005816c1..022906bbf870 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.native.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.dminsorted.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 isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -125,7 +124,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; @@ -140,15 +138,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, 2 ); + v = dminsorted( 4, x, 2 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -163,8 +159,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, -2 ); + v = dminsorted( 4, x, -2 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); @@ -185,7 +180,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([ @@ -201,9 +195,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 = dminsorted( N, x1, 2 ); + v = dminsorted( 4, x1, 2 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.ndarray.js index ea49cf494c20..7d289d3f98a5 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/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 isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -116,7 +115,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; @@ -131,15 +129,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, 2, 0 ); + v = dminsorted( 4, x, 2, 0 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -154,8 +150,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, -2, 6 ); + v = dminsorted( 4, x, -2, 6 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); @@ -174,7 +169,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; @@ -188,9 +182,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, 2, 1 ); + v = dminsorted( 4, x, 2, 1 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.ndarray.native.js index 5dc9eb0b6d7c..01bfaffeaa52 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/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 isNegativeZero = require( '@stdlib/math/base/assert/is-negative-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -125,7 +124,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; @@ -140,15 +138,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, 2, 0 ); + v = dminsorted( 4, x, 2, 0 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -163,8 +159,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, -2, 6 ); + v = dminsorted( 4, x, -2, 6 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); @@ -183,7 +178,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; @@ -197,9 +191,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = dminsorted( N, x, 2, 1 ); + v = dminsorted( 4, x, 2, 1 ); t.strictEqual( v, 1.0, 'returns expected value' ); t.end(); From 2897a08084cda205c7e5cb3ed7da390da2d3a330 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Tue, 24 Dec 2024 17:41:20 +0530 Subject: [PATCH 2/6] chore: update function description --- lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c b/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c index a035e31f7e8e..dd93de721736 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c @@ -36,7 +36,7 @@ double API_SUFFIX(stdlib_strided_dminsorted)( const CBLAS_INT N, const double *X } /** -* Computes the minimum value of a sorted double-precision floating-point strided array. +* Computes the minimum value of a sorted double-precision floating-point strided array using alternative indexing semantics. * * @param N number of indexed elements * @param X sorted input array From f90e5eba1e99e27c2b3715169d3c6d0cb25ba243 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Wed, 25 Dec 2024 23:30:10 +0530 Subject: [PATCH 3/6] chore: minor cleanup --- lib/node_modules/@stdlib/stats/base/dminsorted/README.md | 2 +- lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/README.md b/lib/node_modules/@stdlib/stats/base/dminsorted/README.md index 34941765b9cb..8446bee0c22c 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/README.md +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/README.md @@ -102,7 +102,7 @@ The function has the following additional parameters: - **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 minimum value 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 minimum value for every other element in `x` starting from the second element ```javascript var Float64Array = require( '@stdlib/array/float64' ); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt index 62c3af69e721..332ba146d0af 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/docs/repl.txt @@ -23,7 +23,7 @@ Sorted input array. strideX: integer - Index increment. + Stride Length. Returns ------- @@ -66,7 +66,7 @@ Sorted input array. strideX: integer - Index increment. + Stride Length. offsetX: integer Starting index. From 3b384ce54670117079daa2abce1a54c79efda84d Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Wed, 1 Jan 2025 19:54:07 +0530 Subject: [PATCH 4/6] feat: updated benchmarks and examples --- .../@stdlib/stats/base/dminsorted/README.md | 7 ++++--- .../base/dminsorted/benchmark/benchmark.js | 17 +++++++++-------- .../dminsorted/benchmark/benchmark.native.js | 13 +++++-------- .../dminsorted/benchmark/benchmark.ndarray.js | 17 +++++++++-------- .../benchmark/benchmark.ndarray.native.js | 13 +++++-------- .../stats/base/dminsorted/examples/index.js | 7 ++++--- 6 files changed, 36 insertions(+), 38 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/README.md b/lib/node_modules/@stdlib/stats/base/dminsorted/README.md index 8446bee0c22c..2d6641d11787 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/README.md +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/README.md @@ -135,12 +135,13 @@ var v = dminsorted.ndarray( 4, x, 2, 1 ); ```javascript -var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); +var linspace = require( '@stdlib/array/linspace' ); var dminsorted = require( '@stdlib/stats/base/dminsorted' ); -var x = discreteUniform( 10, -50, 50, { +var options = { 'dtype': 'float64' -}); +}; +var x = linspace( -5.0, 5.0, 10, options ); console.log( x ); var v = dminsorted( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.js index aadd35b05c54..e3e721d8f786 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.js @@ -22,12 +22,19 @@ var bench = require( '@stdlib/bench' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var linspace = require( '@stdlib/array/linspace' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); var pkg = require( './../package.json' ).name; var dminsorted = require( './../lib/dminsorted.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float64' +}; + + // FUNCTIONS // /** @@ -38,13 +45,7 @@ var dminsorted = require( './../lib/dminsorted.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 ] = i; - } + var x = linspace( -len/2, len/2, len, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.native.js index 217b78e07218..899273284846 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.native.js @@ -23,8 +23,8 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var linspace = require( '@stdlib/array/linspace' ); 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; @@ -35,6 +35,9 @@ var dminsorted = tryRequire( resolve( __dirname, './../lib/dminsorted.native.js' var opts = { 'skip': ( dminsorted instanceof Error ) }; +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -47,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 ] = i; - } + var x = linspace( -len/2, len/2, len, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.js index 52be5dc90355..5665272757d6 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.js @@ -22,12 +22,19 @@ var bench = require( '@stdlib/bench' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var linspace = require( '@stdlib/array/linspace' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); var pkg = require( './../package.json' ).name; var dminsorted = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float64' +}; + + // FUNCTIONS // /** @@ -38,13 +45,7 @@ var dminsorted = 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 ] = i; - } + var x = linspace( -len/2, len/2, len, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.native.js index 47c7a80f80c3..a01ecfba9c49 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/benchmark/benchmark.ndarray.native.js @@ -23,8 +23,8 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var linspace = require( '@stdlib/array/linspace' ); 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; @@ -35,6 +35,9 @@ var dminsorted = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) var opts = { 'skip': ( dminsorted instanceof Error ) }; +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -47,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 ] = i; - } + var x = linspace( -len/2, len/2, len, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js b/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js index 158b03b5c323..7acfb4f24877 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/examples/index.js @@ -18,12 +18,13 @@ 'use strict'; -var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); +var linspace = require( '@stdlib/array/linspace' ); var dminsorted = require( './../lib' ); -var x = discreteUniform( 10, -50, 50, { +var options = { 'dtype': 'float64' -}); +}; +var x = linspace( -5.0, 5.0, 10, options ); console.log( x ); var v = dminsorted( x.length, x, 1 ); From 3b2fc23c28b560d811416706d62f6d98cd60db6f Mon Sep 17 00:00:00 2001 From: stdlib-bot <82920195+stdlib-bot@users.noreply.github.com> Date: Wed, 1 Jan 2025 14:29:19 +0000 Subject: [PATCH 5/6] chore: update copyright years --- lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c b/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c index 860445b2c923..7d845a2f0f0e 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/src/addon.c @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 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. From 21e3074c773d6c8a8bb2c78097610411ae545d52 Mon Sep 17 00:00:00 2001 From: Athan Date: Thu, 2 Jan 2025 11:45:15 -0800 Subject: [PATCH 6/6] style: add parentheses. Signed-off-by: Athan --- lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c b/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c index dd93de721736..08a046f60271 100644 --- a/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c +++ b/lib/node_modules/@stdlib/stats/base/dminsorted/src/main.c @@ -55,7 +55,7 @@ double API_SUFFIX(stdlib_strided_dminsorted_ndarray)( const CBLAS_INT N, const d return X[ 0 ]; } v1 = X[ offsetX ]; - v2 = X[ (N-1) * strideX + offsetX ]; + v2 = X[ ( (N-1)*strideX ) + offsetX ]; if ( stdlib_base_is_nan( v1 ) || stdlib_base_is_nan( v2 ) ) { return 0.0 / 0.0; // NaN }