refactor: reduce code duplication

stdlib-js · Jul 6, 2024 · 07f85a1 · 07f85a1 · stdlib-bot · Jul 6, 2024
1 parent 3656b32
commit 07f85a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 33 deletions.
diff --git a/lib/node_modules/@stdlib/strided/base/smap/lib/main.js b/lib/node_modules/@stdlib/strided/base/smap/lib/main.js
@@ -18,6 +18,12 @@
 
 'use strict';
 
+// MODULES //
+
+var stride2offset = require( '@stdlib/strided/base/stride2offset' );
+var ndarray = require( './ndarray.js' );
+
+
 // MAIN //
 
 /**
@@ -47,28 +53,7 @@
 * // => <Float32Array>[ 10.0, 20.0, 30.0, 40.0, 50.0 ]
 */
 function smap( N, x, strideX, y, strideY, fcn ) {
-	var ix;
-	var iy;
-	var i;
-	if ( N <= 0 ) {
-		return y;
-	}
-	if ( strideX < 0 ) {
-		ix = (1-N) * strideX;
-	} else {
-		ix = 0;
-	}
-	if ( strideY < 0 ) {
-		iy = (1-N) * strideY;
-	} else {
-		iy = 0;
-	}
-	for ( i = 0; i < N; i++ ) {
-		y[ iy ] = fcn( x[ ix ] );
-		ix += strideX;
-		iy += strideY;
-	}
-	return y;
+	return ndarray( N, x, strideX, stride2offset( N, strideX ), y, strideY, stride2offset( N, strideY ), fcn ); // eslint-disable-line max-len
 }
 
 

diff --git a/lib/node_modules/@stdlib/strided/base/smap/manifest.json b/lib/node_modules/@stdlib/strided/base/smap/manifest.json
@@ -32,7 +32,9 @@
 			],
 			"libraries": [],
 			"libpath": [],
-			"dependencies": []
+			"dependencies": [
+        "@stdlib/strided/base/stride2offset"
+      ]
 		}
 	]
 }
diff --git a/lib/node_modules/@stdlib/strided/base/smap/src/main.c b/lib/node_modules/@stdlib/strided/base/smap/src/main.c
@@ -17,6 +17,7 @@
 */
 
 #include "stdlib/strided/base/smap.h"
+#include "stdlib/strided/base/stride2offset.h"
 #include <stdint.h>
 
 /**
@@ -51,16 +52,8 @@ void stdlib_strided_smap( const int64_t N, const float *X, const int64_t strideX
 	if ( N <= 0 ) {
 		return;
 	}
-	if ( strideX < 0 ) {
-		ix = (1-N) * strideX;
-	} else {
-		ix = 0;
-	}
-	if ( strideY < 0 ) {
-		iy = (1-N) * strideY;
-	} else {
-		iy = 0;
-	}
+	ix = stdlib_strided_stride2offset( N, strideX );
+	iy = stdlib_strided_stride2offset( N, strideY );
 	for ( i = 0; i < N; i++ ) {
 		Y[ iy ] = fcn( X[ ix ] );
 		ix += strideX;
Package	Statements	Branches	Functions	Lines
strided/base/map-by2	$\color{green}608/608$ $\color{green}+100.00\%$	$\color{green}42/42$ $\color{green}+100.00\%$	$\color{green}6/6$ $\color{green}+100.00\%$	$\color{green}608/608$ $\color{green}+100.00\%$
strided/base/mskunary	$\color{green}646/646$ $\color{green}+100.00\%$	$\color{green}40/40$ $\color{green}+100.00\%$	$\color{green}6/6$ $\color{green}+100.00\%$	$\color{green}646/646$ $\color{green}+100.00\%$
strided/base/nullary	$\color{green}524/524$ $\color{green}+100.00\%$	$\color{red}25/27$ $\color{green}+92.59\%$	$\color{green}6/6$ $\color{green}+100.00\%$	$\color{green}524/524$ $\color{green}+100.00\%$
strided/base/quaternary	$\color{green}257/257$ $\color{green}+100.00\%$	$\color{green}8/8$ $\color{green}+100.00\%$	$\color{green}2/2$ $\color{green}+100.00\%$	$\color{green}257/257$ $\color{green}+100.00\%$
strided/base/quinary	$\color{green}269/269$ $\color{green}+100.00\%$	$\color{green}8/8$ $\color{green}+100.00\%$	$\color{green}2/2$ $\color{green}+100.00\%$	$\color{green}269/269$ $\color{green}+100.00\%$
strided/base/smap	$\color{green}206/206$ $\color{green}+100.00\%$	$\color{green}9/9$ $\color{green}+100.00\%$	$\color{green}2/2$ $\color{green}+100.00\%$	$\color{green}206/206$ $\color{green}+100.00\%$