Skip to content

Commit c36f0e7

Browse files
authored
refactor: update blas/ext/base/gsumors to follow current project conventions
PR-URL: #4679 Reviewed-by: Philipp Burckhardt <pburckhardt@outlook.com>
1 parent dbade8e commit c36f0e7

File tree

11 files changed

+88
-172
lines changed

11 files changed

+88
-172
lines changed

lib/node_modules/@stdlib/blas/ext/base/gsumors/README.md

+15-32
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,29 @@ limitations under the License.
3636
var gsumors = require( '@stdlib/blas/ext/base/gsumors' );
3737
```
3838

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

4141
Computes the sum of strided array elements using ordinary recursive summation.
4242

4343
```javascript
4444
var x = [ 1.0, -2.0, 2.0 ];
45-
var N = x.length;
4645

47-
var v = gsumors( N, x, 1 );
46+
var v = gsumors( x.length, x, 1 );
4847
// returns 1.0
4948
```
5049

5150
The function has the following parameters:
5251

5352
- **N**: number of indexed elements.
5453
- **x**: input [`Array`][mdn-array] or [`typed array`][mdn-typed-array].
55-
- **stride**: index increment for `x`.
54+
- **strideX**: stride length.
5655

57-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the sum of every other element in `x`,
56+
The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the sum of every other element:
5857

5958
```javascript
60-
var floor = require( '@stdlib/math/base/special/floor' );
61-
6259
var x = [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ];
63-
var N = floor( x.length / 2 );
6460

65-
var v = gsumors( N, x, 2 );
61+
var v = gsumors( 4, x, 2 );
6662
// returns 5.0
6763
```
6864

@@ -72,42 +68,35 @@ Note that indexing is relative to the first index. To introduce an offset, use [
7268

7369
```javascript
7470
var Float64Array = require( '@stdlib/array/float64' );
75-
var floor = require( '@stdlib/math/base/special/floor' );
7671

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

80-
var N = floor( x0.length / 2 );
81-
82-
var v = gsumors( N, x1, 2 );
75+
var v = gsumors( 4, x1, 2 );
8376
// returns 5.0
8477
```
8578

86-
#### gsumors.ndarray( N, x, stride, offset )
79+
#### gsumors.ndarray( N, x, strideX, offsetX )
8780

8881
Computes the sum of strided array elements using ordinary recursive summation and alternative indexing semantics.
8982

9083
```javascript
9184
var x = [ 1.0, -2.0, 2.0 ];
92-
var N = x.length;
9385

94-
var v = gsumors.ndarray( N, x, 1, 0 );
86+
var v = gsumors.ndarray( x.length, x, 1, 0 );
9587
// returns 1.0
9688
```
9789

9890
The function has the following additional parameters:
9991

100-
- **offset**: starting index for `x`.
92+
- **offsetX**: starting index.
10193

102-
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 sum of every other value in `x` starting from the second value
94+
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 sum of every other element starting from the second element:
10395

10496
```javascript
105-
var floor = require( '@stdlib/math/base/special/floor' );
106-
10797
var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ];
108-
var N = floor( x.length / 2 );
10998

110-
var v = gsumors.ndarray( N, x, 2, 1 );
99+
var v = gsumors.ndarray( 4, x, 2, 1 );
111100
// returns 5.0
112101
```
113102

@@ -134,18 +123,12 @@ var v = gsumors.ndarray( N, x, 2, 1 );
134123
<!-- eslint no-undef: "error" -->
135124

136125
```javascript
137-
var randu = require( '@stdlib/random/base/randu' );
138-
var round = require( '@stdlib/math/base/special/round' );
139-
var Float64Array = require( '@stdlib/array/float64' );
126+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
140127
var gsumors = require( '@stdlib/blas/ext/base/gsumors' );
141128

142-
var x;
143-
var i;
144-
145-
x = new Float64Array( 10 );
146-
for ( i = 0; i < x.length; i++ ) {
147-
x[ i ] = round( randu()*100.0 );
148-
}
129+
var x = discreteUniform( 10, -100, 100, {
130+
'dtype': 'float64'
131+
});
149132
console.log( x );
150133

151134
var v = gsumors( x.length, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.js

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

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/array/uniform' );
2525
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2626
var pow = require( '@stdlib/math/base/special/pow' );
2727
var pkg = require( './../package.json' ).name;
2828
var gsumors = require( './../lib/main.js' );
2929

3030

31+
// VARIABLES //
32+
33+
var options = {
34+
'dtype': 'generic'
35+
};
36+
37+
3138
// FUNCTIONS //
3239

3340
/**
@@ -38,13 +45,7 @@ var gsumors = require( './../lib/main.js' );
3845
* @returns {Function} benchmark function
3946
*/
4047
function createBenchmark( len ) {
41-
var x;
42-
var i;
43-
44-
x = [];
45-
for ( i = 0; i < len; i++ ) {
46-
x.push( ( randu()*10.0 ) - 20.0 );
47-
}
48+
var x = uniform( len, -100, 100, options );
4849
return benchmark;
4950

5051
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.ndarray.js

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

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/array/uniform' );
2525
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2626
var pow = require( '@stdlib/math/base/special/pow' );
2727
var pkg = require( './../package.json' ).name;
2828
var gsumors = require( './../lib/ndarray.js' );
2929

3030

31+
// VARIABLES //
32+
33+
var options = {
34+
'dtype': 'generic'
35+
};
36+
37+
3138
// FUNCTIONS //
3239

3340
/**
@@ -38,13 +45,7 @@ var gsumors = require( './../lib/ndarray.js' );
3845
* @returns {Function} benchmark function
3946
*/
4047
function createBenchmark( len ) {
41-
var x;
42-
var i;
43-
44-
x = [];
45-
for ( i = 0; i < len; i++ ) {
46-
x.push( ( randu()*10.0 ) - 20.0 );
47-
}
48+
var x = uniform( len, -100, 100, options );
4849
return benchmark;
4950

5051
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/repl.txt

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

2-
{{alias}}( N, x, stride )
2+
{{alias}}( N, x, strideX )
33
Computes the sum of strided array elements using ordinary recursive
44
summation.
55

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

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

22-
stride: integer
23-
Index increment.
22+
strideX: integer
23+
Stride length.
2424

2525
Returns
2626
-------
@@ -34,27 +34,24 @@
3434
> {{alias}}( x.length, x, 1 )
3535
1.0
3636

37-
// Using `N` and `stride` parameters:
37+
// Using `N` and stride parameters:
3838
> x = [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ];
39-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
40-
> var stride = 2;
41-
> {{alias}}( N, x, stride )
39+
> {{alias}}( 3, x, 2 )
4240
1.0
4341

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

52-
{{alias}}.ndarray( N, x, stride, offset )
48+
49+
{{alias}}.ndarray( N, x, strideX, offsetX )
5350
Computes the sum of strided array elements using ordinary recursive
5451
summation and alternative indexing semantics.
5552

5653
While typed array views mandate a view offset based on the underlying
57-
buffer, the `offset` parameter supports indexing semantics based on a
54+
buffer, the offset parameter supports indexing semantics based on a
5855
starting index.
5956

6057
Parameters
@@ -65,10 +62,10 @@
6562
x: Array<number>|TypedArray
6663
Input array.
6764

68-
stride: integer
69-
Index increment.
65+
strideX: integer
66+
Stride length.
7067

71-
offset: integer
68+
offsetX: integer
7269
Starting index.
7370

7471
Returns
@@ -85,8 +82,7 @@
8582

8683
// Using offset parameter:
8784
> var x = [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ];
88-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
89-
> {{alias}}.ndarray( N, x, 2, 1 )
85+
> {{alias}}.ndarray( 3, x, 2, 1 )
9086
-1.0
9187

9288
See Also

lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/types/index.d.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface Routine {
3131
*
3232
* @param N - number of indexed elements
3333
* @param x - input array
34-
* @param stride - stride length
34+
* @param strideX - stride length
3535
* @returns sum
3636
*
3737
* @example
@@ -40,15 +40,15 @@ interface Routine {
4040
* var v = gsumors( x.length, x, 1 );
4141
* // returns 1.0
4242
*/
43-
( N: number, x: NumericArray, stride: number ): number;
43+
( N: number, x: NumericArray, strideX: number ): number;
4444

4545
/**
4646
* Computes the sum of strided array elements using ordinary recursive summation and alternative indexing semantics.
4747
*
4848
* @param N - number of indexed elements
4949
* @param x - input array
50-
* @param stride - stride length
51-
* @param offset - starting index
50+
* @param strideX - stride length
51+
* @param offsetX - starting index
5252
* @returns sum
5353
*
5454
* @example
@@ -57,15 +57,15 @@ interface Routine {
5757
* var v = gsumors.ndarray( x.length, x, 1, 0 );
5858
* // returns 1.0
5959
*/
60-
ndarray( N: number, x: NumericArray, stride: number, offset: number ): number;
60+
ndarray( N: number, x: NumericArray, strideX: number, offsetX: number ): number;
6161
}
6262

6363
/**
6464
* Computes the sum of strided array elements using ordinary recursion summation.
6565
*
6666
* @param N - number of indexed elements
6767
* @param x - input array
68-
* @param stride - stride length
68+
* @param strideX - stride length
6969
* @returns sum
7070
*
7171
* @example

lib/node_modules/@stdlib/blas/ext/base/gsumors/examples/index.js

+5-11
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,12 @@
1818

1919
'use strict';
2020

21-
var randu = require( '@stdlib/random/base/randu' );
22-
var round = require( '@stdlib/math/base/special/round' );
23-
var Float64Array = require( '@stdlib/array/float64' );
24-
var gsumors = require( './../lib' );
21+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
22+
var gsumors = require( '@stdlib/blas/ext/base/gsumors' );
2523

26-
var x;
27-
var i;
28-
29-
x = new Float64Array( 10 );
30-
for ( i = 0; i < x.length; i++ ) {
31-
x[ i ] = round( randu()*100.0 );
32-
}
24+
var x = discreteUniform( 10, -100, 100, {
25+
'dtype': 'float64'
26+
});
3327
console.log( x );
3428

3529
var v = gsumors( x.length, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/index.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,16 @@
2727
* var gsumors = require( '@stdlib/blas/ext/base/gsumors' );
2828
*
2929
* var x = [ 1.0, -2.0, 2.0 ];
30-
* var N = x.length;
3130
*
32-
* var v = gsumors( N, x, 1 );
31+
* var v = gsumors( x.length, x, 1 );
3332
* // returns 1.0
3433
*
3534
* @example
36-
* var floor = require( '@stdlib/math/base/special/floor' );
3735
* var gsumors = require( '@stdlib/blas/ext/base/gsumors' );
3836
*
3937
* var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ];
40-
* var N = floor( x.length / 2 );
4138
*
42-
* var v = gsumors.ndarray( N, x, 2, 1 );
39+
* var v = gsumors.ndarray( 4, x, 2, 1 );
4340
* // returns 5.0
4441
*/
4542

0 commit comments

Comments
 (0)