Skip to content

Commit 03fa864

Browse files
gururaj1512kgrytestdlib-bot
authored
feat: add C ndarray interface and refactor implementation for stats/base/snanmean
PR-URL: #7705 Co-authored-by: Athan Reines <[email protected]> Reviewed-by: Athan Reines <[email protected]> Co-authored-by: stdlib-bot <[email protected]>
1 parent 6cc361e commit 03fa864

24 files changed

+451
-265
lines changed

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

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

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

56-
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array `x`, ignoring `NaN` values.
56+
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values.
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 = snanmean( N, x, 1 );
63+
var v = snanmean( 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.
7372

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`,
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`,
7574

7675
```javascript
7776
var Float32Array = require( '@stdlib/array/float32' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7977

8078
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 );
8279

83-
var v = snanmean( N, x, 2 );
80+
var v = snanmean( 4, x, 2 );
8481
// returns 1.25
8582
```
8683

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

89-
<!-- eslint-disable stdlib/capitalized-comments -->
86+
<!-- eslint-disable stdlib/capitalized-comments, max-len -->
9087

9188
```javascript
9289
var Float32Array = require( '@stdlib/array/float32' );
93-
var floor = require( '@stdlib/math/base/special/floor' );
9490

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

98-
var N = floor( x0.length / 2 );
99-
100-
var v = snanmean( N, x1, 2 );
94+
var v = snanmean( 5, x1, 2 );
10195
// returns 1.25
10296
```
10397

104-
#### snanmean.ndarray( N, x, stride, offset )
98+
#### snanmean.ndarray( N, x, strideX, offsetX )
10599

106100
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics.
107101

108102
```javascript
109103
var Float32Array = require( '@stdlib/array/float32' );
110104

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

114-
var v = snanmean.ndarray( N, x, 1, 0 );
107+
var v = snanmean.ndarray( x.length, x, 1, 0 );
115108
// returns ~0.33333
116109
```
117110

118111
The function has the following additional parameters:
119112

120-
- **offset**: starting index for `x`.
113+
- **offsetX**: starting index.
114+
115+
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
121116

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
117+
<!-- eslint-disable max-len -->
123118

124119
```javascript
125120
var Float32Array = require( '@stdlib/array/float32' );
126-
var floor = require( '@stdlib/math/base/special/floor' );
127121

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 );
122+
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
130123

131-
var v = snanmean.ndarray( N, x, 2, 1 );
124+
var v = snanmean.ndarray( 5, x, 2, 1 );
132125
// returns 1.25
133126
```
134127

@@ -154,22 +147,19 @@ var v = snanmean.ndarray( N, x, 2, 1 );
154147
<!-- eslint no-undef: "error" -->
155148

156149
```javascript
157-
var randu = require( '@stdlib/random/base/randu' );
158-
var round = require( '@stdlib/math/base/special/round' );
159-
var Float32Array = require( '@stdlib/array/float32' );
150+
var uniform = require( '@stdlib/random/base/uniform' );
151+
var filledarrayBy = require( '@stdlib/array/filled-by' );
152+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
160153
var snanmean = require( '@stdlib/stats/base/snanmean' );
161154

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

175165
var v = snanmean( x.length, x, 1 );
@@ -180,6 +170,123 @@ console.log( v );
180170

181171
<!-- /.examples -->
182172

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

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