Skip to content

Commit d9faaa4

Browse files
prajjwalbajpaikgryteAayush Khanna
authored
feat: refactor and add accessor protocol support to stats/base/nanrange
PR-URL: #6248 Closes: #5665 Co-authored-by: Athan Reines <[email protected]> Co-authored-by: Aayush Khanna <[email protected]> Reviewed-by: Athan Reines <[email protected]> Reviewed-by: Aayush Khanna <[email protected]> Signed-off-by: Athan Reines <[email protected]>
1 parent 2e5d1fc commit d9faaa4

File tree

13 files changed

+376
-152
lines changed

13 files changed

+376
-152
lines changed

lib/node_modules/@stdlib/stats/base/nanrange/README.md

+23-32
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ The [**range**][range] is defined as the difference between the maximum and mini
3838
var nanrange = require( '@stdlib/stats/base/nanrange' );
3939
```
4040

41-
#### nanrange( N, x, stride )
41+
#### nanrange( N, x, strideX )
4242

43-
Computes the [range][range] of a strided array `x`, ignoring `NaN` values.
43+
Computes the [range][range] of a strided array, ignoring `NaN` values.
4444

4545
```javascript
4646
var x = [ 1.0, -2.0, NaN, 2.0 ];
@@ -54,38 +54,32 @@ The function has the following parameters:
5454

5555
- **N**: number of indexed elements.
5656
- **x**: input [`Array`][mdn-array] or [`typed array`][mdn-typed-array].
57-
- **stride**: index increment for `x`.
57+
- **strideX**: stride length for `x`.
5858

59-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the [range][range] of every other element in `x`,
59+
The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the [range][range] of every other element in `x`,
6060

6161
```javascript
62-
var floor = require( '@stdlib/math/base/special/floor' );
63-
6462
var x = [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0, NaN, NaN ];
65-
var N = floor( x.length / 2 );
6663

67-
var v = nanrange( N, x, 2 );
64+
var v = nanrange( 5, x, 2 );
6865
// returns 6.0
6966
```
7067

7168
Note that indexing is relative to the first index. To introduce an offset, use [`typed array`][mdn-typed-array] views.
7269

73-
<!-- eslint-disable stdlib/capitalized-comments -->
70+
<!-- eslint-disable stdlib/capitalized-comments, max-len -->
7471

7572
```javascript
7673
var Float64Array = require( '@stdlib/array/float64' );
77-
var floor = require( '@stdlib/math/base/special/floor' );
7874

7975
var x0 = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, NaN, NaN, 4.0 ] );
8076
var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
8177

82-
var N = floor( x0.length / 2 );
83-
84-
var v = nanrange( N, x1, 2 );
78+
var v = nanrange( 4, x1, 2 );
8579
// returns 6.0
8680
```
8781

88-
#### nanrange.ndarray( N, x, stride, offset )
82+
#### nanrange.ndarray( N, x, strideX, offsetX )
8983

9084
Computes the [range][range] of a strided array, ignoring `NaN` values and using alternative indexing semantics.
9185

@@ -99,17 +93,14 @@ var v = nanrange.ndarray( N, x, 1, 0 );
9993

10094
The function has the following additional parameters:
10195

102-
- **offset**: starting index for `x`.
96+
- **offsetX**: starting index for `x`.
10397

104-
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
98+
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 element in the strided array starting from the second element
10599

106100
```javascript
107-
var floor = require( '@stdlib/math/base/special/floor' );
108-
109101
var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, NaN, NaN, 2.0, 3.0, 4.0 ];
110-
var N = floor( x.length / 2 );
111102

112-
var v = nanrange.ndarray( N, x, 2, 1 );
103+
var v = nanrange.ndarray( 5, x, 2, 1 );
113104
// returns 6.0
114105
```
115106

@@ -122,6 +113,7 @@ var v = nanrange.ndarray( N, x, 2, 1 );
122113
## Notes
123114

124115
- If `N <= 0`, both functions return `NaN`.
116+
- 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]).
125117
- Depending on the environment, the typed versions ([`dnanrange`][@stdlib/stats/base/dnanrange], [`snanrange`][@stdlib/stats/base/snanrange], etc.) are likely to be significantly more performant.
126118

127119
</section>
@@ -135,22 +127,19 @@ var v = nanrange.ndarray( N, x, 2, 1 );
135127
<!-- eslint no-undef: "error" -->
136128

137129
```javascript
138-
var randu = require( '@stdlib/random/base/randu' );
139-
var round = require( '@stdlib/math/base/special/round' );
140-
var Float64Array = require( '@stdlib/array/float64' );
130+
var uniform = require( '@stdlib/random/base/uniform' );
131+
var filledarrayBy = require( '@stdlib/array/filled-by' );
132+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
141133
var nanrange = require( '@stdlib/stats/base/nanrange' );
142134

143-
var x;
144-
var i;
145-
146-
x = new Float64Array( 10 );
147-
for ( i = 0; i < x.length; i++ ) {
148-
if ( randu() < 0.2 ) {
149-
x[ i ] = NaN;
150-
} else {
151-
x[ i ] = round( (randu()*100.0) - 50.0 );
135+
function rand() {
136+
if ( bernoulli( 0.8 ) < 1 ) {
137+
return NaN;
152138
}
139+
return uniform( -50.0, 50.0 );
153140
}
141+
142+
var x = filledarrayBy( 10, 'float64', rand );
154143
console.log( x );
155144

156145
var v = nanrange( x.length, x, 1 );
@@ -189,6 +178,8 @@ console.log( v );
189178

190179
[mdn-typed-array]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray
191180

181+
[@stdlib/array/base/accessor]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/array/base/accessor
182+
192183
<!-- <related-links> -->
193184

194185
[@stdlib/stats/base/dnanrange]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/stats/base/dnanrange

lib/node_modules/@stdlib/stats/base/nanrange/benchmark/benchmark.js

+18-13
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,30 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/base/uniform' );
25+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pow = require( '@stdlib/math/base/special/pow' );
2729
var pkg = require( './../package.json' ).name;
28-
var nanrange = require( './../lib/nanrange.js' );
30+
var nanrange = require( './../lib/main.js' );
2931

3032

3133
// FUNCTIONS //
3234

35+
/**
36+
* Returns a random value or `NaN`.
37+
*
38+
* @private
39+
* @returns {number} random number or `NaN`
40+
*/
41+
function rand() {
42+
if ( bernoulli( 0.8 ) < 1 ) {
43+
return NaN;
44+
}
45+
return uniform( -10.0, 10.0 );
46+
}
47+
3348
/**
3449
* Creates a benchmark function.
3550
*
@@ -38,17 +53,7 @@ var nanrange = require( './../lib/nanrange.js' );
3853
* @returns {Function} benchmark function
3954
*/
4055
function createBenchmark( len ) {
41-
var x;
42-
var i;
43-
44-
x = [];
45-
for ( i = 0; i < len; i++ ) {
46-
if ( randu() < 0.2 ) {
47-
x.push( NaN );
48-
} else {
49-
x.push( ( randu()*20.0 ) - 10.0 );
50-
}
51-
}
56+
var x = filledarrayBy( len, 'float64', rand );
5257
return benchmark;
5358

5459
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/nanrange/benchmark/benchmark.ndarray.js

+17-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/base/uniform' );
25+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pow = require( '@stdlib/math/base/special/pow' );
2729
var pkg = require( './../package.json' ).name;
@@ -30,6 +32,19 @@ var nanrange = require( './../lib/ndarray.js' );
3032

3133
// FUNCTIONS //
3234

35+
/**
36+
* Returns a random value or `NaN`.
37+
*
38+
* @private
39+
* @returns {number} random number or `NaN`
40+
*/
41+
function rand() {
42+
if ( bernoulli( 0.8 ) < 1 ) {
43+
return NaN;
44+
}
45+
return uniform( -10.0, 10.0 );
46+
}
47+
3348
/**
3449
* Creates a benchmark function.
3550
*
@@ -38,17 +53,7 @@ var nanrange = require( './../lib/ndarray.js' );
3853
* @returns {Function} benchmark function
3954
*/
4055
function createBenchmark( len ) {
41-
var x;
42-
var i;
43-
44-
x = [];
45-
for ( i = 0; i < len; i++ ) {
46-
if ( randu() < 0.2 ) {
47-
x.push( NaN );
48-
} else {
49-
x.push( ( randu()*20.0 ) - 10.0 );
50-
}
51-
}
56+
var x = filledarrayBy( len, 'float64', rand );
5257
return benchmark;
5358

5459
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/nanrange/docs/repl.txt

+13-17
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
{{alias}}( N, x, stride )
2+
{{alias}}( N, x, strideX )
33
Computes the range of a strided array, ignoring `NaN` values.
44

5-
The `N` and `stride` parameters determine which elements in `x` are accessed
6-
at runtime.
5+
The `N` and stride parameters determine which elements in the strided array
6+
are accessed at runtime.
77

88
Indexing is relative to the first index. To introduce an offset, use a typed
99
array view.
@@ -18,8 +18,8 @@
1818
x: Array<number>|TypedArray
1919
Input array.
2020

21-
stride: integer
22-
Index increment.
21+
strideX: integer
22+
Stride length.
2323

2424
Returns
2525
-------
@@ -35,20 +35,17 @@
3535

3636
// Using `N` and `stride` parameters:
3737
> x = [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ];
38-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
39-
> var stride = 2;
40-
> {{alias}}( N, x, stride )
38+
> {{alias}}( 4, x, 2 )
4139
4.0
4240

4341
// Using view offsets:
4442
> var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] );
4543
> var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
46-
> N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 );
47-
> stride = 2;
48-
> {{alias}}( N, x1, stride )
44+
> {{alias}}( 4, x1, 2 )
4945
4.0
5046

51-
{{alias}}.ndarray( N, x, stride, offset )
47+
48+
{{alias}}.ndarray( N, x, strideX, offsetX )
5249
Computes the range of a strided array, ignoring `NaN` values and using
5350
alternative indexing semantics.
5451

@@ -64,10 +61,10 @@
6461
x: Array<number>|TypedArray
6562
Input array.
6663

67-
stride: integer
68-
Index increment.
64+
strideX: integer
65+
Stride length.
6966

70-
offset: integer
67+
offsetX: integer
7168
Starting index.
7269

7370
Returns
@@ -84,8 +81,7 @@
8481

8582
// Using offset parameter:
8683
> var x = [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ];
87-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
88-
> {{alias}}.ndarray( N, x, 2, 1 )
84+
> {{alias}}.ndarray( 4, x, 2, 1 )
8985
4.0
9086

9187
See Also

lib/node_modules/@stdlib/stats/base/nanrange/docs/types/index.d.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020

2121
/// <reference types="@stdlib/types"/>
2222

23-
import { NumericArray } from '@stdlib/types/array';
23+
import { NumericArray, Collection, AccessorArrayLike } from '@stdlib/types/array';
24+
25+
/**
26+
* Input array.
27+
*/
28+
type InputArray = NumericArray | Collection<number> | AccessorArrayLike<number>;
2429

2530
/**
2631
* Interface describing `nanrange`.
@@ -31,7 +36,7 @@ interface Routine {
3136
*
3237
* @param N - number of indexed elements
3338
* @param x - input array
34-
* @param stride - stride length
39+
* @param strideX - stride length
3540
* @returns range
3641
*
3742
* @example
@@ -40,14 +45,14 @@ interface Routine {
4045
* var v = nanrange( x.length, x, 1 );
4146
* // returns 4.0
4247
*/
43-
( N: number, x: NumericArray, stride: number ): number;
48+
( N: number, x: InputArray, strideX: number ): number;
4449

4550
/**
4651
* Computes the range of a strided array, ignoring `NaN` values and using alternative indexing semantics.
4752
*
4853
* @param N - number of indexed elements
4954
* @param x - input array
50-
* @param stride - stride length
55+
* @param strideX - stride length
5156
* @param offset - starting index
5257
* @returns range
5358
*
@@ -57,15 +62,15 @@ interface Routine {
5762
* var v = nanrange.ndarray( x.length, x, 1, 0 );
5863
* // returns 4.0
5964
*/
60-
ndarray( N: number, x: NumericArray, stride: number, offset: number ): number;
65+
ndarray( N: number, x: InputArray, strideX: number, offset: number ): number;
6166
}
6267

6368
/**
6469
* Computes the range of a strided array, ignoring `NaN` values.
6570
*
6671
* @param N - number of indexed elements
6772
* @param x - input array
68-
* @param stride - stride length
73+
* @param strideX - stride length
6974
* @returns range
7075
*
7176
* @example

lib/node_modules/@stdlib/stats/base/nanrange/docs/types/test.ts

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
import AccessorArray = require( '@stdlib/array/base/accessor' );
1920
import nanrange = require( './index' );
2021

2122

@@ -26,6 +27,7 @@ import nanrange = require( './index' );
2627
const x = new Float64Array( 10 );
2728

2829
nanrange( x.length, x, 1 ); // $ExpectType number
30+
nanrange( x.length, new AccessorArray( x ), 1 ); // $ExpectType number
2931
}
3032

3133
// The compiler throws an error if the function is provided a first argument which is not a number...
@@ -85,6 +87,7 @@ import nanrange = require( './index' );
8587
const x = new Float64Array( 10 );
8688

8789
nanrange.ndarray( x.length, x, 1, 0 ); // $ExpectType number
90+
nanrange.ndarray( x.length, new AccessorArray( x ), 1, 0 ); // $ExpectType number
8891
}
8992

9093
// The compiler throws an error if the `ndarray` method is provided a first argument which is not a number...

0 commit comments

Comments
 (0)