Skip to content

Commit d0b776a

Browse files
authored
feat: add C ndarray interface and refactor implementation for stats/base/snanmeanors
PR-URL: #4786 Reviewed-by: Athan Reines <[email protected]>
1 parent 29fece2 commit d0b776a

24 files changed

+468
-328
lines changed

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

Lines changed: 129 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,84 +51,79 @@ The [arithmetic mean][arithmetic-mean] is defined as
5151
var snanmeanors = require( '@stdlib/stats/base/snanmeanors' );
5252
```
5353

54-
#### snanmeanors( N, x, stride )
54+
#### snanmeanors( N, x, strideX )
5555

5656
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array `x`, ignoring `NaN` values and using ordinary recursive summation.
5757

5858
```javascript
5959
var Float32Array = require( '@stdlib/array/float32' );
6060

6161
var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
62-
var N = x.length;
6362

64-
var v = snanmeanors( N, x, 1 );
63+
var v = snanmeanors( x.length, x, 1 );
6564
// returns ~0.3333
6665
```
6766

6867
The function has the following parameters:
6968

7069
- **N**: number of indexed elements.
7170
- **x**: input [`Float32Array`][@stdlib/array/float32].
72-
- **stride**: index increment for `x`.
71+
- **strideX**: stride length for `x`.
72+
73+
The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the [arithmetic mean][arithmetic-mean] of every other element in `x`,
7374

74-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the [arithmetic mean][arithmetic-mean] of every other element in `x`,
75+
<!-- eslint-disable max-len -->
7576

7677
```javascript
7778
var Float32Array = require( '@stdlib/array/float32' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7979

80-
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0, NaN ] );
81-
var N = floor( x.length / 2 );
80+
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0, NaN, NaN ] );
8281

83-
var v = snanmeanors( N, x, 2 );
82+
var v = snanmeanors( 5, x, 2 );
8483
// returns 1.25
8584
```
8685

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

89-
<!-- eslint-disable stdlib/capitalized-comments -->
88+
<!-- eslint-disable stdlib/capitalized-comments, max-len -->
9089

9190
```javascript
9291
var Float32Array = require( '@stdlib/array/float32' );
93-
var floor = require( '@stdlib/math/base/special/floor' );
9492

95-
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
93+
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
9694
var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
9795

98-
var N = floor( x0.length / 2 );
99-
100-
var v = snanmeanors( N, x1, 2 );
96+
var v = snanmeanors( 5, x1, 2 );
10197
// returns 1.25
10298
```
10399

104-
#### snanmeanors.ndarray( N, x, stride, offset )
100+
#### snanmeanors.ndarray( N, x, strideX, offsetX )
105101

106102
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using ordinary recursive summation and alternative indexing semantics.
107103

108104
```javascript
109105
var Float32Array = require( '@stdlib/array/float32' );
110106

111107
var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
112-
var N = x.length;
113108

114-
var v = snanmeanors.ndarray( N, x, 1, 0 );
109+
var v = snanmeanors.ndarray( x.length, x, 1, 0 );
115110
// returns ~0.33333
116111
```
117112

118113
The function has the following additional parameters:
119114

120-
- **offset**: starting index for `x`.
115+
- **offsetX**: starting index for `x`.
116+
117+
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 [arithmetic mean][arithmetic-mean] for every other element in `x` starting from the second element
121118

122-
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 [arithmetic mean][arithmetic-mean] for every other value in `x` starting from the second value
119+
<!-- eslint-disable max-len -->
123120

124121
```javascript
125122
var Float32Array = require( '@stdlib/array/float32' );
126-
var floor = require( '@stdlib/math/base/special/floor' );
127123

128-
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
129-
var N = floor( x.length / 2 );
124+
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
130125

131-
var v = snanmeanors.ndarray( N, x, 2, 1 );
126+
var v = snanmeanors.ndarray( 5, x, 2, 1 );
132127
// returns 1.25
133128
```
134129

@@ -155,22 +150,19 @@ var v = snanmeanors.ndarray( N, x, 2, 1 );
155150
<!-- eslint no-undef: "error" -->
156151

157152
```javascript
158-
var randu = require( '@stdlib/random/base/randu' );
159-
var round = require( '@stdlib/math/base/special/round' );
160-
var Float32Array = require( '@stdlib/array/float32' );
153+
var uniform = require( '@stdlib/random/base/uniform' );
154+
var filledarrayBy = require( '@stdlib/array/filled-by' );
155+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
161156
var snanmeanors = require( '@stdlib/stats/base/snanmeanors' );
162157

163-
var x;
164-
var i;
165-
166-
x = new Float32Array( 10 );
167-
for ( i = 0; i < x.length; i++ ) {
168-
if ( randu() < 0.2 ) {
169-
x[ i ] = NaN;
170-
} else {
171-
x[ i ] = round( (randu()*100.0) - 50.0 );
158+
function rand() {
159+
if ( bernoulli( 0.8 ) < 1 ) {
160+
return NaN;
172161
}
162+
return uniform( -50.0, 50.0 );
173163
}
164+
165+
var x = filledarrayBy( 10, 'float32', rand );
174166
console.log( x );
175167

176168
var v = snanmeanors( x.length, x, 1 );
@@ -187,6 +179,107 @@ console.log( v );
187179

188180
<!-- /.references -->
189181

182+
<!-- C usage documentation. -->
183+
184+
<section class="usage">
185+
186+
### Usage
187+
188+
```c
189+
#include "stdlib/stats/base/snanmeanors.h"
190+
```
191+
192+
#### stdlib_strided_snanmeanors( N, \*X, strideX )
193+
194+
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using ordinary recursive summation.
195+
196+
```c
197+
const float x[] = { 1.0f, -2.0f, 0.0f/0.0f, 2.0f };
198+
199+
float v = stdlib_strided_snanmeanors( 4, x, 1 );
200+
// returns ~0.3333f
201+
```
202+
203+
The function accepts the following arguments:
204+
205+
- **N**: `[in] CBLAS_INT` number of indexed elements.
206+
- **X**: `[in] float*` input array.
207+
- **strideX**: `[in] CBLAS_INT` stride length.
208+
209+
```c
210+
float stdlib_strided_snanmeanors( const CBLAS_INT N, const float *X, const CBLAS_INT strideX );
211+
```
212+
213+
#### stdlib_strided_snanmeanors_ndarray( N, \*X, strideX, offsetX )
214+
215+
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using ordinary recursive summation and alternative indexing semantics.
216+
217+
```c
218+
const float x[] = { 1.0f, -2.0f, 0.0f/0.0f, 2.0f };
219+
220+
float v = stdlib_strided_snanmeanors_ndarray( 4, x, 1, 0 );
221+
// returns ~0.3333f
222+
```
223+
224+
The function accepts the following arguments:
225+
226+
- **N**: `[in] CBLAS_INT` number of indexed elements.
227+
- **X**: `[in] float*` input array.
228+
- **strideX**: `[in] CBLAS_INT` stride length.
229+
- **offsetX**: `[in] CBLAS_INT` starting index.
230+
231+
```c
232+
float stdlib_strided_snanmeanors_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX );
233+
```
234+
235+
</section>
236+
237+
<!-- /.usage -->
238+
239+
<!-- C API usage notes. Make sure to keep an empty line after the `section` element and another before the `/section` close. -->
240+
241+
<section class="notes">
242+
243+
</section>
244+
245+
<!-- /.notes -->
246+
247+
<!-- C API usage examples. -->
248+
249+
<section class="examples">
250+
251+
### Examples
252+
253+
```c
254+
#include "stdlib/stats/base/snanmeanors.h"
255+
#include <stdio.h>
256+
257+
int main( void ) {
258+
// Create a strided array:
259+
const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 3.0f, 0.0f/0.0f, 4.0f, 5.0f, 6.0f, 0.0f/0.0f, 7.0f, 8.0f, 0.0f/0.0f };
260+
261+
// Specify the number of elements:
262+
const int N = 6;
263+
264+
// Specify the stride length:
265+
const int strideX = 2;
266+
267+
// Compute the arithmetic mean:
268+
float v = stdlib_strided_snanmeanors( N, x, strideX );
269+
270+
// Print the result:
271+
printf( "mean: %f\n", v );
272+
}
273+
```
274+
275+
</section>
276+
277+
<!-- /.examples -->
278+
279+
</section>
280+
281+
<!-- /.c -->
282+
190283
<!-- Section for related `stdlib` packages. Do not manually edit this section, as it is automatically populated. -->
191284
192285
<section class="related">

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +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' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2829
var pkg = require( './../package.json' ).name;
2930
var snanmeanors = require( './../lib/snanmeanors.js' );
3031

3132

3233
// FUNCTIONS //
3334

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+
3448
/**
3549
* Creates a benchmark function.
3650
*
@@ -39,17 +53,7 @@ var snanmeanors = require( './../lib/snanmeanors.js' );
3953
* @returns {Function} benchmark function
4054
*/
4155
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
if ( randu() < 0.2 ) {
48-
x[ i ] = NaN;
49-
} else {
50-
x[ i ] = ( randu()*20.0 ) - 10.0;
51-
}
52-
}
56+
var x = filledarrayBy( len, 'float32', rand );
5357
return benchmark;
5458

5559
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/snanmeanors/benchmark/benchmark.native.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var randu = require( '@stdlib/random/base/randu' );
25+
var uniform = require( '@stdlib/random/base/uniform' );
26+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
27+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2628
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2729
var pow = require( '@stdlib/math/base/special/pow' );
28-
var Float32Array = require( '@stdlib/array/float32' );
2930
var tryRequire = require( '@stdlib/utils/try-require' );
3031
var pkg = require( './../package.json' ).name;
3132

@@ -40,6 +41,19 @@ var opts = {
4041

4142
// FUNCTIONS //
4243

44+
/**
45+
* Returns a random value or `NaN`.
46+
*
47+
* @private
48+
* @returns {number} random number or `NaN`
49+
*/
50+
function rand() {
51+
if ( bernoulli( 0.8 < 1 ) ) {
52+
return NaN;
53+
}
54+
return uniform( -10.0, 10.0 );
55+
}
56+
4357
/**
4458
* Creates a benchmark function.
4559
*
@@ -48,17 +62,7 @@ var opts = {
4862
* @returns {Function} benchmark function
4963
*/
5064
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float32Array( len );
55-
for ( i = 0; i < x.length; i++ ) {
56-
if ( randu() < 0.2 ) {
57-
x[ i ] = NaN;
58-
} else {
59-
x[ i ] = ( randu()*20.0 ) - 10.0;
60-
}
61-
}
65+
var x = filledarrayBy( len, 'float32', rand );
6266
return benchmark;
6367

6468
function benchmark( b ) {

0 commit comments

Comments
 (0)