Auto-generated commit

stdlib-js · Apr 17, 2024 · c4bb2d0 · c4bb2d0
1 parent 7d63d3e
commit c4bb2d0
Show file tree

Hide file tree

Showing 17 changed files with 178 additions and 271 deletions.
diff --git a/ext/base/sfill/README.md b/ext/base/sfill/README.md
@@ -50,34 +50,30 @@ The function has the following parameters:
 -   **x**: input [`Float32Array`][@stdlib/array/float32].
 -   **stride**: index increment.
 
-The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to fill every other element
+The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to fill every other element
 
 ```javascript
 var Float32Array = require( '@stdlib/array/float32' );
-var floor = require( '@stdlib/math/base/special/floor' );
 
 var x = new Float32Array( [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ] );
-var N = floor( x.length / 2 );
 
-sfill( N, 5.0, x, 2 );
+sfill( 4, 5.0, x, 2 );
 // x => <Float32Array>[ 5.0, 1.0, 5.0, -5.0, 5.0, 0.0, 5.0, -3.0 ]
 ```
 
 Note that indexing is relative to the first index. To introduce an offset, use [`typed array`][mdn-typed-array] views.
 
 ```javascript
 var Float32Array = require( '@stdlib/array/float32' );
-var floor = require( '@stdlib/math/base/special/floor' );
 
 // Initial array...
 var x0 = new Float32Array( [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ] );
 
 // Create an offset view...
 var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
-var N = floor( x0.length/2 );
 
 // Fill every other element...
-sfill( N, 5.0, x1, 2 );
+sfill( 3, 5.0, x1, 2 );
 // x0 => <Float32Array>[ 1.0, 5.0, 3.0, 5.0, 5.0, 5.0 ]
 ```
 
@@ -98,7 +94,7 @@ The function has the following additional parameters:
 
 -   **offset**: 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 access only the last three elements of `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 access only the last three elements of the strided array
 
 ```javascript
 var Float32Array = require( '@stdlib/array/float32' );
@@ -117,7 +113,7 @@ sfill.ndarray( 3, 5.0, x, 1, x.length-3 );
 
 ## Notes
 
--   If `N <= 0`, both functions return `x` unchanged.
+-   If `N <= 0`, both functions return the strided array unchanged.
 
 </section>
 
@@ -130,27 +126,13 @@ sfill.ndarray( 3, 5.0, x, 1, x.length-3 );
 <!-- eslint no-undef: "error" -->
 
 ```javascript
-var round = require( '@stdlib/math/base/special/round' );
-var randu = require( '@stdlib/random/base/randu' );
-var Float32Array = require( '@stdlib/array/float32' );
+var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var sfill = require( '@stdlib/blas/ext/base/sfill' );
 
-var rand;
-var sign;
-var x;
-var i;
-
-x = new Float32Array( 10 );
-for ( i = 0; i < x.length; i++ ) {
-    rand = round( randu()*100.0 );
-    sign = randu();
-    if ( sign < 0.5 ) {
-        sign = -1.0;
-    } else {
-        sign = 1.0;
-    }
-    x[ i ] = sign * rand;
-}
+var rand = discreteUniform( -100, 100 );
+
+var x = filledarrayBy( 10, 'float32', rand );
 console.log( x );
 
 sfill( x.length, 5.0, x, 1 );

diff --git a/ext/base/sfill/benchmark/benchmark.js b/ext/base/sfill/benchmark/benchmark.js
@@ -21,14 +21,19 @@
 // MODULES //
 
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
 var pow = require( '@stdlib/math/base/special/pow' );
-var Float32Array = require( '@stdlib/array/float32' );
 var pkg = require( './../package.json' ).name;
 var sfill = require( './../lib/sfill.js' );
 
 
+// VARIABLES //
+
+var rand = uniform( -10, 10 );
+
+
 // FUNCTIONS //
 
 /**
@@ -39,13 +44,7 @@ var sfill = require( './../lib/sfill.js' );
 * @returns {Function} benchmark function
 */
 function createBenchmark( len ) {
-	var x;
-	var i;
-
-	x = new Float32Array( len );
-	for ( i = 0; i < len; i++ ) {
-		x[ i ] = ( randu()*20.0 ) - 10.0;
-	}
+	var x = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/ext/base/sfill/benchmark/benchmark.native.js b/ext/base/sfill/benchmark/benchmark.native.js
@@ -22,10 +22,10 @@
 
 var resolve = require( 'path' ).resolve;
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
 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 +36,7 @@ var sfill = tryRequire( resolve( __dirname, './../lib/sfill.native.js' ) );
 var opts = {
 	'skip': ( sfill instanceof Error )
 };
+var rand = uniform( -10.0, 10.0 );
 
 
 // FUNCTIONS //
@@ -48,13 +49,7 @@ var opts = {
 * @returns {Function} benchmark function
 */
 function createBenchmark( len ) {
-	var x;
-	var i;
-
-	x = new Float32Array( len );
-	for ( i = 0; i < len; i++ ) {
-		x[ i ] = ( randu()*20.0 ) - 10.0;
-	}
+	var x = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/ext/base/sfill/benchmark/benchmark.ndarray.js b/ext/base/sfill/benchmark/benchmark.ndarray.js
@@ -21,14 +21,19 @@
 // MODULES //
 
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
 var pow = require( '@stdlib/math/base/special/pow' );
-var Float32Array = require( '@stdlib/array/float32' );
 var pkg = require( './../package.json' ).name;
 var sfill = require( './../lib/ndarray.js' );
 
 
+// VARIABLES //
+
+var rand = uniform( -10, 10 );
+
+
 // FUNCTIONS //
 
 /**
@@ -39,13 +44,7 @@ var sfill = require( './../lib/ndarray.js' );
 * @returns {Function} benchmark function
 */
 function createBenchmark( len ) {
-	var x;
-	var i;
-
-	x = new Float32Array( len );
-	for ( i = 0; i < len; i++ ) {
-		x[ i ] = ( randu()*20.0 ) - 10.0;
-	}
+	var x = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/ext/base/sfill/benchmark/benchmark.ndarray.native.js b/ext/base/sfill/benchmark/benchmark.ndarray.native.js
@@ -22,10 +22,10 @@
 
 var resolve = require( 'path' ).resolve;
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
 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 +36,7 @@ var sfill = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) );
 var opts = {
 	'skip': ( sfill instanceof Error )
 };
+var rand = uniform( -10, 10 );
 
 
 // FUNCTIONS //
@@ -48,13 +49,7 @@ var opts = {
 * @returns {Function} benchmark function
 */
 function createBenchmark( len ) {
-	var x;
-	var i;
-
-	x = new Float32Array( len );
-	for ( i = 0; i < len; i++ ) {
-		x[ i ] = ( randu()*20.0 ) - 10.0;
-	}
+	var x = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/ext/base/sfill/docs/repl.txt b/ext/base/sfill/docs/repl.txt
@@ -3,8 +3,8 @@
     Fills a single-precision floating-point strided array with a specified
     scalar value.
 
-    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 typed
     array views.
@@ -28,7 +28,7 @@
     Returns
     -------
     x: Float32Array
-        Input array `x`.
+        Input array.
 
     Examples
     --------
@@ -39,19 +39,18 @@
 
     // Using `N` and `stride` parameters:
     > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 3.0, -5.0, 4.0, -1.0, -3.0 ] );
-    > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
-    > {{alias}}( N, 5.0, x, 2 )
+    > {{alias}}( 3, 5.0, x, 2 )
     <Float32Array>[ 5.0, 1.0, 5.0, -5.0, 5.0, -1.0, -3.0 ]
 
     // Using view offsets:
     > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.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 );
-    > {{alias}}( N, 5.0, x1, 2 )
+    > {{alias}}( 3, 5.0, x1, 2 )
     <Float32Array>[ 5.0, 3.0, 5.0, 5.0, 5.0 ]
     > x0
     <Float32Array>[ 1.0, 5.0, 3.0, 5.0, 5.0, 5.0 ]
 
+
 {{alias}}.ndarray( N, alpha, x, stride, offset )
     Fills a single-precision floating-point strided array with a specified
     scalar value using alternative indexing semantics.
@@ -80,7 +79,7 @@
     Returns
     -------
     x: Float32Array
-        Input array `x`.
+        Input array.
 
     Examples
     --------
@@ -91,8 +90,7 @@
 
     // Using an index offset:
     > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ] );
-    > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
-    > {{alias}}.ndarray( N, 5.0, x, 2, 1 )
+    > {{alias}}.ndarray( 3, 5.0, x, 2, 1 )
     <Float32Array>[ 1.0, 5.0, 3.0, 5.0, 5.0, 5.0 ]
 
     See Also

diff --git a/ext/base/sfill/docs/types/index.d.ts b/ext/base/sfill/docs/types/index.d.ts
@@ -29,7 +29,7 @@ interface Routine {
 	* @param alpha - constant
 	* @param x - input array
 	* @param stride - stride length
-	* @returns `x`
+	* @returns input array
 	*
 	* @example
 	* var Float32Array = require( '@stdlib/array/float32' );
@@ -49,7 +49,7 @@ interface Routine {
 	* @param x - input array
 	* @param stride - stride length
 	* @param offset - starting index
-	* @returns `x`
+	* @returns input array
 	*
 	* @example
 	* var Float32Array = require( '@stdlib/array/float32' );
@@ -69,7 +69,7 @@ interface Routine {
 * @param alpha - constant
 * @param x - input array
 * @param stride - stride length
-* @returns `x`
+* @returns input array
 *
 * @example
 * var Float32Array = require( '@stdlib/array/float32' );

diff --git a/ext/base/sfill/examples/index.js b/ext/base/sfill/examples/index.js
@@ -18,27 +18,13 @@
 
 'use strict';
 
-var round = require( '@stdlib/math/base/special/round' );
-var randu = require( '@stdlib/random/base/randu' );
-var Float32Array = require( '@stdlib/array/float32' );
+var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var sfill = require( './../lib' );
 
-var rand;
-var sign;
-var x;
-var i;
+var rand = discreteUniform( -100, 100 );
 
-x = new Float32Array( 10 );
-for ( i = 0; i < x.length; i++ ) {
-	rand = round( randu()*100.0 );
-	sign = randu();
-	if ( sign < 0.5 ) {
-		sign = -1.0;
-	} else {
-		sign = 1.0;
-	}
-	x[ i ] = sign * rand;
-}
+var x = filledarrayBy( 10, 'float32', rand );
 console.log( x );
 
 sfill( x.length, 5.0, x, 1 );

diff --git a/ext/base/sfill/include.gypi b/ext/base/sfill/include.gypi
@@ -36,7 +36,7 @@
 
     # Source files:
     'src_files': [
-      '<(src_dir)/addon.cpp',
+      '<(src_dir)/addon.c',
       '<!@(node -e "var arr = require(\'@stdlib/utils/library-manifest\')(\'./manifest.json\',{},{\'basedir\':process.cwd(),\'paths\':\'posix\'}).src; for ( var i = 0; i < arr.length; i++ ) { console.log( arr[ i ] ); }")',
     ],
 

diff --git a/ext/base/sfill/lib/ndarray.native.js b/ext/base/sfill/lib/ndarray.native.js
@@ -20,7 +20,8 @@
 
 // MODULES //
 
-var Float32Array = require( '@stdlib/array/float32' );
+var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' );
+var offsetView = require( '@stdlib/strided/base/offset-view' );
 var addon = require( './sfill.native.js' );
 
 
@@ -46,10 +47,8 @@ var addon = require( './sfill.native.js' );
 */
 function sfill( N, alpha, 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
+	offset = minViewBufferIndex( N, stride, offset );
+	view = offsetView( x, offset );
 	addon( N, alpha, view, stride );
 	return x;
 }