diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/README.md b/lib/node_modules/@stdlib/stats/base/svariancech/README.md index 5ce6463a8869..77a42a2410ff 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/README.md +++ b/lib/node_modules/@stdlib/stats/base/svariancech/README.md @@ -98,7 +98,7 @@ The use of the term `n-1` is commonly referred to as Bessel's correction. Note, var svariancech = require( '@stdlib/stats/base/svariancech' ); ``` -#### svariancech( N, correction, x, stride ) +#### svariancech( N, correction, x, strideX ) Computes the [variance][variance] of a single-precision floating-point strided array `x` using a one-pass trial mean algorithm. @@ -106,9 +106,8 @@ Computes the [variance][variance] of a single-precision floating-point strided a var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = svariancech( N, 1, x, 1 ); +var v = svariancech( x.length, 1, x, 1 ); // returns ~4.3333 ``` @@ -117,18 +116,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **correction**: degrees of freedom adjustment. Setting this parameter to a value other than `0` has the effect of adjusting the divisor during the calculation of the [variance][variance] according to `N-c` where `c` corresponds to the provided degrees of freedom adjustment. When computing the [variance][variance] of a population, setting this parameter to `0` is the standard choice (i.e., the provided array contains data constituting an entire population). When computing the unbiased sample [variance][variance], setting this parameter to `1` is the standard choice (i.e., the provided array contains data sampled from a larger population; this is commonly referred to as Bessel's correction). - **x**: input [`Float32Array`][@stdlib/array/float32]. -- **stride**: index increment for `x`. +- **strideX**: stride length for `x`. -The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the [variance][variance] of every other element in `x`, +The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the [variance][variance] of every other element in `x`, ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = svariancech( N, 1, x, 2 ); +var v = svariancech( 4, 1, x, 2 ); // returns 6.25 ``` @@ -138,18 +135,15 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = svariancech( N, 1, x1, 2 ); +var v = svariancech( 4, 1, x1, 2 ); // returns 6.25 ``` -#### svariancech.ndarray( N, correction, x, stride, offset ) +#### svariancech.ndarray( N, correction, x, strideX, offsetX ) Computes the [variance][variance] of a single-precision floating-point strided array using a one-pass trial mean algorithm and alternative indexing semantics. @@ -157,26 +151,23 @@ Computes the [variance][variance] of a single-precision floating-point strided a var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = svariancech.ndarray( N, 1, x, 1, 0 ); +var v = svariancech.ndarray( x.length, 1, x, 1, 0 ); // returns ~4.33333 ``` The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offsetX**: starting index for `x`. -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 [variance][variance] for every other value in `x` starting from the second value +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 [variance][variance] for every other element in `x` starting from the second element ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -var N = floor( x.length / 2 ); -var v = svariancech.ndarray( N, 1, x, 2, 1 ); +var v = svariancech.ndarray( 4, 1, x, 2, 1 ); // returns 6.25 ``` @@ -203,18 +194,12 @@ var v = svariancech.ndarray( N, 1, x, 2, 1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var svariancech = require( '@stdlib/stats/base/svariancech' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float32' +}); console.log( x ); var v = svariancech( x.length, 1, x, 1 ); @@ -225,6 +210,125 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/stats/base/svariancech.h" +``` + +#### stdlib_strided_svariancech( N, correction, \*X, strideX ) + +Computes the [variance][variance] of a single-precision floating-point strided array using a one-pass trial mean algorithm. + +```c +const float x[] = { 1.0f, -2.0f, 2.0f }; + +float v = stdlib_strided_svariancech( 3, 1.0f, x, 1 ); +// returns ~4.3333f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **correction**: `[in] float` degrees of freedom adjustment. Setting this parameter to a value other than `0` has the effect of adjusting the divisor during the calculation of the [variance][variance] according to `N-c` where `c` corresponds to the provided degrees of freedom adjustment. When computing the [variance][variance] of a population, setting this parameter to `0` is the standard choice (i.e., the provided array contains data constituting an entire population). When computing the unbiased sample [variance][variance], setting this parameter to `1` is the standard choice (i.e., the provided array contains data sampled from a larger population; this is commonly referred to as Bessel's correction). +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. + +```c +float stdlib_strided_svariancech( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_svariancech_ndarray( N, correction, \*X, strideX, offsetX ) + +Computes the [variance][variance] of a single-precision floating-point strided array using a one-pass trial mean algorithm and alternative indexing semantics. + +```c +const float x[] = { 1.0f, -2.0f, 2.0f }; + +float v = stdlib_strided_svariancech_ndarray( 3, 1.0f, x, 1, 0 ); +// returns ~4.3333f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **correction**: `[in] float` degrees of freedom adjustment. Setting this parameter to a value other than `0` has the effect of adjusting the divisor during the calculation of the [variance][variance] according to `N-c` where `c` corresponds to the provided degrees of freedom adjustment. When computing the [variance][variance] of a population, setting this parameter to `0` is the standard choice (i.e., the provided array contains data constituting an entire population). When computing the unbiased sample [variance][variance], setting this parameter to `1` is the standard choice (i.e., the provided array contains data sampled from a larger population; this is commonly referred to as Bessel's correction). +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +float stdlib_strided_svariancech_ndarray( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/svariancech.h" +#include + +int main( void ) { + // Create a strided array: + const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f }; + + // Specify the number of elements: + const int N = 4; + + // Specify the stride length: + const int strideX = 2; + + // Compute the variance: + float v = stdlib_strided_svariancech( N, 1.0f, x, strideX ); + + // Print the result: + printf( "sample variance: %f\n", v ); +} +``` + +
+ + + +
+ + + * * *
diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.js index 22aef2e6c6f3..00594a670f28 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var svariancech = require( './../lib/svariancech.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float32' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var svariancech = require( './../lib/svariancech.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.native.js index 18664692c881..e3a0318931aa 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var svariancech = tryRequire( resolve( __dirname, './../lib/svariancech.native.j var opts = { 'skip': ( svariancech instanceof Error ) }; +var options = { + 'dtype': 'float32' +}; // FUNCTIONS // @@ -48,13 +50,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.js index 5f5ebe3520a9..edcac8ff8af9 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var svariancech = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float32' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var svariancech = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.native.js index 2f7f5ff76d19..861da256e2bf 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var svariancech = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) var opts = { 'skip': ( svariancech instanceof Error ) }; +var options = { + 'dtype': 'float32' +}; // FUNCTIONS // @@ -48,13 +50,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/c/benchmark.length.c index 094ee2ab4aac..1115b18e28f7 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/svariancech/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static float rand_float( void ) { * @param len array length * @return elapsed time in seconds */ -static double benchmark( int iterations, int len ) { +static double benchmark1( int iterations, int len ) { double elapsed; float x[ len ]; float v; @@ -107,6 +107,7 @@ static double benchmark( int iterations, int len ) { v = 0.0f; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_svariancech( len, 1.0f, x, 1 ); if ( v != v ) { printf( "should not return NaN\n" ); @@ -120,6 +121,40 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + float x[ len ]; + float v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_float() * 20000.0f ) - 10000.0f; + } + v = 0.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar + v = stdlib_strided_svariancech_ndarray( len, 1.0f, x, 1, 0 ); + if ( v != v ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( v != v ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -142,7 +177,18 @@ int main( void ) { for ( j = 0; j < REPEATS; j++ ) { count += 1; printf( "# c::%s:len=%d\n", NAME, len ); - elapsed = benchmark( iter, len ); + elapsed = benchmark1( iter, len ); + print_results( iter, elapsed ); + printf( "ok %d benchmark finished\n", count ); + } + } + for ( i = MIN; i <= MAX; i++ ) { + len = pow( 10, i ); + iter = ITERATIONS / pow( 10, i-1 ); + for ( j = 0; j < REPEATS; j++ ) { + count += 1; + printf( "# c::%s:ndarray:len=%d\n", NAME, len ); + elapsed = benchmark2( iter, len ); print_results( iter, elapsed ); printf( "ok %d benchmark finished\n", count ); } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/svariancech/docs/repl.txt index e9b42ff0eab2..77badcbc0f13 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/svariancech/docs/repl.txt @@ -1,9 +1,9 @@ -{{alias}}( N, correction, x, stride ) +{{alias}}( N, correction, x, strideX ) Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm. - The `N` and `stride` parameters determine which elements in `x` are accessed + The `N` and stride parameters determine which elements in `x` are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed @@ -31,8 +31,8 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. Returns ------- @@ -46,22 +46,19 @@ > {{alias}}( x.length, 1, x, 1 ) ~4.3333 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, 1, x, stride ) + > {{alias}}( 3, 1, x, 2 ) ~4.3333 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, 1, x1, stride ) + > {{alias}}( 3, 1, x1, 2 ) ~4.3333 -{{alias}}.ndarray( N, correction, x, stride, offset ) + +{{alias}}.ndarray( N, correction, x, strideX, offsetX ) Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm and alternative indexing semantics. @@ -89,10 +86,10 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. - offset: integer + offsetX: integer Starting index. Returns @@ -109,8 +106,7 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, 1, x, 2, 1 ) + > {{alias}}.ndarray( 3, 1, x, 2, 1 ) ~4.3333 See Also diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/svariancech/docs/types/index.d.ts index b9868dc971f0..f42a47f880ca 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/svariancech/docs/types/index.d.ts @@ -28,7 +28,7 @@ interface Routine { * @param N - number of indexed elements * @param correction - degrees of freedom adjustment * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns variance * * @example @@ -39,7 +39,7 @@ interface Routine { * var v = svariancech( x.length, 1, x, 1 ); * // returns ~4.3333 */ - ( N: number, correction: number, x: Float32Array, stride: number ): number; + ( N: number, correction: number, x: Float32Array, strideX: number ): number; /** * Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm and alternative indexing semantics. @@ -47,8 +47,8 @@ interface Routine { * @param N - number of indexed elements * @param correction - degrees of freedom adjustment * @param x - input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns variance * * @example @@ -59,7 +59,7 @@ interface Routine { * var v = svariancech.ndarray( x.length, 1, x, 1, 0 ); * // returns ~4.3333 */ - ndarray( N: number, correction: number, x: Float32Array, stride: number, offset: number ): number; + ndarray( N: number, correction: number, x: Float32Array, strideX: number, offsetX: number ): number; } /** @@ -68,7 +68,7 @@ interface Routine { * @param N - number of indexed elements * @param correction - degrees of freedom adjustment * @param x - input array -* @param stride - stride length +* @param strideX - stride length * @returns variance * * @example diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/examples/c/example.c b/lib/node_modules/@stdlib/stats/base/svariancech/examples/c/example.c index 4cd932ac2ba9..bd36ed41f9c3 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/examples/c/example.c +++ b/lib/node_modules/@stdlib/stats/base/svariancech/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/stats/base/svariancech.h" -#include #include int main( void ) { // Create a strided array: - float x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 }; + const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f }; // Specify the number of elements: - int64_t N = 4; + const int N = 4; // Specify the stride length: - int64_t stride = 2; + const int strideX = 2; // Compute the variance: - float v = stdlib_strided_svariancech( N, 1.0f, x, stride ); + float v = stdlib_strided_svariancech( N, 1.0f, x, strideX ); // Print the result: printf( "sample variance: %f\n", v ); diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/examples/index.js b/lib/node_modules/@stdlib/stats/base/svariancech/examples/index.js index d792f7f431ff..d42a70e4d701 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/examples/index.js @@ -18,18 +18,12 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var svariancech = require( './../lib' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float32' +}); console.log( x ); var v = svariancech( x.length, 1, x, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/include/stdlib/stats/base/svariancech.h b/lib/node_modules/@stdlib/stats/base/svariancech/include/stdlib/stats/base/svariancech.h index a4378f32c6c1..82f4ef22fb5e 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/include/stdlib/stats/base/svariancech.h +++ b/lib/node_modules/@stdlib/stats/base/svariancech/include/stdlib/stats/base/svariancech.h @@ -19,7 +19,7 @@ #ifndef STDLIB_STATS_BASE_SVARIANCECH_H #define STDLIB_STATS_BASE_SVARIANCECH_H -#include +#include "stdlib/blas/base/shared.h" /* * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler. @@ -31,7 +31,12 @@ extern "C" { /** * Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm. */ -float stdlib_strided_svariancech( const int64_t N, const float correction, const float *X, const int64_t stride ); +float API_SUFFIX(stdlib_strided_svariancech)( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX ); + +/** +* Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm and alternative indexing semantics. +*/ +float API_SUFFIX(stdlib_strided_svariancech_ndarray)( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/lib/index.js b/lib/node_modules/@stdlib/stats/base/svariancech/lib/index.js index a8c6056c4cb1..4379a4b2db15 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/lib/index.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/lib/index.js @@ -28,20 +28,17 @@ * var svariancech = require( '@stdlib/stats/base/svariancech' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = svariancech( N, 1, x, 1 ); +* var v = svariancech( x.length, 1, x, 1 ); * // returns ~4.3333 * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var svariancech = require( '@stdlib/stats/base/svariancech' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = svariancech.ndarray( N, 1, x, 2, 1 ); +* var v = svariancech.ndarray( 4, 1, x, 2, 1 ); * // returns 6.25 */ diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.js index 07d86d84cd29..192cde25b06c 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.js @@ -42,21 +42,19 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); * @param {PositiveInteger} N - number of indexed elements * @param {number} correction - degrees of freedom adjustment * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} variance * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = svariancech( N, 1, x, 2, 1 ); +* var v = svariancech( 4, 1, x, 2, 1 ); * // returns 6.25 */ -function svariancech( N, correction, x, stride, offset ) { +function svariancech( N, correction, x, strideX, offsetX ) { var mu; var ix; var M2; @@ -69,14 +67,14 @@ function svariancech( N, correction, x, stride, offset ) { if ( N <= 0 || n <= 0.0 ) { return NaN; } - if ( N === 1 || stride === 0 ) { + if ( N === 1 || strideX === 0 ) { return 0.0; } - ix = offset; + ix = offsetX; // Use an estimate for the mean: mu = x[ ix ]; - ix += stride; + ix += strideX; // Compute the variance... M2 = 0.0; @@ -85,7 +83,7 @@ function svariancech( N, correction, x, stride, offset ) { d = float64ToFloat32( x[ ix ] - mu ); M2 = float64ToFloat32( M2 + float64ToFloat32( d*d ) ); M = float64ToFloat32( M + d ); - ix += stride; + ix += strideX; } return float64ToFloat32( float64ToFloat32(M2/n) - float64ToFloat32( float64ToFloat32(M/N)*float64ToFloat32(M/n) ) ); // eslint-disable-line max-len } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.native.js index 1a52aaeab82c..011ca2f8bc2d 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float32Array = require( '@stdlib/array/float32' ); -var addon = require( './svariancech.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -32,27 +31,20 @@ var addon = require( './svariancech.native.js' ); * @param {PositiveInteger} N - number of indexed elements * @param {number} correction - degrees of freedom adjustment * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} variance * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = svariancech( N, 1, x, 2, 1 ); +* var v = svariancech( 4, 1, x, 2, 1 ); * // returns 6.25 */ -function svariancech( N, correction, x, stride, offset ) { - var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len - return addon( N, correction, view, stride ); +function svariancech( N, correction, x, strideX, offsetX ) { + return addon.ndarray( N, correction, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.js b/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.js index 2beb4d08e5e5..e123513e872a 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.js @@ -20,7 +20,8 @@ // MODULES // -var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -42,53 +43,19 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); * @param {PositiveInteger} N - number of indexed elements * @param {number} correction - degrees of freedom adjustment * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} variance * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = svariancech( N, 1, x, 1 ); +* var v = svariancech( x.length, 1, x, 1 ); * // returns ~4.3333 */ -function svariancech( N, correction, x, stride ) { - var mu; - var ix; - var M2; - var M; - var d; - var n; - var i; - - n = N - correction; - if ( N <= 0 || n <= 0.0 ) { - return NaN; - } - if ( N === 1 || stride === 0 ) { - return 0.0; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - // Use an estimate for the mean: - mu = x[ ix ]; - ix += stride; - - // Compute the variance... - M2 = 0.0; - M = 0.0; - for ( i = 1; i < N; i++ ) { - d = float64ToFloat32( x[ ix ] - mu ); - M2 = float64ToFloat32( M2 + float64ToFloat32( d*d ) ); - M = float64ToFloat32( M + d ); - ix += stride; - } - return float64ToFloat32( float64ToFloat32(M2/n) - float64ToFloat32( float64ToFloat32(M/N)*float64ToFloat32(M/n) ) ); // eslint-disable-line max-len +function svariancech( N, correction, x, strideX ) { + return ndarray( N, correction, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.native.js b/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.native.js index 131e0b70875e..81b7c0527276 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.native.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/lib/svariancech.native.js @@ -31,20 +31,19 @@ var addon = require( './../src/addon.node' ); * @param {PositiveInteger} N - number of indexed elements * @param {number} correction - degrees of freedom adjustment * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} variance * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = svariancech( N, 1, x, 1 ); +* var v = svariancech( x.length, 1, x, 1 ); * // returns ~4.3333 */ -function svariancech( N, correction, x, stride ) { - return addon( N, correction, x, stride ); +function svariancech( N, correction, x, strideX ) { + return addon( N, correction, x, strideX ); } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/manifest.json b/lib/node_modules/@stdlib/stats/base/svariancech/manifest.json index 3033ab4596d1..b608e04ab4e1 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/svariancech/manifest.json @@ -1,6 +1,7 @@ { "options": { - "task": "build" + "task": "build", + "wasm": false }, "fields": [ { @@ -26,53 +27,74 @@ ], "confs": [ { - "task": "build", + "task": "build", + "wasm": false, "src": [ - "./src/svariancech.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-float", "@stdlib/napi/argv-strided-float32array", - "@stdlib/napi/create-double", - "@stdlib/napi/argv-float" + "@stdlib/napi/create-double" ] }, { "task": "benchmark", + "wasm": false, "src": [ - "./src/svariancech.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", + "wasm": false, "src": [ - "./src/svariancech.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] + }, + { + "task": "", + "wasm": true, + "src": [ + "./src/main.c" ], + "include": [ + "./include" + ], + "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] } ] } diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/src/addon.c b/lib/node_modules/@stdlib/stats/base/svariancech/src/addon.c index 3eab2d06afa8..d2494d843533 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/svariancech/src/addon.c @@ -36,10 +36,28 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 4 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); STDLIB_NAPI_ARGV_FLOAT( env, correction, argv, 1 ); - STDLIB_NAPI_ARGV_INT64( env, stride, argv, 3 ); - STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 2 ) - STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_svariancech( N, correction, X, stride ), v ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 2 ) + STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_svariancech( N, correction, X, strideX ), v ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) +/** +* Receives JavaScript callback invocation data. +* +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon_method( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 5 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_FLOAT( env, correction, argv, 1 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 4 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_svariancech_ndarray( N, correction, X, strideX, offsetX ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/src/svariancech.c b/lib/node_modules/@stdlib/stats/base/svariancech/src/main.c similarity index 67% rename from lib/node_modules/@stdlib/stats/base/svariancech/src/svariancech.c rename to lib/node_modules/@stdlib/stats/base/svariancech/src/main.c index 9c253c3d52e6..e901a82dd69a 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/src/svariancech.c +++ b/lib/node_modules/@stdlib/stats/base/svariancech/src/main.c @@ -17,7 +17,8 @@ */ #include "stdlib/stats/base/svariancech.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm. @@ -33,15 +34,30 @@ * - Chan, Tony F., Gene H. Golub, and Randall J. LeVeque. 1983. "Algorithms for Computing the Sample Variance: Analysis and Recommendations." _The American Statistician_ 37 (3). American Statistical Association, Taylor & Francis, Ltd.: 242–47. doi:[10.1080/00031305.1983.10483115](https://doi.org/10.1080/00031305.1983.10483115). * - Schubert, Erich, and Michael Gertz. 2018. "Numerically Stable Parallel Computation of (Co-)Variance." In _Proceedings of the 30th International Conference on Scientific and Statistical Database Management_. New York, NY, USA: Association for Computing Machinery. doi:[10.1145/3221269.3223036](https://doi.org/10.1145/3221269.3223036). * -* @param N number of indexed elements -* @param correction degrees of freedom adjustment -* @param X input array -* @param stride stride length -* @return output value +* @param N number of indexed elements +* @param correction degrees of freedom adjustment +* @param X input array +* @param strideX stride length +* @return output value */ -float stdlib_strided_svariancech( const int64_t N, const float correction, const float *X, const int64_t stride ) { - int64_t ix; - int64_t i; +float API_SUFFIX(stdlib_strided_svariancech)( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_svariancech_ndarray)( N, correction, X, strideX, ox ); +} + +/** +* Computes the variance of a single-precision floating-point strided array using a one-pass trial mean algorithm and alternative indexing semantics. +* +* @param N number of indexed elements +* @param correction degrees of freedom adjustment +* @param X input array +* @param strideX stride length +* @param offsetX starting index for X +* @return output value +*/ +float API_SUFFIX(stdlib_strided_svariancech_ndarray)( const CBLAS_INT N, const float correction, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + CBLAS_INT ix; + CBLAS_INT i; double dN; double dM; double n; @@ -55,17 +71,13 @@ float stdlib_strided_svariancech( const int64_t N, const float correction, const if ( N <= 0 || n <= 0.0f ) { return 0.0f / 0.0f; // NaN } - if ( N == 1 || stride == 0 ) { + if ( N == 1 || strideX == 0 ) { return 0.0f; } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } + ix = offsetX; // Use an estimate for the mean: mu = X[ ix ]; - ix += stride; + ix += strideX; // Compute the variance... M2 = 0.0f; @@ -74,7 +86,7 @@ float stdlib_strided_svariancech( const int64_t N, const float correction, const d = X[ ix ] - mu; M2 += d * d; M += d; - ix += stride; + ix += strideX; } dM = (double)M; return (float)((double)M2/n) - ( (float)(dM/dN) * (float)(dM/n) ); diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.js index 54ffc7f1fce0..8320c6fa975a 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -122,7 +121,6 @@ tape( 'if provided a `correction` parameter yielding `N-correction` less than or }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -137,15 +135,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, 2, 0 ); + v = svariancech( 4, 1, x, 2, 0 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -160,8 +156,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, -2, 6 ); + v = svariancech( 4, 1, x, -2, 6 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); @@ -180,7 +175,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0`', }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -194,9 +188,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, 2, 1 ); + v = svariancech( 4, 1, x, 2, 1 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.native.js index 1378efaf0744..6d7d2daf7c00 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.ndarray.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -131,7 +130,6 @@ tape( 'if provided a `correction` parameter yielding `N-correction` less than or }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -146,15 +144,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, 2, 0 ); + v = svariancech( 4, 1, x, 2, 0 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -169,8 +165,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, -2, 6 ); + v = svariancech( 4, 1, x, -2, 6 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); @@ -189,7 +184,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0`', }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -203,9 +197,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, 2, 1 ); + v = svariancech( 4, 1, x, 2, 1 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.js b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.js index d45205eb2a2e..ec070f6379ef 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -122,7 +121,6 @@ tape( 'if provided a `correction` parameter yielding `N-correction` less than or }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -137,15 +135,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, 2 ); + v = svariancech( 4, 1, x, 2 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -160,8 +156,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, -2 ); + v = svariancech( 4, 1, x, -2 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); @@ -182,7 +177,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0`', tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -198,9 +192,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = svariancech( N, 1, x1, 2 ); + v = svariancech( 4, 1, x1, 2 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.native.js b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.native.js index 873b18b7b974..d5abc24325f3 100644 --- a/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.native.js +++ b/lib/node_modules/@stdlib/stats/base/svariancech/test/test.svariancech.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -131,7 +130,6 @@ tape( 'if provided a `correction` parameter yielding `N-correction` less than or }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -146,15 +144,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, 2 ); + v = svariancech( 4, 1, x, 2 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -169,8 +165,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = svariancech( N, 1, x, -2 ); + v = svariancech( 4, 1, x, -2 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end(); @@ -191,7 +186,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0`', tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -207,9 +201,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = svariancech( N, 1, x1, 2 ); + v = svariancech( 4, 1, x1, 2 ); t.strictEqual( v, 6.25, 'returns expected value' ); t.end();