diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/README.md b/lib/node_modules/@stdlib/stats/base/nanmskrange/README.md index 005d1797c443..0d435d47e56a 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/README.md +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/README.md @@ -43,10 +43,10 @@ var nanmskrange = require( '@stdlib/stats/base/nanmskrange' ); Computes the [range][range] of a strided array `x` according to a `mask`, ignoring `NaN` values. ```javascript -var x = [ 1.0, -2.0, 4.0, 2.0, NaN ]; -var mask = [ 0, 0, 1, 0, 0 ]; +var x = [ 1.0, -2.0, 4.0, 2.0, NaN, NaN ]; +var mask = [ 0, 0, 1, 0, 0, 0 ]; -var v = nanmskrange( x.length, x, 1, mask, 1 ); +var v = nanmskrange( 6, x, 1, mask, 1 ); // returns 4.0 ``` @@ -54,41 +54,35 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Array`][mdn-array] or [`typed array`][mdn-typed-array]. -- **strideX**: index increment for `x`. +- **strideX**: stride length for `x`. - **mask**: mask [`Array`][mdn-array] or [`typed array`][mdn-typed-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**: 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 [range][range] 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 [range][range] of every other element in `x`, ```javascript -var floor = require( '@stdlib/math/base/special/floor' ); - var x = [ 1.0, 2.0, -7.0, -2.0, 4.0, 3.0, 5.0, 6.0 ]; var mask = [ 0, 0, 0, 0, 0, 0, 1, 1 ]; -var N = floor( x.length / 2 ); -var v = nanmskrange( N, x, 2, mask, 2 ); +var v = nanmskrange( 4, x, 2, mask, 2 ); // returns 11.0 ``` Note that indexing is relative to the first index. To introduce offsets, use [`typed array`][mdn-typed-array] views. - + ```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 x0 = new Float64Array( [ 2.0, 1.0, -2.0, -2.0, 3.0, 4.0, 5.0, 6.0, NaN, NaN ] ); var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var mask0 = new Uint8Array( [ 0, 0, 0, 0, 0, 0, 1, 1 ] ); +var mask0 = new Uint8Array( [ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 ] ); var mask1 = new Uint8Array( mask0.buffer, mask0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = nanmskrange( N, x1, 2, mask1, 2 ); +var v = nanmskrange( 5, x1, 2, mask1, 2 ); // returns 6.0 ``` @@ -97,10 +91,10 @@ var v = nanmskrange( N, x1, 2, mask1, 2 ); Computes the [range][range] of a strided array according to a `mask`, ignoring `NaN` values and using alternative indexing semantics. ```javascript -var x = [ 1.0, -2.0, 4.0, 2.0, NaN ]; -var mask = [ 0, 0, 1, 0, 0 ]; +var x = [ 1.0, -2.0, 4.0, 2.0, NaN, NaN ]; +var mask = [ 0, 0, 1, 0, 0, 0 ]; -var v = nanmskrange.ndarray( x.length, x, 1, 0, mask, 1, 0 ); +var v = nanmskrange.ndarray( 6, x, 1, 0, mask, 1, 0 ); // returns 4.0 ``` @@ -109,16 +103,13 @@ 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 [range][range] 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 indices. For example, to calculate the [range][range] for every other value in `x` starting from the second value ```javascript -var floor = require( '@stdlib/math/base/special/floor' ); - var x = [ 2.0, 1.0, -2.0, -2.0, 3.0, 4.0, 5.0, 6.0 ]; var mask = [ 0, 0, 0, 0, 0, 0, 1, 1 ]; -var N = floor( x.length / 2 ); -var v = nanmskrange.ndarray( N, x, 2, 1, mask, 2, 1 ); +var v = nanmskrange.ndarray( 4, x, 2, 1, mask, 2, 1 ); // returns 6.0 ``` @@ -131,6 +122,7 @@ var v = nanmskrange.ndarray( N, x, 2, 1, mask, 2, 1 ); ## Notes - If `N <= 0`, both functions return `NaN`. +- Both functions support array-like objects having getter and setter accessors for array element access (e.g., [`@stdlib/array/base/accessor`][@stdlib/array/base/accessor]). - Depending on the environment, the typed versions ([`dnanmskrange`][@stdlib/stats/base/dnanmskrange], [`snanmskrange`][@stdlib/stats/base/snanmskrange], etc.) are likely to be significantly more performant. @@ -144,31 +136,18 @@ var v = nanmskrange.ndarray( N, 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 nanmskrange = require( '@stdlib/stats/base/nanmskrange' ); -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; - } - if ( randu() < 0.1 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( (randu()*100.0) - 50.0 ); - } -} +var x = uniform( 10, -50.0, 50.0, { + 'dtype': 'float64' +}); console.log( x ); + +var mask = bernoulli( x.length, 0.2, { + 'dtype': 'uint8' +}); console.log( mask ); var v = nanmskrange( x.length, x, 1, mask, 1 ); @@ -222,6 +201,8 @@ console.log( v ); [@stdlib/stats/base/snanmskrange]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/stats/base/snanmskrange +[@stdlib/array/base/accessor]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/array/base/accessor + diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.js index b25e2b0bea27..4bb7dc1a55e7 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.js @@ -21,13 +21,21 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); +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; var nanmskrange = require( './../lib/nanmskrange.js' ); +// VARIABLES // + +var options = { + 'dtype': 'generic' +}; + + // FUNCTIONS // /** @@ -38,20 +46,8 @@ var nanmskrange = require( './../lib/nanmskrange.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var mask; - var x; - var i; - - x = []; - mask = []; - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - mask.push( 1 ); - } else { - mask.push( 0 ); - } - x.push( ( randu()*20.0 ) - 10.0 ); - } + var mask = bernoulli( len, 0.2, options ); + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.ndarray.js index 436908c2bf35..0f8409d9ba87 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/benchmark/benchmark.ndarray.js @@ -21,13 +21,21 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); +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; var nanmskrange = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'generic' +}; + + // FUNCTIONS // /** @@ -38,20 +46,8 @@ var nanmskrange = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var mask; - var x; - var i; - - x = []; - mask = []; - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - mask.push( 1 ); - } else { - mask.push( 0 ); - } - x.push( ( randu()*20.0 ) - 10.0 ); - } + var mask = bernoulli( len, 0.2, options ); + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/repl.txt index b4b07fe2e924..04e542ae1120 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/repl.txt @@ -3,8 +3,8 @@ Computes the range of a strided array according to a mask and ignoring `NaN` values. - The `N` and `stride` parameters determine which elements 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. @@ -26,13 +26,13 @@ Input array. strideX: integer - Index increment for `x`. + Stride length for `x`. mask: Array|TypedArray Mask array. strideMask: integer - Index increment for `mask`. + Stride length for `mask`. Returns ------- @@ -44,14 +44,13 @@ // Standard Usage: > var x = [ 1.0, -2.0, 4.0, 2.0, NaN ]; > var mask = [ 0, 0, 1, 0, 0 ]; - > {{alias}}( x.length, x, 1, mask, 1 ) + > {{alias}}( 5, x, 1, mask, 1 ) 4.0 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, 4.0 ]; > mask = [ 0, 0, 0, 0, 0, 0, 1 ]; - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}( N, x, 2, mask, 2 ) + > {{alias}}( 3, x, 2, mask, 2 ) 4.0 // Using view offsets: @@ -59,10 +58,10 @@ > var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); > var mask0 = new {{alias:@stdlib/array/uint8}}( [ 0, 0, 0, 0, 0, 0, 1 ] ); > var mask1 = new {{alias:@stdlib/array/uint8}}( mask0.buffer, mask0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > {{alias}}( N, x1, 2, mask1, 2 ) + > {{alias}}( 3, x1, 2, mask1, 2 ) 4.0 + {{alias}}.ndarray( N, x, strideX, offsetX, mask, strideMask, offsetMask ) Computes the range of a strided array according to a mask, ignoring `NaN` values and using alternative indexing semantics. @@ -80,7 +79,7 @@ Input array. strideX: integer - Index increment for `x`. + Stride length for `x`. offsetX: integer Starting index for `x`. @@ -89,7 +88,7 @@ Mask array. strideMask: integer - Index increment for `mask`. + Stride length for `mask`. offsetMask: integer Starting index for `mask`. @@ -104,14 +103,13 @@ // Standard Usage: > var x = [ 1.0, -2.0, 2.0, 4.0, NaN ]; > var mask = [ 0, 0, 0, 1, 0 ]; - > {{alias}}.ndarray( x.length, x, 1, 0, mask, 1, 0 ) + > {{alias}}.ndarray( 5, x, 1, 0, mask, 1, 0 ) 4.0 // Using offset parameter: > x = [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, 4.0 ]; > mask = [ 0, 0, 0, 0, 0, 0, 1 ]; - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1, mask, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1, mask, 2, 1 ) 4.0 See Also diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/index.d.ts index 7a58c7aea72b..9438c8e0dd0f 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/index.d.ts @@ -20,7 +20,12 @@ /// -import { NumericArray } from '@stdlib/types/array'; +import { NumericArray, Collection, AccessorArrayLike } from '@stdlib/types/array'; + +/** +* Input array. +*/ +type InputArray = NumericArray | Collection | AccessorArrayLike; /** * Interface describing `nanmskrange`. @@ -31,9 +36,9 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array - * @param strideX - `x` stride length + * @param strideX - stride length for `x` * @param mask - mask array - * @param strideMask - `mask` stride length + * @param strideMask - stride length for `mask` * @returns range * * @example @@ -43,17 +48,17 @@ interface Routine { * var v = nanmskrange( x.length, x, 1, mask, 1 ); * // returns 4.0 */ - ( N: number, x: NumericArray, strideX: number, mask: NumericArray, strideMask: number ): number; + ( N: number, x: InputArray, strideX: number, mask: InputArray, strideMask: number ): number; /** * Computes the range of a strided array according to a mask, ignoring `NaN` values and using alternative indexing semantics. * * @param N - number of indexed elements * @param x - input array - * @param strideX - `x` stride length + * @param strideX - stride length for `x` * @param offsetX - `x` starting index * @param mask - mask array - * @param strideMask - `mask` stride length + * @param strideMask - stride length for `mask` * @param offsetMask - `mask` starting index * @returns range * @@ -64,7 +69,7 @@ interface Routine { * var v = nanmskrange.ndarray( x.length, x, 1, 0, mask, 1, 0 ); * // returns 4.0 */ - ndarray( N: number, x: NumericArray, strideX: number, offsetX: number, mask: NumericArray, strideMask: number, offsetMask: number ): number; + ndarray( N: number, x: InputArray, strideX: number, offsetX: number, mask: InputArray, strideMask: number, offsetMask: number ): number; } /** @@ -72,9 +77,9 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array -* @param strideX - `x` stride length +* @param strideX - stride length for `x` * @param mask - mask array -* @param strideMask - `mask` stride length +* @param strideMask - stride length for `x` * @returns range * * @example diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/test.ts b/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/test.ts index c0cf28ebefb4..ad230301c8ca 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/test.ts +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/docs/types/test.ts @@ -16,6 +16,7 @@ * limitations under the License. */ +import AccessorArray = require( '@stdlib/array/base/accessor' ); import nanmskrange = require( './index' ); @@ -27,6 +28,7 @@ import nanmskrange = require( './index' ); const mask = new Uint8Array( 10 ); nanmskrange( x.length, x, 1, mask, 1 ); // $ExpectType number + nanmskrange( x.length, new AccessorArray( x ), 1, mask, 1 ); // $ExpectType number } // The compiler throws an error if the function is provided a first argument which is not a number... @@ -123,6 +125,7 @@ import nanmskrange = require( './index' ); const mask = new Uint8Array( 10 ); nanmskrange.ndarray( x.length, x, 1, 0, mask, 1, 0 ); // $ExpectType number + nanmskrange.ndarray( x.length, new AccessorArray( x ), 1, 0, new AccessorArray( mask ), 1, 0 ); // $ExpectType number } // The compiler throws an error if the `ndarray` method is provided a first argument which is not a number... diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/examples/index.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/examples/index.js index 1d2949c46055..a29fed717426 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/examples/index.js @@ -18,31 +18,18 @@ '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 nanmskrange = require( './../lib' ); -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; - } - if ( randu() < 0.1 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( (randu()*100.0) - 50.0 ); - } -} +var x = uniform( 10, -50.0, 50.0, { + 'dtype': 'float64' +}); console.log( x ); + +var mask = bernoulli( x.length, 0.2, { + 'dtype': 'uint8' +}); console.log( mask ); var v = nanmskrange( x.length, x, 1, mask, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/accessors.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/accessors.js new file mode 100644 index 000000000000..f9a7eca00c16 --- /dev/null +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/accessors.js @@ -0,0 +1,112 @@ +/** +* @license Apache-2.0 +* +* 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. +* 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. +*/ + +'use strict'; + +// MODULES // + +var isnan = require( '@stdlib/math/base/assert/is-nan' ); + + +// MAIN // + +/** +* Computes the range of a strided array according to a mask, ignoring `NaN` values. +* +* @param {PositiveInteger} N - number of indexed elements +* @param {Object} x - input array object +* @param {Collection} x.data - input array element +* @param {Array} x.accessors - array element accessors +* @param {integer} strideX - stride length for `x` +* @param {NonNegativeInteger} offsetX - starting index for `x` +* @param {Object} mask - mask array object +* @param {Collection} mask.data - mask array element +* @param {Array} mask.accessors - mask array element accessors +* @param {integer} strideMask - stride length `mask` +* @param {NonNegativeInteger} offsetMask - starting index `mask` +* @returns {number} range +* +* @example +* var toAccessorArray = require( '@stdlib/array/base/to-accessor-array' ); +* var arraylike2object = require( '@stdlib/array/base/arraylike2object' ); +* +* var x = toAccessorArray( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, 5.0, 6.0 ] ); +* var mask = toAccessorArray( [ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 ] ); +* +* var v = nanmskrange( 5, arraylike2object( x ), 2, 1, arraylike2object( mask ), 2, 1 ); +* // returns 6.0 +*/ +function nanmskrange( N, x, strideX, offsetX, mask, strideMask, offsetMask ) { + var xbuf; + var mbuf; + var mget; + var xget; + var max; + var min; + var ix; + var im; + var v; + var i; + + // Cache references to array data: + xbuf = x.data; + mbuf = mask.data; + + // Cache references to element accessors: + xget = x.accessors[ 0 ]; + mget = mask.accessors[ 0 ]; + + ix = offsetX; + im = offsetMask; + for ( i = 0; i < N; i++ ) { + v = xget( xbuf, ix ); + if ( v === v && mget( mbuf, im ) === 0 ) { + break; + } + ix += strideX; + im += strideMask; + } + if ( i === N ) { + return NaN; + } + min = v; + max = min; + i += 1; + for ( i; i < N; i++ ) { + ix += strideX; + im += strideMask; + if ( mget( mbuf, im ) ) { + continue; + } + v = xget( xbuf, ix ); + if ( isnan( v ) ) { + continue; + } + if ( v < min ) { + min = v; + } else if ( v > max ) { + max = v; + } + } + return max - min; +} + + +// EXPORTS // + +module.exports = nanmskrange; diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/nanmskrange.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/nanmskrange.js index fe07fc8b4899..8f5472380007 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/nanmskrange.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/nanmskrange.js @@ -20,7 +20,8 @@ // MODULES // -var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -43,57 +44,9 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' ); * // returns 4.0 */ function nanmskrange( N, x, strideX, mask, strideMask ) { - var max; - var min; - var ix; - var im; - var v; - var i; - - if ( N <= 0 ) { - return NaN; - } - if ( strideX < 0 ) { - ix = (1-N) * strideX; - } else { - ix = 0; - } - if ( strideMask < 0 ) { - im = (1-N) * strideMask; - } else { - im = 0; - } - for ( i = 0; i < N; i++ ) { - v = x[ ix ]; - if ( v === v && mask[ im ] === 0 ) { - break; - } - ix += strideX; - im += strideMask; - } - if ( i === N ) { - return NaN; - } - min = v; - max = min; - i += 1; - for ( i; i < N; i++ ) { - ix += strideX; - im += strideMask; - if ( mask[ im ] ) { - continue; - } - v = x[ ix ]; - if ( isnan( v ) ) { - continue; - } - if ( v < min ) { - min = v; - } else if ( v > max ) { - max = v; - } - } - return max - min; + var ix = stride2offset( N, strideX ); + var im = stride2offset( N, strideMask); + return ndarray( N, x, strideX, ix, mask, strideMask, im ); } diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/ndarray.js index 472fcf45659f..60df805a9214 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/lib/ndarray.js @@ -21,6 +21,8 @@ // MODULES // var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var arraylike2object = require( '@stdlib/array/base/arraylike2object' ); +var accessors = require( './accessors.js' ); // MAIN // @@ -52,12 +54,19 @@ function nanmskrange( N, x, strideX, offsetX, mask, strideMask, offsetMask ) { var min; var ix; var im; + var ox; + var om; var v; var i; if ( N <= 0 ) { return NaN; } + ox = arraylike2object( x ); + om = arraylike2object( mask ); + if ( ox.accessorProtocol || om.accessorProtocol ) { + return accessors( N, ox, strideX, offsetX, om, strideMask, offsetMask ); + } ix = offsetX; im = offsetMask; for ( i = 0; i < N; i++ ) { diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.nanmskrange.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.nanmskrange.js index e79dc89a0cc2..de850ee14b14 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.nanmskrange.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.nanmskrange.js @@ -21,7 +21,7 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); +var toAccessorArray = require( '@stdlib/array/base/to-accessor-array' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -100,6 +100,64 @@ tape( 'the function calculates the range of a strided array according to a mask, t.end(); }); +tape( 'the function calculates the range of a strided array according to a mask, ignoring NaN values (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = toAccessorArray( [ 1.0, -2.0, -4.0, NaN, 5.0, 0.0, 3.0 ] ); + mask = toAccessorArray( [ 0, 0, 0, 1, 0, 0, 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( v, 9.0, 'returns expected value' ); + + x = toAccessorArray( [ -4.0, NaN, -5.0 ] ); + mask = toAccessorArray( [ 0, 1, 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( v, 1.0, 'returns expected value' ); + + x = toAccessorArray( [ -0.0, 0.0, NaN, -0.0 ] ); + mask = toAccessorArray( [ 0, 0, 1, 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isPositiveZero( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ -4.0, 0.0, NaN, 5.0 ] ); + mask = toAccessorArray( [ 0, 0, 0, 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( v, 9.0, 'returns expected value' ); + + x = toAccessorArray( [ NaN ] ); + mask = toAccessorArray( [ 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN ] ); + mask = toAccessorArray( [ 1 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 1, 1 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 1, 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 0, 1 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 0, 0 ] ); + v = nanmskrange( x.length, x, 1, mask, 1 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + t.end(); +}); + tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `NaN`', function test( t ) { var mask; var x; @@ -133,7 +191,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns `0`', fun tape( 'the function supports `stride` parameters', function test( t ) { var mask; - var N; var x; var v; @@ -166,8 +223,47 @@ tape( 'the function supports `stride` parameters', function test( t ) { 0 ]; - N = floor( x.length / 2 ); - v = nanmskrange( N, x, 2, mask, 2 ); + v = nanmskrange( 6, x, 2, mask, 2 ); + + t.strictEqual( v, 6.0, 'returns expected value' ); + t.end(); +}); + +tape( 'the function supports `stride` parameters (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = [ + 1.0, // 0 + 2.0, + 2.0, // 1 + -7.0, + -2.0, // 2 + 3.0, + 4.0, // 3 + 2.0, + 5.0, // 4 + 6.0, + NaN, // 5 + NaN + ]; + mask = [ + 0, // 0 + 0, + 0, // 1 + 0, + 0, // 2 + 0, + 0, // 3 + 0, + 1, // 4 + 1, + 0, // 5 + 0 + ]; + + v = nanmskrange( 6, toAccessorArray( x ), 2, toAccessorArray( mask ), 2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -175,7 +271,6 @@ tape( 'the function supports `stride` parameters', function test( t ) { tape( 'the function supports negative `stride` parameters', function test( t ) { var mask; - var N; var x; var v; @@ -208,8 +303,47 @@ tape( 'the function supports negative `stride` parameters', function test( t ) { 0 ]; - N = floor( x.length / 2 ); - v = nanmskrange( N, x, -2, mask, -2 ); + v = nanmskrange( 6, x, -2, mask, -2 ); + + t.strictEqual( v, 6.0, 'returns expected value' ); + t.end(); +}); + +tape( 'the function supports negative `stride` parameters (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = [ + NaN, // 5 + NaN, + 5.0, // 4 + 6.0, + 1.0, // 3 + 2.0, + 2.0, // 2 + -7.0, + -2.0, // 1 + 3.0, + 4.0, // 0 + 2.0 + ]; + mask = [ + 0, // 5 + 0, + 1, // 4 + 1, + 0, // 3 + 0, + 0, // 2 + 0, + 0, // 1 + 0, + 0, // 0 + 0 + ]; + + v = nanmskrange( 6, toAccessorArray( x ), -2, toAccessorArray( mask ), -2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -220,7 +354,6 @@ tape( 'the function supports view offsets', function test( t ) { var mask1; var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -256,9 +389,55 @@ tape( 'the function supports view offsets', function test( t ) { x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element mask1 = new Uint8Array( mask0.buffer, mask0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor( x1.length/2 ); - v = nanmskrange( N, x1, 2, mask1, 2 ); + v = nanmskrange( 6, x1, 2, mask1, 2 ); + t.strictEqual( v, 6.0, 'returns expected value' ); + + t.end(); +}); + +tape( 'the function supports view offsets (accessors)', function test( t ) { + var mask0; + var mask1; + var x0; + var x1; + var v; + + x0 = new Float64Array([ + 2.0, + 1.0, // 0 + 2.0, + -2.0, // 1 + -2.0, + 2.0, // 2 + 3.0, + 4.0, // 3 + 6.0, + 5.0, // 4 + 6.0, + NaN, // 5 + NaN + ]); + mask0 = new Uint8Array([ + 0, + 0, // 0 + 0, + 0, // 1 + 0, + 0, // 2 + 0, + 0, // 3 + 0, + 1, // 4 + 1, + 0, // 5 + 0 + ]); + + x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element + mask1 = new Uint8Array( mask0.buffer, mask0.BYTES_PER_ELEMENT*1 ); // start at 2nd element + + v = nanmskrange( 6, toAccessorArray( x1 ), 2, toAccessorArray( mask1 ), 2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.ndarray.js index 9825ef10efd8..8ff3229fd4e3 100644 --- a/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/nanmskrange/test/test.ndarray.js @@ -21,7 +21,7 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); +var toAccessorArray = require( '@stdlib/array/base/to-accessor-array' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); var nanmskrange = require( './../lib/ndarray.js' ); @@ -98,6 +98,64 @@ tape( 'the function calculates the range of a strided array according to a mask, t.end(); }); +tape( 'the function calculates the range of a strided array according to a mask, ignoring NaN values (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = toAccessorArray( [ 1.0, -2.0, -4.0, NaN, 5.0, 0.0, 3.0 ] ); + mask = toAccessorArray( [ 0, 0, 0, 1, 0, 0, 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( v, 9.0, 'returns expected value' ); + + x = toAccessorArray( [ -4.0, NaN, -5.0 ] ); + mask = toAccessorArray( [ 0, 1, 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( v, 1.0, 'returns expected value' ); + + x = toAccessorArray( [ -0.0, 0.0, NaN, -0.0 ] ); + mask = toAccessorArray( [ 0, 0, 1, 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isPositiveZero( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ -4.0, 0.0, NaN, 5.0 ] ); + mask = toAccessorArray( [ 0, 0, 0, 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( v, 9.0, 'returns expected value' ); + + x = toAccessorArray( [ NaN ] ); + mask = toAccessorArray( [ 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN ] ); + mask = toAccessorArray( [ 1 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 1, 1 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 1, 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 0, 1 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + x = toAccessorArray( [ NaN, NaN ] ); + mask = toAccessorArray( [ 0, 0 ] ); + v = nanmskrange( x.length, x, 1, 0, mask, 1, 0 ); + t.strictEqual( isnan( v ), true, 'returns expected value' ); + + t.end(); +}); + tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `NaN`', function test( t ) { var mask; var x; @@ -131,7 +189,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns `0`', fun tape( 'the function supports `stride` parameters', function test( t ) { var mask; - var N; var x; var v; @@ -164,8 +221,47 @@ tape( 'the function supports `stride` parameters', function test( t ) { 0 ]; - N = floor( x.length / 2 ); - v = nanmskrange( N, x, 2, 0, mask, 2, 0 ); + v = nanmskrange( 6, x, 2, 0, mask, 2, 0 ); + + t.strictEqual( v, 6.0, 'returns expected value' ); + t.end(); +}); + +tape( 'the function supports `stride` parameters (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = [ + 1.0, // 0 + 2.0, + 2.0, // 1 + -7.0, + -2.0, // 2 + 3.0, + 4.0, // 3 + 2.0, + 5.0, // 4 + 6.0, + NaN, // 5 + NaN + ]; + mask = [ + 0, // 0 + 0, + 0, // 1 + 0, + 0, // 2 + 0, + 0, // 3 + 0, + 1, // 4 + 1, + 0, // 5 + 0 + ]; + + v = nanmskrange( 6, toAccessorArray( x ), 2, 0, toAccessorArray( mask ), 2, 0 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -173,7 +269,6 @@ tape( 'the function supports `stride` parameters', function test( t ) { tape( 'the function supports negative `stride` parameters', function test( t ) { var mask; - var N; var x; var v; @@ -206,8 +301,47 @@ tape( 'the function supports negative `stride` parameters', function test( t ) { 0 ]; - N = floor( x.length / 2 ); - v = nanmskrange( N, x, -2, 10, mask, -2, 10 ); + v = nanmskrange( 6, x, -2, 10, mask, -2, 10 ); + + t.strictEqual( v, 6.0, 'returns expected value' ); + t.end(); +}); + +tape( 'the function supports negative `stride` parameters (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = [ + NaN, // 5 + NaN, + 5.0, // 4 + 6.0, + 1.0, // 3 + 2.0, + 2.0, // 2 + -7.0, + -2.0, // 1 + 3.0, + 4.0, // 0 + 2.0 + ]; + mask = [ + 0, // 5 + 0, + 1, // 4 + 1, + 0, // 3 + 0, + 0, // 2 + 0, + 0, // 1 + 0, + 0, // 0 + 0 + ]; + + v = nanmskrange( 6, toAccessorArray( x ), -2, 10, toAccessorArray( mask ), -2, 10 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -215,7 +349,6 @@ tape( 'the function supports negative `stride` parameters', function test( t ) { tape( 'the function supports `offset` parameters', function test( t ) { var mask; - var N; var x; var v; @@ -247,9 +380,48 @@ tape( 'the function supports `offset` parameters', function test( t ) { 0, 0 // 5 ]; - N = floor( x.length / 2 ); - v = nanmskrange( N, x, 2, 1, mask, 2, 1 ); + v = nanmskrange( 6, x, 2, 1, mask, 2, 1 ); + t.strictEqual( v, 6.0, 'returns expected value' ); + + t.end(); +}); + +tape( 'the function supports `offset` parameters (accessors)', function test( t ) { + var mask; + var x; + var v; + + x = [ + 2.0, + 1.0, // 0 + 2.0, + -2.0, // 1 + -2.0, + 2.0, // 2 + 3.0, + 4.0, // 3 + 5.0, + 6.0, // 4 + NaN, + NaN // 5 + ]; + mask = [ + 0, + 0, // 0 + 0, + 0, // 1 + 0, + 0, // 2 + 0, + 0, // 3 + 1, + 1, // 4 + 0, + 0 // 5 + ]; + + v = nanmskrange( 6, toAccessorArray( x ), 2, 1, toAccessorArray( mask ), 2, 1 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end();