diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/gsumors/README.md index 5c9f837a28e0..d1da2101506c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/README.md @@ -36,15 +36,14 @@ limitations under the License. var gsumors = require( '@stdlib/blas/ext/base/gsumors' ); ``` -#### gsumors( N, x, stride ) +#### gsumors( N, x, strideX ) Computes the sum of strided array elements using ordinary recursive summation. ```javascript var x = [ 1.0, -2.0, 2.0 ]; -var N = x.length; -var v = gsumors( N, x, 1 ); +var v = gsumors( x.length, x, 1 ); // returns 1.0 ``` @@ -52,17 +51,14 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Array`][mdn-array] or [`typed array`][mdn-typed-array]. -- **stride**: index increment for `x`. +- **strideX**: stride length. -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: ```javascript -var floor = require( '@stdlib/math/base/special/floor' ); - var x = [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ]; -var N = floor( x.length / 2 ); -var v = gsumors( N, x, 2 ); +var v = gsumors( 4, x, 2 ); // returns 5.0 ``` @@ -72,42 +68,35 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = gsumors( N, x1, 2 ); +var v = gsumors( 4, x1, 2 ); // returns 5.0 ``` -#### gsumors.ndarray( N, x, stride, offset ) +#### gsumors.ndarray( N, x, strideX, offsetX ) Computes the sum of strided array elements using ordinary recursive summation and alternative indexing semantics. ```javascript var x = [ 1.0, -2.0, 2.0 ]; -var N = x.length; -var v = gsumors.ndarray( N, x, 1, 0 ); +var v = gsumors.ndarray( x.length, x, 1, 0 ); // returns 1.0 ``` The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offsetX**: starting index. -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 sum of 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 sum of every other element starting from the second element: ```javascript -var floor = require( '@stdlib/math/base/special/floor' ); - var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ]; -var N = floor( x.length / 2 ); -var v = gsumors.ndarray( N, x, 2, 1 ); +var v = gsumors.ndarray( 4, x, 2, 1 ); // returns 5.0 ``` @@ -134,18 +123,12 @@ var v = gsumors.ndarray( N, x, 2, 1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float64Array = require( '@stdlib/array/float64' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var gsumors = require( '@stdlib/blas/ext/base/gsumors' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( randu()*100.0 ); -} +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); console.log( x ); var v = gsumors( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.js index e44baae57ada..8c8569fa7c1d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.js @@ -21,13 +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 pkg = require( './../package.json' ).name; var gsumors = require( './../lib/main.js' ); +// VARIABLES // + +var options = { + 'dtype': 'generic' +}; + + // FUNCTIONS // /** @@ -38,13 +45,7 @@ var gsumors = require( './../lib/main.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = []; - for ( i = 0; i < len; i++ ) { - x.push( ( randu()*10.0 ) - 20.0 ); - } + var x = uniform( len, -100, 100, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.ndarray.js index 3137bb3c8756..e02cb4d4cf9f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/benchmark/benchmark.ndarray.js @@ -21,13 +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 pkg = require( './../package.json' ).name; var gsumors = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'generic' +}; + + // FUNCTIONS // /** @@ -38,13 +45,7 @@ var gsumors = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = []; - for ( i = 0; i < len; i++ ) { - x.push( ( randu()*10.0 ) - 20.0 ); - } + var x = uniform( len, -100, 100, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/repl.txt index bc444de93ba4..4b70411c19f9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/repl.txt @@ -1,10 +1,10 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the sum of strided array elements using ordinary recursive summation. - 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. @@ -19,8 +19,8 @@ x: Array|TypedArray Input array. - stride: integer - Index increment. + strideX: integer + Stride length. Returns ------- @@ -34,27 +34,24 @@ > {{alias}}( x.length, x, 1 ) 1.0 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = [ -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, x, stride ) + > {{alias}}( 3, x, 2 ) 1.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 3, x1, 2 ) -1.0 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the sum of strided array elements using ordinary recursive summation and alternative indexing semantics. While typed array views mandate a view offset based on the underlying - buffer, the `offset` parameter supports indexing semantics based on a + buffer, the offset parameter supports indexing semantics based on a starting index. Parameters @@ -65,10 +62,10 @@ x: Array|TypedArray Input array. - stride: integer - Index increment. + strideX: integer + Stride length. - offset: integer + offsetX: integer Starting index. Returns @@ -85,8 +82,7 @@ // Using offset parameter: > var x = [ 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, x, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1 ) -1.0 See Also diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/types/index.d.ts index 49ef98625baf..ff63315f2dfd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/docs/types/index.d.ts @@ -31,7 +31,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns sum * * @example @@ -40,15 +40,15 @@ interface Routine { * var v = gsumors( x.length, x, 1 ); * // returns 1.0 */ - ( N: number, x: NumericArray, stride: number ): number; + ( N: number, x: NumericArray, strideX: number ): number; /** * Computes the sum of strided array elements using ordinary recursive summation and alternative indexing semantics. * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns sum * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = gsumors.ndarray( x.length, x, 1, 0 ); * // returns 1.0 */ - ndarray( N: number, x: NumericArray, stride: number, offset: number ): number; + ndarray( N: number, x: NumericArray, strideX: number, offsetX: number ): number; } /** @@ -65,7 +65,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array -* @param stride - stride length +* @param strideX - stride length * @returns sum * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/examples/index.js index 10b952560fd5..79adcca67f3a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/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 Float64Array = require( '@stdlib/array/float64' ); -var gsumors = require( './../lib' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); +var gsumors = require( '@stdlib/blas/ext/base/gsumors' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( randu()*100.0 ); -} +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); console.log( x ); var v = gsumors( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/index.js index 5a179a1ff795..a3638810c056 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/index.js @@ -27,19 +27,16 @@ * var gsumors = require( '@stdlib/blas/ext/base/gsumors' ); * * var x = [ 1.0, -2.0, 2.0 ]; -* var N = x.length; * -* var v = gsumors( N, x, 1 ); +* var v = gsumors( x.length, x, 1 ); * // returns 1.0 * * @example -* var floor = require( '@stdlib/math/base/special/floor' ); * var gsumors = require( '@stdlib/blas/ext/base/gsumors' ); * * var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ]; -* var N = floor( x.length / 2 ); * -* var v = gsumors.ndarray( N, x, 2, 1 ); +* var v = gsumors.ndarray( 4, x, 2, 1 ); * // returns 5.0 */ diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/main.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/main.js index c9f5d676000c..83c47f0a9373 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/main.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/main.js @@ -18,9 +18,10 @@ 'use strict'; -// VARIABLES // +// MODULES // -var M = 6; +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -30,57 +31,17 @@ var M = 6; * * @param {PositiveInteger} N - number of indexed elements * @param {NumericArray} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} sum * * @example * var x = [ 1.0, -2.0, 2.0 ]; -* var N = x.length; * -* var v = gsumors( N, x, 1 ); +* var v = gsumors( x.length, x, 1 ); * // returns 1.0 */ -function gsumors( N, x, stride ) { - var ix; - var m; - var s; - var i; - - s = 0.0; - if ( N <= 0 ) { - return s; - } - if ( N === 1 || stride === 0 ) { - return x[ 0 ]; - } - // If the stride is equal to `1`, use unrolled loops... - if ( stride === 1 ) { - m = N % M; - - // If we have a remainder, run a clean-up loop... - if ( m > 0 ) { - for ( i = 0; i < m; i++ ) { - s += x[ i ]; - } - } - if ( N < M ) { - return s; - } - for ( i = m; i < N; i += M ) { - s += x[i] + x[i+1] + x[i+2] + x[i+3] + x[i+4] + x[i+5]; - } - return s; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - for ( i = 0; i < N; i++ ) { - s += x[ ix ]; - ix += stride; - } - return s; +function gsumors( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/ndarray.js index 7cfa91e0e46f..5db573bec6b4 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/lib/ndarray.js @@ -30,20 +30,17 @@ var M = 6; * * @param {PositiveInteger} N - number of indexed elements * @param {NumericArray} 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} sum * * @example -* var floor = require( '@stdlib/math/base/special/floor' ); -* * var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ]; -* var N = floor( x.length / 2 ); * -* var v = gsumors( N, x, 2, 1 ); +* var v = gsumors( 4, x, 2, 1 ); * // returns 5.0 */ -function gsumors( N, x, stride, offset ) { +function gsumors( N, x, strideX, offsetX ) { var ix; var m; var s; @@ -53,20 +50,20 @@ function gsumors( N, x, stride, offset ) { if ( N <= 0 ) { return s; } - if ( N === 1 || stride === 0 ) { - return x[ offset ]; + ix = offsetX; + if ( strideX === 0 ) { + return N * x[ ix ]; } - ix = offset; // If the stride is equal to `1`, use unrolled loops... - if ( stride === 1 ) { + if ( strideX === 1 ) { m = N % M; // If we have a remainder, run a clean-up loop... if ( m > 0 ) { for ( i = 0; i < m; i++ ) { s += x[ ix ]; - ix += stride; + ix += strideX; } } if ( N < M ) { @@ -80,7 +77,7 @@ function gsumors( N, x, stride, offset ) { } for ( i = 0; i < N; i++ ) { s += x[ ix ]; - ix += stride; + ix += strideX; } return s; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.main.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.main.js index 376ffe054bce..9b1ac5591ac8 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.main.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.main.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 Float64Array = require( '@stdlib/array/float64' ); var gsumors = require( './../lib' ); @@ -95,7 +94,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; @@ -110,15 +108,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]; - N = floor( x.length / 2 ); - v = gsumors( N, x, 2 ); + v = gsumors( 4, 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; @@ -133,21 +129,20 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]; - N = floor( x.length / 2 ); - v = gsumors( N, x, -2 ); + v = gsumors( 4, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first element', function test( t ) { +tape( 'if provided a `stride` parameter equal to `0`, the function returns the sum of the first element repeated N times', function test( t ) { var x; var v; x = [ 1.0, -2.0, -4.0, 5.0, 3.0 ]; v = gsumors( x.length, x, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); @@ -155,7 +150,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 Float64Array([ @@ -171,9 +165,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = gsumors( N, x1, 2 ); + v = gsumors( 4, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.ndarray.js index 6ab3872f7900..26fea87f0864 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/gsumors/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/gsumors/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 gsumors = require( './../lib/ndarray.js' ); @@ -94,7 +93,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; @@ -109,15 +107,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]; - N = floor( x.length / 2 ); - v = gsumors( N, x, 2, 0 ); + v = gsumors( 4, 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; @@ -132,27 +128,25 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]; - N = floor( x.length / 2 ); - v = gsumors( N, x, -2, 6 ); + v = gsumors( 4, x, -2, 6 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first indexed element', function test( t ) { +tape( 'if provided a `stride` parameter equal to `0`, the function returns the sum of the first element repeated N times', function test( t ) { var x; var v; x = [ 1.0, -2.0, -4.0, 5.0, 3.0 ]; v = gsumors( x.length, x, 0, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -166,9 +160,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]; - N = floor( x.length / 2 ); - v = gsumors( N, x, 2, 1 ); + v = gsumors( 4, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end();