Skip to content

Commit 1b7b920

Browse files
committed
fix: fixing mistakes
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: passed - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: passed - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 3af0a09 commit 1b7b920

File tree

8 files changed

+23
-81
lines changed

8 files changed

+23
-81
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var svariancewd = require( './../lib/svariancewd.js' );
3030

3131
// VARIABLES //
3232

33-
var option = {
33+
var options = {
3434
'dtype': 'float32'
3535
};
3636

@@ -47,7 +47,7 @@ var option = {
4747
function createBenchmark( len ) {
4848
var x;
4949

50-
x = uniform( len, -10, 10, option );
50+
x = uniform( len, -10, 10, options );
5151
return benchmark;
5252

5353
function benchmark( b ) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var svariancewd = tryRequire( resolve( __dirname, './../lib/svariancewd.native.j
3535
var opts = {
3636
'skip': ( svariancewd instanceof Error )
3737
};
38-
var option = {
38+
var options = {
3939
'dtype': 'float32'
4040
};
4141

@@ -52,7 +52,7 @@ var option = {
5252
function createBenchmark( len ) {
5353
var x;
5454

55-
x = uniform( len, -10, 10, option);
55+
x = uniform( len, -10, 10, options);
5656
return benchmark;
5757

5858
function benchmark( b ) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var options = {
4747
function createBenchmark( len ) {
4848
var x;
4949

50-
x = uniform( len, -10, 10, option );
50+
x = uniform( len, -10, 10, options );
5151
return benchmark;
5252

5353
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/svariancewd/benchmark/benchmark.ndarray.native.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var svariancewd = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' )
3535
var opts = {
3636
'skip': ( svariancewd instanceof Error )
3737
};
38-
var option = {
38+
var options = {
3939
'dtype': 'float32'
4040
};
4141

@@ -52,7 +52,7 @@ var option = {
5252
function createBenchmark( len ) {
5353
var x;
5454

55-
x = uniform( len, -10, 10, option );
55+
x = uniform( len, -10, 10, options );
5656
return benchmark;
5757

5858
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/svariancewd/lib/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
*
3535
* @example
3636
* var Float32Array = require( '@stdlib/array/float32' );
37-
* var floor = require( '@stdlib/math/base/special/floor' );
3837
* var svariancewd = require( '@stdlib/stats/base/svariancewd' );
3938
*
4039
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );

lib/node_modules/@stdlib/stats/base/svariancewd/lib/svariancewd.js

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
// MODULES //
2222

23-
var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
23+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
24+
var ndarray = require( './ndarray.js' );
2425

2526

2627
// MAIN //
@@ -82,36 +83,7 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
8283
* // returns ~4.3333
8384
*/
8485
function svariancewd( N, correction, x, strideX ) {
85-
var delta;
86-
var mu;
87-
var M2;
88-
var ix;
89-
var v;
90-
var n;
91-
var i;
92-
93-
n = N - correction;
94-
if ( N <= 0 || n <= 0.0 ) {
95-
return NaN;
96-
}
97-
if ( N === 1 || strideX === 0 ) {
98-
return 0.0;
99-
}
100-
if ( strideX < 0 ) {
101-
ix = (1-N) * strideX;
102-
} else {
103-
ix = 0;
104-
}
105-
M2 = 0.0;
106-
mu = 0.0;
107-
for ( i = 0; i < N; i++ ) {
108-
v = x[ ix ];
109-
delta = float64ToFloat32( v - mu );
110-
mu = float64ToFloat32( mu + float64ToFloat32( delta / (i+1) ) );
111-
M2 = float64ToFloat32( M2 + float64ToFloat32( delta * float64ToFloat32( v - mu ) ) ); // eslint-disable-line max-len
112-
ix += strideX;
113-
}
114-
return float64ToFloat32( M2 / n );
86+
return ndarray( N, correction, x, strideX, stride2offset( N, strideX ) );
11587
}
11688

11789

lib/node_modules/@stdlib/stats/base/svariancewd/manifest.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@
3535
"include": [
3636
"./include"
3737
],
38-
"libraries": [
39-
"-lm"
40-
],
38+
"libraries": [],
4139
"libpath": [],
4240
"dependencies": [
4341
"@stdlib/blas/base/shared",
42+
"@stdlib/strided/base/stride2offset",
4443
"@stdlib/napi/export",
4544
"@stdlib/napi/argv",
4645
"@stdlib/napi/argv-int64",
@@ -58,12 +57,11 @@
5857
"include": [
5958
"./include"
6059
],
61-
"libraries": [
62-
"-lm"
63-
],
60+
"libraries": [],
6461
"libpath": [],
6562
"dependencies": [
66-
"@stdlib/blas/base/shared"
63+
"@stdlib/blas/base/shared",
64+
"@stdlib/strided/base/stride2offset"
6765
]
6866
},
6967
{
@@ -75,12 +73,11 @@
7573
"include": [
7674
"./include"
7775
],
78-
"libraries": [
79-
"-lm"
80-
],
76+
"libraries": [],
8177
"libpath": [],
8278
"dependencies": [
83-
"@stdlib/blas/base/shared"
79+
"@stdlib/blas/base/shared",
80+
"@stdlib/strided/base/stride2offset"
8481
]
8582
},
8683
{
@@ -95,7 +92,8 @@
9592
"libraries": [],
9693
"libpath": [],
9794
"dependencies": [
98-
"@stdlib/blas/base/shared"
95+
"@stdlib/blas/base/shared",
96+
"@stdlib/strided/base/stride2offset"
9997
]
10098
}
10199
]

lib/node_modules/@stdlib/stats/base/svariancewd/src/main.c

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "stdlib/stats/base/svariancewd.h"
2020
#include "stdlib/blas/base/shared.h"
21+
#include "stdlib/strided/base/stride2offset.h"
2122

2223
/**
2324
* Computes the variance of a single-precision floating-point strided array using Welford's algorithm.
@@ -68,36 +69,8 @@
6869
* @return output value
6970
*/
7071
float API_SUFFIX(stdlib_strided_svariancewd)( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX ) {
71-
float delta;
72-
int64_t ix;
73-
int64_t i;
74-
double n;
75-
float mu;
76-
float M2;
77-
float v;
78-
79-
n = (double)N - (double)correction;
80-
if ( N <= 0 || n <= 0.0f ) {
81-
return 0.0f / 0.0f; // NaN
82-
}
83-
if ( N == 1 || strideX == 0 ) {
84-
return 0.0f;
85-
}
86-
if ( strideX < 0 ) {
87-
ix = (1-N) * strideX;
88-
} else {
89-
ix = 0;
90-
}
91-
M2 = 0.0f;
92-
mu = 0.0f;
93-
for ( i = 0; i < N; i++ ) {
94-
v = X[ ix ];
95-
delta = v - mu;
96-
mu += (float)((double)delta / (double)(i+1));
97-
M2 += delta * ( v - mu );
98-
ix += strideX;
99-
}
100-
return (double)M2 / n;
72+
const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX );
73+
return API_SUFFIX(stdlib_strided_svariancewd_ndarray)( N, correction, X, strideX, ox );
10174
}
10275

10376

0 commit comments

Comments
 (0)