Skip to content

Commit e7febbb

Browse files
authored
refactor: update blas/ext/base/gnansumkbn to follow current project conventions
PR-URL: #4632 Reviewed-by: Athan Reines <kgryte@gmail.com>
1 parent a13b924 commit e7febbb

File tree

11 files changed

+137
-181
lines changed

11 files changed

+137
-181
lines changed

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

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

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

4141
Computes the sum of strided array elements, ignoring `NaN` values and using an improved Kahan–Babuška algorithm.
4242

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

47-
var v = gnansumkbn( N, x, 1 );
46+
var v = gnansumkbn( 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 for `x`.
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, NaN, NaN ];
63-
var N = floor( x.length / 2 );
6460

65-
var v = gnansumkbn( N, x, 2 );
61+
var v = gnansumkbn( 5, 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 = gnansumkbn( N, x1, 2 );
75+
var v = gnansumkbn( 4, x1, 2 );
8376
// returns 5.0
8477
```
8578

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

8881
Computes the sum of strided array elements, ignoring `NaN` values and using an improved Kahan–Babuška algorithm and alternative indexing semantics.
8982

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

94-
var v = gnansumkbn.ndarray( N, x, 1, 0 );
86+
var v = gnansumkbn.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 for `x`.
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, NaN, NaN ];
108-
var N = floor( x.length / 2 );
10998

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

@@ -133,22 +122,19 @@ var v = gnansumkbn.ndarray( N, x, 2, 1 );
133122
<!-- eslint no-undef: "error" -->
134123

135124
```javascript
136-
var randu = require( '@stdlib/random/base/randu' );
137-
var round = require( '@stdlib/math/base/special/round' );
138-
var Float64Array = require( '@stdlib/array/float64' );
125+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' );
126+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
127+
var filledarrayBy = require( '@stdlib/array/filled-by' );
139128
var gnansumkbn = require( '@stdlib/blas/ext/base/gnansumkbn' );
140129

141-
var x;
142-
var i;
143-
144-
x = new Float64Array( 10 );
145-
for ( i = 0; i < x.length; i++ ) {
146-
if ( randu() < 0.2 ) {
147-
x[ i ] = NaN;
148-
} else {
149-
x[ i ] = round( randu()*100.0 );
130+
function rand() {
131+
if ( bernoulli( 0.7 ) > 0 ) {
132+
return discreteUniform( 0, 100 );
150133
}
134+
return NaN;
151135
}
136+
137+
var x = filledarrayBy( 10, 'float64', rand );
152138
console.log( x );
153139

154140
var v = gnansumkbn( x.length, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/gnansumkbn/benchmark/benchmark.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 gnansumkbn = require( './../lib/main.js' );
3032

3133
// FUNCTIONS //
3234

35+
/**
36+
* Returns a random number.
37+
*
38+
* @private
39+
* @returns {number} random number
40+
*/
41+
function rand() {
42+
if ( bernoulli( 0.8 ) > 0 ) {
43+
return uniform( -10.0, 10.0 );
44+
}
45+
return NaN;
46+
}
47+
3348
/**
3449
* Creates a benchmark function.
3550
*
@@ -38,17 +53,7 @@ var gnansumkbn = require( './../lib/main.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()*10.0 ) - 20.0 );
50-
}
51-
}
56+
var x = filledarrayBy( len, 'generic', rand );
5257
return benchmark;
5358

5459
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/gnansumkbn/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 gnansumkbn = require( './../lib/ndarray.js' );
3032

3133
// FUNCTIONS //
3234

35+
/**
36+
* Returns a random number.
37+
*
38+
* @private
39+
* @returns {number} random number
40+
*/
41+
function rand() {
42+
if ( bernoulli( 0.8 ) > 0 ) {
43+
return uniform( -10.0, 10.0 );
44+
}
45+
return NaN;
46+
}
47+
3348
/**
3449
* Creates a benchmark function.
3550
*
@@ -38,17 +53,7 @@ var gnansumkbn = 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()*10.0 ) - 20.0 );
50-
}
51-
}
56+
var x = filledarrayBy( len, 'generic', rand );
5257
return benchmark;
5358

5459
function benchmark( b ) {

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

+16-20
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, ignoring `NaN` values and using
44
an improved Kahan–Babuška algorithm.
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,28 +34,25 @@
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, NaN, NaN ];
39-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
40-
> var stride = 2;
41-
> {{alias}}( N, x, stride )
39+
> {{alias}}( 4, 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, NaN, NaN ] );
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}}( 4, 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, ignoring `NaN` values and using
5451
an improved Kahan–Babuška algorithm 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
58-
starting index.
54+
buffer, the offset parameter supports indexing semantics based on a starting
55+
index.
5956

6057
Parameters
6158
----------
@@ -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, NaN, NaN ];
88-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
89-
> {{alias}}.ndarray( N, x, 2, 1 )
85+
> {{alias}}.ndarray( 4, x, 2, 1 )
9086
-1.0
9187

9288
See Also

lib/node_modules/@stdlib/blas/ext/base/gnansumkbn/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 = gnansumkbn( 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, ignoring `NaN` values and using an improved Kahan–Babuška algorithm 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 = gnansumkbn.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, ignoring `NaN` values and using an improved Kahan–Babuška algorithm.
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/gnansumkbn/examples/index.js

+10-13
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@
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 gnansumkbn = require( './../lib' );
21+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' );
22+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
23+
var filledarrayBy = require( '@stdlib/array/filled-by' );
24+
var gnansumkbn = require( '@stdlib/blas/ext/base/gnansumkbn' );
2525

26-
var x;
27-
var i;
28-
29-
x = new Float64Array( 10 );
30-
for ( i = 0; i < x.length; i++ ) {
31-
if ( randu() < 0.2 ) {
32-
x[ i ] = NaN;
33-
} else {
34-
x[ i ] = round( randu()*100.0 );
26+
function rand() {
27+
if ( bernoulli( 0.7 ) > 0 ) {
28+
return discreteUniform( 0, 100 );
3529
}
30+
return NaN;
3631
}
32+
33+
var x = filledarrayBy( 10, 'float64', rand );
3734
console.log( x );
3835

3936
var v = gnansumkbn( x.length, x, 1 );

0 commit comments

Comments
 (0)