From 9db11ff6d9f5611aa693a1c0b577c8d4e4b071a5 Mon Sep 17 00:00:00 2001 From: stdlib-bot Date: Sun, 14 Apr 2024 21:24:59 +0000 Subject: [PATCH] Auto-generated commit --- ext/base/dsnansum/README.md | 39 +++--- ext/base/dsnansum/benchmark/benchmark.js | 20 ++- .../dsnansum/benchmark/benchmark.native.js | 20 ++- .../dsnansum/benchmark/benchmark.ndarray.js | 20 ++- .../benchmark/benchmark.ndarray.native.js | 20 ++- ext/base/dsnansum/docs/repl.txt | 18 ++- ext/base/dsnansum/examples/index.js | 19 ++- ext/base/dsnansum/include.gypi | 2 +- ext/base/dsnansum/lib/index.js | 4 +- ext/base/dsnansum/lib/ndarray.js | 4 +- ext/base/dsnansum/lib/ndarray.native.js | 13 +- ext/base/dsnansum/manifest.json | 119 ++++++++++++------ ext/base/dsnansum/src/addon.c | 46 +++++++ ext/base/dsnansum/src/addon.cpp | 117 ----------------- ext/base/dsnansum/test/test.dsnansum.js | 15 +-- .../dsnansum/test/test.dsnansum.native.js | 15 +-- ext/base/dsnansum/test/test.ndarray.js | 15 +-- ext/base/dsnansum/test/test.ndarray.native.js | 15 +-- 18 files changed, 215 insertions(+), 306 deletions(-) create mode 100644 ext/base/dsnansum/src/addon.c delete mode 100644 ext/base/dsnansum/src/addon.cpp diff --git a/ext/base/dsnansum/README.md b/ext/base/dsnansum/README.md index b85ff384a..03251f0d8 100644 --- a/ext/base/dsnansum/README.md +++ b/ext/base/dsnansum/README.md @@ -56,16 +56,14 @@ The function has the following parameters: - **x**: input [`Float32Array`][@stdlib/array/float32]. - **stride**: index increment for `x`. -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`, +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 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, NaN, -7.0, NaN, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = dsnansum( N, x, 2 ); +var v = dsnansum( 4, x, 2 ); // returns 5.0 ``` @@ -75,14 +73,11 @@ 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, NaN, -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 = dsnansum( N, x1, 2 ); +var v = dsnansum( 4, x1, 2 ); // returns 5.0 ``` @@ -94,9 +89,8 @@ Computes the sum of single-precision floating-point strided array elements, igno var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = dsnansum.ndarray( N, x, 1, 0 ); +var v = dsnansum.ndarray( 4, x, 1, 0 ); // returns 1.0 ``` @@ -108,12 +102,10 @@ While [`typed array`][mdn-typed-array] views mandate a view offset based on the ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 2.0, 1.0, NaN, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -var N = floor( x.length / 2 ); -var v = dsnansum.ndarray( N, x, 2, 1 ); +var v = dsnansum.ndarray( 4, x, 2, 1 ); // returns 5.0 ``` @@ -139,22 +131,19 @@ var v = dsnansum.ndarray( N, 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 bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsnansum = require( '@stdlib/blas/ext/base/dsnansum' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( randu()*100.0 ); +function clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } + +var x = filledarrayBy( 10, 'float64', clbk ); console.log( x ); var v = dsnansum( x.length, x, 1 ); diff --git a/ext/base/dsnansum/benchmark/benchmark.js b/ext/base/dsnansum/benchmark/benchmark.js index bd0ad890a..245dd49a4 100644 --- a/ext/base/dsnansum/benchmark/benchmark.js +++ b/ext/base/dsnansum/benchmark/benchmark.js @@ -21,10 +21,11 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); 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 dsnansum = require( './../lib/dsnansum.js' ); @@ -39,18 +40,15 @@ var dsnansum = require( './../lib/dsnansum.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansum/benchmark/benchmark.native.js b/ext/base/dsnansum/benchmark/benchmark.native.js index 98e7f42e2..4517b40cf 100644 --- a/ext/base/dsnansum/benchmark/benchmark.native.js +++ b/ext/base/dsnansum/benchmark/benchmark.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); 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; @@ -48,18 +49,15 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansum/benchmark/benchmark.ndarray.js b/ext/base/dsnansum/benchmark/benchmark.ndarray.js index c4059902b..6a29605b8 100644 --- a/ext/base/dsnansum/benchmark/benchmark.ndarray.js +++ b/ext/base/dsnansum/benchmark/benchmark.ndarray.js @@ -21,10 +21,11 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); 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 dsnansum = require( './../lib/ndarray.js' ); @@ -39,18 +40,15 @@ var dsnansum = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js b/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js index 550c3152c..6f3cc8496 100644 --- a/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js +++ b/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); 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; @@ -48,18 +49,15 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansum/docs/repl.txt b/ext/base/dsnansum/docs/repl.txt index 0ce5a6341..d1129a045 100644 --- a/ext/base/dsnansum/docs/repl.txt +++ b/ext/base/dsnansum/docs/repl.txt @@ -4,8 +4,8 @@ ignoring `NaN` values, using extended accumulation, and returning an extended precision result. - The `N` and `stride` parameters determine which elements in `x` are accessed - at runtime. + The `N` and `stride` parameters determine which elements in the strided + array are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -37,19 +37,16 @@ // Using `N` and `stride` parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 4, x, 2 ) 1.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); > 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, x1, stride ) + > {{alias}}( 4, x1, 2 ) -1.0 + {{alias}}.ndarray( N, x, stride, offset ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using extended accumulation and alternative @@ -86,9 +83,8 @@ 1.0 // Using offset parameter: - > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); + > {{alias}}.ndarray( 3, x, 2, 1 ) -1.0 See Also diff --git a/ext/base/dsnansum/examples/index.js b/ext/base/dsnansum/examples/index.js index 6f52a7cf9..a9e076d96 100644 --- a/ext/base/dsnansum/examples/index.js +++ b/ext/base/dsnansum/examples/index.js @@ -18,22 +18,21 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsnansum = require( './../lib' ); var x; -var i; -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( randu()*100.0 ); +function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -100, 100 ); } + return NaN; } + +x = filledarrayBy( 10, 'float64', rand ); console.log( x ); var v = dsnansum( x.length, x, 1 ); diff --git a/ext/base/dsnansum/include.gypi b/ext/base/dsnansum/include.gypi index 868c5c12e..26476a8c2 100644 --- a/ext/base/dsnansum/include.gypi +++ b/ext/base/dsnansum/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' + +/** +* Receives JavaScript callback invocation data. +* +* @private +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 3 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); + + napi_value v; + napi_status status = napi_create_double( env, stdlib_strided_dsnansum( N, X, stride ), &v ); + assert( status == napi_ok ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) diff --git a/ext/base/dsnansum/src/addon.cpp b/ext/base/dsnansum/src/addon.cpp deleted file mode 100644 index 8f59306a1..000000000 --- a/ext/base/dsnansum/src/addon.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/** -* @license Apache-2.0 -* -* Copyright (c) 2020 The Stdlib Authors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -#include "stdlib/blas/ext/base/dsnansum.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_dsnansum { - - /** - * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_dsnansum( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 3; - napi_value argv[ 3 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 3 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 3 arguments." ); - return nullptr; - } - - napi_valuetype vtype0; - status = napi_typeof( env, argv[ 0 ], &vtype0 ); - assert( status == napi_ok ); - if ( vtype0 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. First argument must be a number." ); - return nullptr; - } - - bool res; - status = napi_is_typedarray( env, argv[ 1 ], &res ); - assert( status == napi_ok ); - if ( res == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float32Array." ); - return nullptr; - } - - napi_valuetype vtype2; - status = napi_typeof( env, argv[ 2 ], &vtype2 ); - assert( status == napi_ok ); - if ( vtype2 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a number." ); - return nullptr; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - int64_t stride; - status = napi_get_value_int64( env, argv[ 2 ], &stride ); - assert( status == napi_ok ); - - napi_typedarray_type vtype1; - size_t xlen; - void *X; - status = napi_get_typedarray_info( env, argv[ 1 ], &vtype1, &xlen, &X, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype1 != napi_float32_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float32Array." ); - return nullptr; - } - if ( (N-1)*llabs(stride) >= (int64_t)xlen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Second argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - napi_value v; - status = napi_create_double( env, stdlib_strided_dsnansum( N, (float *)X, stride ), &v ); - assert( status == napi_ok ); - - return v; - } - - napi_value Init( napi_env env, napi_value exports ) { - napi_status status; - napi_value fcn; - status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, node_dsnansum, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_dsnansum diff --git a/ext/base/dsnansum/test/test.dsnansum.js b/ext/base/dsnansum/test/test.dsnansum.js index 68ee54bf4..e4c0f7195 100644 --- a/ext/base/dsnansum/test/test.dsnansum.js +++ b/ext/base/dsnansum/test/test.dsnansum.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var dsnansum = require( './../lib/dsnansum.js' ); @@ -35,7 +34,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 3', function test( t ) { - t.strictEqual( dsnansum.length, 3, 'has expected arity' ); + t.strictEqual( dsnansum.length, 3, 'returns expected value' ); t.end(); }); @@ -125,7 +124,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -142,15 +140,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, 2 ); + v = dsnansum( 5, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; var i; @@ -168,8 +164,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, -2 ); + v = dsnansum( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -198,7 +193,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -216,9 +210,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 = dsnansum( N, x1, 2 ); + v = dsnansum( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/ext/base/dsnansum/test/test.dsnansum.native.js b/ext/base/dsnansum/test/test.dsnansum.native.js index 78fa0b567..735ee1a03 100644 --- a/ext/base/dsnansum/test/test.dsnansum.native.js +++ b/ext/base/dsnansum/test/test.dsnansum.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -44,7 +43,7 @@ tape( 'main export is a function', opts, function test( t ) { }); tape( 'the function has an arity of 3', opts, function test( t ) { - t.strictEqual( dsnansum.length, 3, 'has expected arity' ); + t.strictEqual( dsnansum.length, 3, 'returns expected value' ); t.end(); }); @@ -216,7 +215,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -233,15 +231,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, 2 ); + v = dsnansum( 5, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; var i; @@ -259,8 +255,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, -2 ); + v = dsnansum( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -289,7 +284,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -307,9 +301,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 = dsnansum( N, x1, 2 ); + v = dsnansum( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/ext/base/dsnansum/test/test.ndarray.js b/ext/base/dsnansum/test/test.ndarray.js index db871253a..67f8fbd7f 100644 --- a/ext/base/dsnansum/test/test.ndarray.js +++ b/ext/base/dsnansum/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var dsnansum = require( './../lib/ndarray.js' ); @@ -35,7 +34,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 4', function test( t ) { - t.strictEqual( dsnansum.length, 4, 'has expected arity' ); + t.strictEqual( dsnansum.length, 4, 'returns expected value' ); t.end(); }); @@ -125,7 +124,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -142,15 +140,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, 2, 0 ); + v = dsnansum( 5, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; var i; @@ -168,8 +164,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, -2, 8 ); + v = dsnansum( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -196,7 +191,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -212,9 +206,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, 2, 1 ); + v = dsnansum( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/ext/base/dsnansum/test/test.ndarray.native.js b/ext/base/dsnansum/test/test.ndarray.native.js index a23f8ce88..25015984b 100644 --- a/ext/base/dsnansum/test/test.ndarray.native.js +++ b/ext/base/dsnansum/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 Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -44,7 +43,7 @@ tape( 'main export is a function', opts, function test( t ) { }); tape( 'the function has an arity of 4', opts, function test( t ) { - t.strictEqual( dsnansum.length, 4, 'has expected arity' ); + t.strictEqual( dsnansum.length, 4, 'returns expected value' ); t.end(); }); @@ -134,7 +133,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -151,15 +149,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, 2, 0 ); + v = dsnansum( 5, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; var i; @@ -177,8 +173,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, -2, 8 ); + v = dsnansum( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -205,7 +200,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -221,9 +215,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dsnansum( N, x, 2, 1 ); + v = dsnansum( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end();