From c3ccebada0f063495ef9d4b9530663f227638a45 Mon Sep 17 00:00:00 2001 From: aayush0325 Date: Mon, 30 Dec 2024 03:36:38 +0000 Subject: [PATCH 01/17] 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: na - task: lint_javascript_tests status: passed - task: lint_javascript_benchmarks status: passed - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: 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: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed --- --- .../@stdlib/stats/base/dmskmax/README.md | 138 ++++++++++++++-- .../stats/base/dmskmax/benchmark/benchmark.js | 42 +++-- .../dmskmax/benchmark/benchmark.native.js | 38 +++-- .../dmskmax/benchmark/benchmark.ndarray.js | 42 +++-- .../benchmark/benchmark.ndarray.native.js | 38 +++-- .../dmskmax/benchmark/c/benchmark.length.c | 56 ++++++- .../@stdlib/stats/base/dmskmax/docs/repl.txt | 22 ++- .../stats/base/dmskmax/examples/c/example.c | 10 +- .../@stdlib/stats/base/dmskmax/include.gypi | 2 +- .../include/stdlib/stats/base/dmskmax.h | 9 +- .../@stdlib/stats/base/dmskmax/lib/dmskmax.js | 56 +------ .../@stdlib/stats/base/dmskmax/lib/index.js | 4 +- .../@stdlib/stats/base/dmskmax/lib/ndarray.js | 4 +- .../stats/base/dmskmax/lib/ndarray.native.js | 16 +- .../@stdlib/stats/base/dmskmax/manifest.json | 73 ++++++++- .../@stdlib/stats/base/dmskmax/src/addon.c | 66 ++++++++ .../@stdlib/stats/base/dmskmax/src/addon.cpp | 153 ------------------ .../base/dmskmax/src/{dmskmax.c => main.c} | 41 +++-- .../stats/base/dmskmax/test/test.dmskmax.js | 13 +- .../base/dmskmax/test/test.dmskmax.native.js | 13 +- .../stats/base/dmskmax/test/test.ndarray.js | 13 +- .../base/dmskmax/test/test.ndarray.native.js | 15 +- 22 files changed, 476 insertions(+), 388 deletions(-) create mode 100644 lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c delete mode 100644 lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.cpp rename lib/node_modules/@stdlib/stats/base/dmskmax/src/{dmskmax.c => main.c} (57%) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md index c9adb5ed4497..ab559c0e3d54 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md @@ -55,22 +55,20 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float64Array`][@stdlib/array/float64]. -- **strideX**: index increment for `x`. +- **strideX**: stride length for `x`. - **mask**: mask [`Uint8Array`][@stdlib/array/uint8]. If a `mask` array element is `0`, the corresponding element in `x` is considered valid and **included** in computation. If a `mask` array element is `1`, the corresponding element in `x` is considered invalid/missing and **excluded** from computation. -- **strideMask**: index increment for `mask`. +- **strideMask**: stride length for `mask`. -The `N` and `stride` parameters determine which elements are accessed at runtime. For example, to compute the maximum 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 maximum value of every other element in `x`, ```javascript var Float64Array = require( '@stdlib/array/float64' ); var Uint8Array = require( '@stdlib/array/uint8' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 1.0, 2.0, -7.0, -2.0, 4.0, 3.0, 5.0, 6.0 ] ); var mask = new Uint8Array( [ 0, 0, 0, 0, 0, 0, 1, 1 ] ); -var N = floor( x.length / 2 ); -var v = dmskmax( N, x, 2, mask, 2 ); +var v = dmskmax( 4, x, 2, mask, 2 ); // returns 4.0 ``` @@ -81,7 +79,6 @@ Note that indexing is relative to the first index. To introduce offsets, use [`t ```javascript var Float64Array = require( '@stdlib/array/float64' ); var Uint8Array = require( '@stdlib/array/uint8' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float64Array( [ 2.0, 1.0, -2.0, -2.0, 3.0, 4.0, 5.0, 6.0 ] ); var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element @@ -89,9 +86,7 @@ var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd var mask0 = new Uint8Array( [ 0, 0, 0, 0, 0, 0, 1, 1 ] ); var mask1 = new Uint8Array( mask0.buffer, mask0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = dmskmax( N, x1, 2, mask1, 2 ); +var v = dmskmax( 4, x1, 2, mask1, 2 ); // returns 4.0 ``` @@ -115,18 +110,16 @@ The function has the following additional parameters: - **offsetX**: starting index for `x`. - **offsetMask**: starting index for `mask`. -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 maximum 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 parameters support indexing semantics based on a starting index. For example, to calculate the maximum value for every other element in `x` starting from the second element ```javascript var Float64Array = require( '@stdlib/array/float64' ); var Uint8Array = require( '@stdlib/array/uint8' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 2.0, 1.0, -2.0, -2.0, 3.0, 4.0, 5.0, 6.0 ] ); var mask = new Uint8Array( [ 0, 0, 0, 0, 0, 0, 1, 1 ] ); -var N = floor( x.length / 2 ); -var v = dmskmax.ndarray( N, x, 2, 1, mask, 2, 1 ); +var v = dmskmax.ndarray( 4, x, 2, 1, mask, 2, 1 ); // returns 4.0 ``` @@ -182,6 +175,123 @@ console.log( v ); + + +
+ +### Usage + +```c +#include "stdlib/stats/base/dmskmax.h" +``` + +#### stdlib_strided_dmskmax( N, \*X, strideX, Mask, strideMask ) + +Computes the maximum value of a double-precision floating-point strided array `x` according to a `mask`. + +```c +#include + +const double x[] = { 1.0, -2.0, 2.0 }; +const uint_8 mask = { 0, 1, 0 }; + +double v = stdlib_strided_dmskmax( 3, x, 1, mask, 1 ); +// returns 2.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`. +- **Mask**: `[in] uint_8*`. If a `mask` array element is `0`, the corresponding element in `x` is considered valid and included in computation. If a `mask` array element is `1`, the corresponding element in `x` is considered invalid/missing and excluded from computation. +- **strideMask**: `[in] CBLAS_INT` stride length for `Mask`. + +```c +double stdlib_strided_dmskmax( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const uint8_t *Mask, const CBLAS_INT strideMask ); +``` + +#### stdlib_strided_dmskmax_ndarray( N, \*X, strideX, offsetX ) + +Computes the maximum value of a double-precision floating-point strided array according to a `mask` and using alternative indexing semantics. + +```c +#include + +const double x[] = { 1.0, -2.0, 2.0 }; +const uint_8 mask = { 0, 1, 0 }; + +double v = stdlib_strided_dmskmax( 3, x, 1, 0, mask, 1, 0 ); +// returns 2.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`. +- **Mask**: `[in] uint_8*`. If a `mask` array element is `0`, the corresponding element in `x` is considered valid and included in computation. If a `mask` array element is `1`, the corresponding element in `x` is considered invalid/missing and excluded from computation. +- **strideMask**: `[in] CBLAS_INT` stride length for `Mask`. +- **offsetMask**: `[in] CBLAS_INT` starting index for `Mask`. + +```c +double stdlib_strided_dmskmax_ndarray( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const uint8_t *Mask, const CBLAS_INT strideMask , const CBLAS_INT offsetMask ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/dmskmax.h" +#include +#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, 9.0, 10.0 }; + + // Create a mask array: + uint8_t mask[] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 }; + + // Specify the number of elements: + const int N = 5; + + // Specify the stride lengths: + const int strideX = 2; + const int strideMask = 2; + + // Compute the maximum value: + double v = stdlib_strided_dmskmax( N, x, strideX, mask, strideMask ); + + // Print the result: + printf( "max: %lf\n", v ); +} +``` + +
+ + + + + + + diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dmskmax/lib/ndarray.native.js index 5ee175d193d8..7d498b936dad 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/lib/ndarray.native.js @@ -50,8 +50,7 @@ var addon = require( './../src/addon.node' ); * // returns 4.0 */ function dmskmax( N, x, strideX, offsetX, mask, strideMask, offsetMask ) { - // TODO - add eslint comment to escape max line length warning (if needed) - return addon.ndarray( N, x, strideX, offsetX, mask, strideMask, offsetMask ); + return addon.ndarray( N, x, strideX, offsetX, mask, strideMask, offsetMask ); // eslint-disable-line max-len } From 2db5af85335efd55d9411a847860ec44ec7343b4 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Tue, 31 Dec 2024 20:50:01 +0530 Subject: [PATCH 09/17] chore: changes in readme --- .../@stdlib/stats/base/dmskmax/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md index c6e46d09229c..7dc16fe6225a 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md @@ -185,7 +185,7 @@ console.log( v ); #include "stdlib/stats/base/dmskmax.h" ``` -#### stdlib_strided_dmskmax( N, \*X, strideX, Mask, strideMask ) +#### stdlib_strided_dmskmax( N, \*X, strideX, \*Mask, strideMask ) Computes the maximum value of a double-precision floating-point strided array according to a mask. @@ -193,7 +193,7 @@ Computes the maximum value of a double-precision floating-point strided array ac #include const double x[] = { 1.0, -2.0, 2.0 }; -const uint_8 mask[] = { 0, 1, 0 }; +const uint8_t mask[] = { 0, 1, 0 }; double v = stdlib_strided_dmskmax( 3, x, 1, mask, 1 ); // returns 2.0 @@ -204,14 +204,16 @@ 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`. -- **Mask**: `[in] uint_8*` mask array. If a `Mask` array element is `0`, the corresponding element in `X` is considered valid and included in computation. If a `Mask` array element is `1`, the corresponding element in `X` is considered invalid/missing and excluded from computation. +- **Mask**: `[in] uint8_t*` mask array. If a `Mask` array element is `0`, the corresponding element in `X` is considered valid and included in computation. If a `Mask` array element is `1`, the corresponding element in `X` is considered invalid/missing and excluded from computation. - **strideMask**: `[in] CBLAS_INT` stride length for `Mask`. ```c double stdlib_strided_dmskmax( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const uint8_t *Mask, const CBLAS_INT strideMask ); ``` -#### stdlib_strided_dmskmax_ndarray( N, \*X, strideX, offsetX, Mask, strideMask, offsetMask ) + + +#### stdlib_strided_dmskmax_ndarray( N, \*X, strideX, offsetX, \*Mask, strideMask, offsetMask ) Computes the maximum value of a double-precision floating-point strided array according to a mask and using alternative indexing semantics. @@ -219,7 +221,7 @@ Computes the maximum value of a double-precision floating-point strided array ac #include const double x[] = { 1.0, -2.0, 2.0 }; -const uint_8 mask = { 0, 1, 0 }; +const uint8_t mask = { 0, 1, 0 }; double v = stdlib_strided_dmskmax_ndarray( 3, x, 1, 0, mask, 1, 0 ); // returns 2.0 @@ -231,7 +233,7 @@ The function accepts the following arguments: - **X**: `[in] double*` input array. - **strideX**: `[in] CBLAS_INT` stride length for `X`. - **offsetX**: `[in] CBLAS_INT` starting index for `X`. -- **Mask**: `[in] uint_8*` mask array. If a `Mask` array element is `0`, the corresponding element in `X` is considered valid and included in computation. If a `Mask` array element is `1`, the corresponding element in `X` is considered invalid/missing and excluded from computation. +- **Mask**: `[in] uint8_t*` mask array. If a `Mask` array element is `0`, the corresponding element in `X` is considered valid and included in computation. If a `Mask` array element is `1`, the corresponding element in `X` is considered invalid/missing and excluded from computation. - **strideMask**: `[in] CBLAS_INT` stride length for `Mask`. - **offsetMask**: `[in] CBLAS_INT` starting index for `Mask`. From 3c0cb666c32610284dfc59f13b2bdad77abda2fb Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Wed, 1 Jan 2025 09:15:03 +0530 Subject: [PATCH 10/17] chore: fix typos --- lib/node_modules/@stdlib/stats/base/dmskmax/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md index 7dc16fe6225a..29b77b13213a 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md @@ -59,7 +59,7 @@ The function has the following parameters: - **mask**: mask [`Uint8Array`][@stdlib/array/uint8]. If a `mask` array element is `0`, the corresponding element in `x` is considered valid and **included** in computation. If a `mask` array element is `1`, the corresponding element in `x` is considered invalid/missing and **excluded** from computation. - **strideMask**: stride length for `mask`. -The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the maximum value of every other element in `x`, +The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the maximum value of every other element in `x`, ```javascript var Float64Array = require( '@stdlib/array/float64' ); From d79f4ed5fdd7e070fd373a5b41804a979d06a3df Mon Sep 17 00:00:00 2001 From: stdlib-bot <82920195+stdlib-bot@users.noreply.github.com> Date: Wed, 1 Jan 2025 03:56:28 +0000 Subject: [PATCH 11/17] chore: update copyright years --- lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c b/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c index ea73e8cbb59b..44c3126822dd 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/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 8affade5cfa23656b2364f7250b486fabb088fb9 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Wed, 1 Jan 2025 09:43:56 +0530 Subject: [PATCH 12/17] chore: comma spacing fix --- .../stats/base/dmskmax/include/stdlib/stats/base/dmskmax.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/include/stdlib/stats/base/dmskmax.h b/lib/node_modules/@stdlib/stats/base/dmskmax/include/stdlib/stats/base/dmskmax.h index 6ce844bc8ff5..353790edb177 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/include/stdlib/stats/base/dmskmax.h +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/include/stdlib/stats/base/dmskmax.h @@ -37,7 +37,7 @@ double API_SUFFIX(stdlib_strided_dmskmax)( const CBLAS_INT N, const double *X, c /** * Computes the maximum value of a double-precision floating-point strided array according to a mask and using alternative indexing semantics. */ -double API_SUFFIX(stdlib_strided_dmskmax_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const uint8_t *Mask, const CBLAS_INT strideMask , const CBLAS_INT offsetMask ); +double API_SUFFIX(stdlib_strided_dmskmax_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const uint8_t *Mask, const CBLAS_INT strideMask, const CBLAS_INT offsetMask ); #ifdef __cplusplus } From d4c207ad16ae2303f800e21c3dd029f47c014697 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:17:36 +0530 Subject: [PATCH 13/17] feat: update benchmarks and examples --- .../@stdlib/stats/base/dmskmax/README.md | 31 +++++++------------ .../stats/base/dmskmax/benchmark/benchmark.js | 25 +++++---------- .../dmskmax/benchmark/benchmark.native.js | 25 +++++---------- .../dmskmax/benchmark/benchmark.ndarray.js | 25 +++++---------- .../benchmark/benchmark.ndarray.native.js | 25 +++++---------- .../@stdlib/stats/base/dmskmax/docs/repl.txt | 2 +- .../stats/base/dmskmax/examples/index.js | 27 ++++++---------- 7 files changed, 51 insertions(+), 109 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md index 29b77b13213a..65bf0f1ebdaa 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md @@ -110,7 +110,7 @@ The function has the following additional parameters: - **offsetX**: starting index for `x`. - **offsetMask**: starting index for `mask`. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, the offset parameters support indexing semantics based on a starting index. For example, to calculate the maximum value for every other element in `x` starting from the second element +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, the offset parameters support indexing semantics based on a starting indices. For example, to calculate the maximum value for every other element in `x` starting from the second element ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -144,26 +144,19 @@ var v = dmskmax.ndarray( 4, x, 2, 1, mask, 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 Uint8Array = require( '@stdlib/array/uint8' ); +var uniform = require( '@stdlib/random/array/uniform' ); +var bernoulli = require( '@stdlib/random/array/bernoulli' ); var dmskmax = require( '@stdlib/stats/base/dmskmax' ); -var mask; -var x; -var i; - -x = new Float64Array( 10 ); -mask = new Uint8Array( x.length ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - mask[ i ] = 1; - } else { - mask[ i ] = 0; - } - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var uniformOptions = { + 'dtype': 'float64' +}; +var bernoulliOptions = { + 'dtype': 'uint8' +}; + +var x = uniform( 10, -50.0, 50.0, uniformOptions ); +var mask = bernoulli( x.length, 0.2, bernoulliOptions ) console.log( x ); console.log( mask ); diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.js index a6f1f8c6813d..b3b88720cac8 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.js @@ -22,8 +22,7 @@ var bench = require( '@stdlib/bench' ); var uniform = require( '@stdlib/random/array/uniform' ); -var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var bernoulli = require( '@stdlib/random/array/bernoulli' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var pkg = require( './../package.json' ).name; @@ -32,26 +31,16 @@ var dmskmax = require( './../lib/dmskmax.js' ); // VARIABLES // -var options = { +var uniformOptions = { 'dtype': 'float64' }; +var bernoulliOptions = { + 'dtype': 'uint8' +}; // FUNCTIONS // -/** -* Returns either one or zero. -* -* @private -* @returns {number} one or zero -*/ -function rand() { - if ( bernoulli( 0.2 ) ) { - return 1; - } - return 0; -} - /** * Creates a benchmark function. * @@ -60,8 +49,8 @@ function rand() { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var mask = filledarrayBy( len, 'uint8', rand ); - var x = uniform( len, -10.0, 10.0, options ); + var mask = bernoulli( len, 0.2, bernoulliOptions ); + var x = uniform( len, -10.0, 10.0, uniformOptions ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.native.js index f1d607069a10..f0bc0231eee6 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.native.js @@ -23,8 +23,7 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); var uniform = require( '@stdlib/random/array/uniform' ); -var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var bernoulli = require( '@stdlib/random/array/bernoulli' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -37,26 +36,16 @@ var dmskmax = tryRequire( resolve( __dirname, './../lib/dmskmax.native.js' ) ); var opts = { 'skip': ( dmskmax instanceof Error ) }; -var options = { +var uniformOptions = { 'dtype': 'float64' }; +var bernoulliOptions = { + 'dtype': 'uint8' +}; // FUNCTIONS // -/** -* Returns either one or zero. -* -* @private -* @returns {number} one or zero -*/ -function rand() { - if ( bernoulli( 0.2 ) ) { - return 1; - } - return 0; -} - /** * Creates a benchmark function. * @@ -65,8 +54,8 @@ function rand() { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var mask = filledarrayBy( len, 'uint8', rand ); - var x = uniform( len, -10.0, 10.0, options ); + var mask = bernoulli( len, 0.2, bernoulliOptions ); + var x = uniform( len, -10.0, 10.0, uniformOptions ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.js index 2c99de3d20b4..33ecb4344641 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.js @@ -22,8 +22,7 @@ var bench = require( '@stdlib/bench' ); var uniform = require( '@stdlib/random/array/uniform' ); -var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var bernoulli = require( '@stdlib/random/array/bernoulli' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var pkg = require( './../package.json' ).name; @@ -32,26 +31,16 @@ var dmskmax = require( './../lib/ndarray.js' ); // VARIABLES // -var options = { +var uniformOptions = { 'dtype': 'float64' }; +var bernoulliOptions = { + 'dtype': 'uint8' +}; // FUNCTIONS // -/** -* Returns either one or zero. -* -* @private -* @returns {number} one or zero -*/ -function rand() { - if ( bernoulli( 0.2 ) ) { - return 1; - } - return 0; -} - /** * Creates a benchmark function. * @@ -60,8 +49,8 @@ function rand() { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var mask = filledarrayBy( len, 'uint8', rand ); - var x = uniform( len, -10.0, 10.0, options ); + var mask = bernoulli( len, 0.2, bernoulliOptions ); + var x = uniform( len, -10.0, 10.0, uniformOptions ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.native.js index aea9be821762..bd313639b6bb 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/benchmark/benchmark.ndarray.native.js @@ -23,8 +23,7 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); var uniform = require( '@stdlib/random/array/uniform' ); -var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var bernoulli = require( '@stdlib/random/array/bernoulli' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -37,26 +36,16 @@ var dmskmax = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( dmskmax instanceof Error ) }; -var options = { +var uniformOptions = { 'dtype': 'float64' }; +var bernoulliOptions = { + 'dtype': 'uint8' +}; // FUNCTIONS // -/** -* Returns either one or zero. -* -* @private -* @returns {number} one or zero -*/ -function rand() { - if ( bernoulli( 0.2 ) ) { - return 1; - } - return 0; -} - /** * Creates a benchmark function. * @@ -65,8 +54,8 @@ function rand() { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var mask = filledarrayBy( len, 'uint8', rand ); - var x = uniform( len, -10.0, 10.0, options ); + var mask = bernoulli( len, 0.2, bernoulliOptions ); + var x = uniform( len, -10.0, 10.0, uniformOptions ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt index 9698e1e48d64..1a9d20f2055b 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt @@ -3,7 +3,7 @@ Computes the maximum value of a double-precision floating-point strided array according to a mask. - The `N` and stride parameters determine which elements in the strided arrays + The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. Indexing is relative to the first index. To introduce offsets, use a typed diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/examples/index.js b/lib/node_modules/@stdlib/stats/base/dmskmax/examples/index.js index 5bf314a934d6..f6bb694a5032 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/examples/index.js @@ -18,26 +18,19 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float64Array = require( '@stdlib/array/float64' ); -var Uint8Array = require( '@stdlib/array/uint8' ); +var uniform = require( '@stdlib/random/array/uniform' ); +var bernoulli = require( '@stdlib/random/array/bernoulli' ); var dmskmax = require( './../lib' ); -var mask; -var x; -var i; +var uniformOptions = { + 'dtype': 'float64' +}; +var bernoulliOptions = { + 'dtype': 'uint8' +}; -x = new Float64Array( 10 ); -mask = new Uint8Array( x.length ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - mask[ i ] = 1; - } else { - mask[ i ] = 0; - } - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = uniform( 10, -50.0, 50.0, uniformOptions ); +var mask = bernoulli( x.length, 0.2, bernoulliOptions ); console.log( x ); console.log( mask ); From 3a4da5aef81282557fe7bece5d790be1cbea5fcf Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:21:41 +0530 Subject: [PATCH 14/17] chore: fix linting errors --- lib/node_modules/@stdlib/stats/base/dmskmax/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md index 65bf0f1ebdaa..9d090204d971 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md @@ -156,7 +156,7 @@ var bernoulliOptions = { }; var x = uniform( 10, -50.0, 50.0, uniformOptions ); -var mask = bernoulli( x.length, 0.2, bernoulliOptions ) +var mask = bernoulli( x.length, 0.2, bernoulliOptions ); console.log( x ); console.log( mask ); From b23d2aca983236e2d6d48997c4ae0b50e1e76508 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:22:32 +0530 Subject: [PATCH 15/17] chore: fix typos --- lib/node_modules/@stdlib/stats/base/dmskmax/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md index 9d090204d971..bc35eb782dfa 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/README.md @@ -214,7 +214,7 @@ Computes the maximum value of a double-precision floating-point strided array ac #include const double x[] = { 1.0, -2.0, 2.0 }; -const uint8_t mask = { 0, 1, 0 }; +const uint8_t mask[] = { 0, 1, 0 }; double v = stdlib_strided_dmskmax_ndarray( 3, x, 1, 0, mask, 1, 0 ); // returns 2.0 From e414ee23b311ef26220b4ec1f6f355e999dc26bd Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:36:20 +0530 Subject: [PATCH 16/17] chore: fix linting errors --- lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt index 1a9d20f2055b..12e92f4235de 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/docs/repl.txt @@ -3,8 +3,8 @@ Computes the maximum value of a double-precision floating-point strided array according to a mask. - The `N` and stride parameters determine which elements in the strided arrays - are accessed at runtime. + The `N` and stride parameters determine which elements in the strided + arrays are accessed at runtime. Indexing is relative to the first index. To introduce offsets, use a typed array views. From 467a13d36a5c8ecc2a981a9ab35e570c9e8035b7 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:22:48 +0530 Subject: [PATCH 17/17] chore: indentation fix --- lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c b/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c index 44c3126822dd..15f8916fa93a 100644 --- a/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/dmskmax/src/addon.c @@ -54,9 +54,9 @@ static napi_value addon_method( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 7 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); - STDLIB_NAPI_ARGV_INT64( env, strideMask, argv, 5 ); + STDLIB_NAPI_ARGV_INT64( env, strideMask, argv, 5 ); STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 ); - STDLIB_NAPI_ARGV_INT64( env, offsetMask, argv, 6 ); + STDLIB_NAPI_ARGV_INT64( env, offsetMask, argv, 6 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); STDLIB_NAPI_ARGV_STRIDED_UINT8ARRAY( env, Mask, N, strideMask, argv, 4 ); STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dmskmax_ndarray( N, X, strideX, offsetX, Mask, strideMask, offsetMask ), v );