Skip to content

Commit 47119e4

Browse files
feat: add support for accessor arrays and refactor stats/base/maxsorted
PR-URL: #5343 Co-authored-by: Athan Reines <[email protected]> Reviewed-by: Athan Reines <[email protected]>
1 parent 065f865 commit 47119e4

File tree

12 files changed

+414
-139
lines changed

12 files changed

+414
-139
lines changed

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

+15-28
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limitations under the License.
3636
var maxsorted = require( '@stdlib/stats/base/maxsorted' );
3737
```
3838

39-
#### maxsorted( N, x, stride )
39+
#### maxsorted( N, x, strideX )
4040

4141
Computes the maximum value of a sorted strided array `x`.
4242

@@ -58,17 +58,14 @@ The function has the following parameters:
5858

5959
- **N**: number of indexed elements.
6060
- **x**: sorted input [`Array`][mdn-array] or [`typed array`][mdn-typed-array].
61-
- **stride**: index increment for `x`.
61+
- **strideX**: stride length for `x`.
6262

63-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the maximum value of every other element in `x`,
63+
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`,
6464

6565
```javascript
66-
var floor = require( '@stdlib/math/base/special/floor' );
67-
6866
var x = [ 1.0, 2.0, 2.0, -7.0, 3.0, 3.0, 4.0, 2.0 ];
69-
var N = floor( x.length / 2 );
7067

71-
var v = maxsorted( N, x, 2 );
68+
var v = maxsorted( 4, x, 2 );
7269
// returns 4.0
7370
```
7471

@@ -78,42 +75,35 @@ Note that indexing is relative to the first index. To introduce an offset, use [
7875

7976
```javascript
8077
var Float64Array = require( '@stdlib/array/float64' );
81-
var floor = require( '@stdlib/math/base/special/floor' );
8278

8379
var x0 = new Float64Array( [ 2.0, 1.0, 2.0, 2.0, -2.0, 2.0, 3.0, 4.0 ] );
8480
var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
8581

86-
var N = floor( x0.length / 2 );
87-
88-
var v = maxsorted( N, x1, 2 );
82+
var v = maxsorted( 4, x1, 2 );
8983
// returns 4.0
9084
```
9185

92-
#### maxsorted.ndarray( N, x, stride, offset )
86+
#### maxsorted.ndarray( N, x, strideX, offsetX )
9387

9488
Computes the maximum value of a sorted strided array using alternative indexing semantics.
9589

9690
```javascript
9791
var x = [ 1.0, 2.0, 3.0 ];
98-
var N = x.length;
9992

100-
var v = maxsorted.ndarray( N, x, 1, 0 );
93+
var v = maxsorted.ndarray( x.length, x, 1, 0 );
10194
// returns 3.0
10295
```
10396

10497
The function has the following additional parameters:
10598

106-
- **offset**: starting index for `x`.
99+
- **offsetX**: starting index for `x`.
107100

108-
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
101+
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
109102

110103
```javascript
111-
var floor = require( '@stdlib/math/base/special/floor' );
112-
113104
var x = [ 2.0, 1.0, 2.0, 2.0, -2.0, 2.0, 3.0, 4.0 ];
114-
var N = floor( x.length / 2 );
115105

116-
var v = maxsorted.ndarray( N, x, 2, 1 );
106+
var v = maxsorted.ndarray( 4, x, 2, 1 );
117107
// returns 4.0
118108
```
119109

@@ -127,6 +117,7 @@ var v = maxsorted.ndarray( N, x, 2, 1 );
127117

128118
- If `N <= 0`, both functions return `NaN`.
129119
- The input strided array must be sorted in either **strictly** ascending or descending order.
120+
- 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]).
130121

131122
</section>
132123

@@ -139,16 +130,10 @@ var v = maxsorted.ndarray( N, x, 2, 1 );
139130
<!-- eslint no-undef: "error" -->
140131

141132
```javascript
142-
var Float64Array = require( '@stdlib/array/float64' );
133+
var linspace = require( '@stdlib/array/base/linspace' );
143134
var maxsorted = require( '@stdlib/stats/base/maxsorted' );
144135

145-
var x;
146-
var i;
147-
148-
x = new Float64Array( 10 );
149-
for ( i = 0; i < x.length; i++ ) {
150-
x[ i ] = i - 5.0;
151-
}
136+
var x = linspace( -50.0, 50.0, 10 );
152137
console.log( x );
153138

154139
var v = maxsorted( x.length, x, 1 );
@@ -184,6 +169,8 @@ console.log( v );
184169

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

172+
[@stdlib/array/base/accessor]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/array/base/accessor
173+
187174
<!-- <related-links> -->
188175

189176
[@stdlib/stats/strided/dmaxsorted]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/stats/strided/dmaxsorted

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
var bench = require( '@stdlib/bench' );
2424
var isnan = require( '@stdlib/math/base/assert/is-nan' );
25+
var linspace = require( '@stdlib/array/base/linspace' );
2526
var pow = require( '@stdlib/math/base/special/pow' );
2627
var pkg = require( './../package.json' ).name;
2728
var maxsorted = require( './../lib/maxsorted.js' );
@@ -37,13 +38,7 @@ var maxsorted = require( './../lib/maxsorted.js' );
3738
* @returns {Function} benchmark function
3839
*/
3940
function createBenchmark( len ) {
40-
var x;
41-
var i;
42-
43-
x = [];
44-
for ( i = 0; i < len; i++ ) {
45-
x.push( i );
46-
}
41+
var x = linspace( 0.0, len, len );
4742
return benchmark;
4843

4944
function benchmark( b ) {

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2524
var pow = require( '@stdlib/math/base/special/pow' );
25+
var linspace = require( '@stdlib/array/base/linspace' );
26+
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2627
var pkg = require( './../package.json' ).name;
2728
var maxsorted = require( './../lib/ndarray.js' );
2829

@@ -37,13 +38,7 @@ var maxsorted = require( './../lib/ndarray.js' );
3738
* @returns {Function} benchmark function
3839
*/
3940
function createBenchmark( len ) {
40-
var x;
41-
var i;
42-
43-
x = [];
44-
for ( i = 0; i < len; i++ ) {
45-
x.push( i );
46-
}
41+
var x = linspace( 0.0, len, len );
4742
return benchmark;
4843

4944
function benchmark( b ) {

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

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

2-
{{alias}}( N, x, stride )
2+
{{alias}}( N, x, strideX )
33
Computes the maximum value of a sorted strided array.
44

55
The input strided array must be sorted in either strictly ascending or
66
descending order.
77

8-
The `N` and `stride` parameters determine which elements in `x` are accessed
9-
at runtime.
8+
The `N` and stride parameters determine which elements in the strided array
9+
are accessed at runtime.
1010

1111
Indexing is relative to the first index. To introduce an offset, use a typed
1212
array view.
@@ -21,8 +21,8 @@
2121
x: Array<number>|TypedArray
2222
Sorted input array.
2323

24-
stride: integer
25-
Index increment.
24+
strideX: integer
25+
Stride length.
2626

2727
Returns
2828
-------
@@ -36,22 +36,19 @@
3636
> {{alias}}( x.length, x, 1 )
3737
3.0
3838

39-
// Using `N` and `stride` parameters:
39+
// Using `N` and stride parameters:
4040
> x = [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ];
41-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
42-
> var stride = 2;
43-
> {{alias}}( N, x, stride )
41+
> {{alias}}( 3, x, 2 )
4442
2.0
4543

4644
// Using view offsets:
4745
> var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, 3.0 ] );
4846
> var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
49-
> N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 );
50-
> stride = 2;
51-
> {{alias}}( N, x1, stride )
47+
> {{alias}}( 3, x1, 2 )
5248
3.0
5349

54-
{{alias}}.ndarray( N, x, stride, offset )
50+
51+
{{alias}}.ndarray( N, x, strideX, offsetX )
5552
Computes the maximum value of a sorted strided array using alternative
5653
indexing semantics.
5754

@@ -67,10 +64,10 @@
6764
x: Array<number>|TypedArray
6865
Sorted input array.
6966

70-
stride: integer
71-
Index increment.
67+
strideX: integer
68+
Stride length.
7269

73-
offset: integer
70+
offsetX: integer
7471
Starting index.
7572

7673
Returns
@@ -87,8 +84,7 @@
8784

8885
// Using offset parameter:
8986
> var x = [ 1.0, -2.0, 3.0, 2.0, 5.0, 3.0 ];
90-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
91-
> {{alias}}.ndarray( N, x, 2, 1 )
87+
> {{alias}}.ndarray( 3, x, 2, 1 )
9288
3.0
9389

9490
See Also

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

+12-7
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 `maxsorted`.
@@ -31,7 +36,7 @@ interface Routine {
3136
*
3237
* @param N - number of indexed elements
3338
* @param x - sorted input array
34-
* @param stride - stride length
39+
* @param strideX - stride length
3540
* @returns maximum value
3641
*
3742
* @example
@@ -40,15 +45,15 @@ interface Routine {
4045
* var v = maxsorted( x.length, x, 1 );
4146
* // returns 3.0
4247
*/
43-
( N: number, x: NumericArray, stride: number ): number;
48+
( N: number, x: InputArray, strideX: number ): number;
4449

4550
/**
4651
* Computes the maximum value of a sorted strided array using alternative indexing semantics.
4752
*
4853
* @param N - number of indexed elements
4954
* @param x - sorted input array
50-
* @param stride - stride length
51-
* @param offset - starting index
55+
* @param strideX - stride length
56+
* @param offsetX - starting index
5257
* @returns maximum value
5358
*
5459
* @example
@@ -57,15 +62,15 @@ interface Routine {
5762
* var v = maxsorted.ndarray( x.length, x, 1, 0 );
5863
* // returns 3.0
5964
*/
60-
ndarray( N: number, x: NumericArray, stride: number, offset: number ): number;
65+
ndarray( N: number, x: InputArray, strideX: number, offsetX: number ): number;
6166
}
6267

6368
/**
6469
* Computes the maximum value of a sorted strided array.
6570
*
6671
* @param N - number of indexed elements
6772
* @param x - sorted input array
68-
* @param stride - stride length
73+
* @param strideX - stride length
6974
* @returns maximum value
7075
*
7176
* @example

lib/node_modules/@stdlib/stats/base/maxsorted/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 maxsorted = require( './index' );
2021

2122

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

2829
maxsorted( x.length, x, 1 ); // $ExpectType number
30+
maxsorted( 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...
@@ -86,6 +88,7 @@ import maxsorted = require( './index' );
8688
const x = new Float64Array( 10 );
8789

8890
maxsorted.ndarray( x.length, x, 1, 0 ); // $ExpectType number
91+
maxsorted.ndarray( x.length, new AccessorArray( x ), 1, 0 ); // $ExpectType number
8992
}
9093

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

lib/node_modules/@stdlib/stats/base/maxsorted/examples/index.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@
1818

1919
'use strict';
2020

21-
var Float64Array = require( '@stdlib/array/float64' );
21+
var linspace = require( '@stdlib/array/base/linspace' );
2222
var maxsorted = require( './../lib' );
2323

24-
var x;
25-
var i;
26-
27-
x = new Float64Array( 10 );
28-
for ( i = 0; i < x.length; i++ ) {
29-
x[ i ] = i - 5.0;
30-
}
24+
var x = linspace( -50.0, 50.0, 10 );
3125
console.log( x );
3226

3327
var v = maxsorted( x.length, x, 1 );

0 commit comments

Comments
 (0)