Skip to content

Commit fbe7514

Browse files
committed
refactor: reduce code duplication
1 parent 07f85a1 commit fbe7514

File tree

3 files changed

+14
-45
lines changed

3 files changed

+14
-45
lines changed

lib/node_modules/@stdlib/strided/base/smap2/lib/main.js

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818

1919
'use strict';
2020

21+
// MODULES //
22+
23+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
24+
var ndarray = require( './ndarray.js' );
25+
26+
2127
// MAIN //
2228

2329
/**
@@ -47,35 +53,7 @@
4753
* // => <Float32Array>[ 2.0, 4.0, 6.0, 8.0, 10.0 ]
4854
*/
4955
function smap2( N, x, strideX, y, strideY, z, strideZ, fcn ) {
50-
var ix;
51-
var iy;
52-
var iz;
53-
var i;
54-
if ( N <= 0 ) {
55-
return z;
56-
}
57-
if ( strideX < 0 ) {
58-
ix = (1-N) * strideX;
59-
} else {
60-
ix = 0;
61-
}
62-
if ( strideY < 0 ) {
63-
iy = (1-N) * strideY;
64-
} else {
65-
iy = 0;
66-
}
67-
if ( strideZ < 0 ) {
68-
iz = (1-N) * strideZ;
69-
} else {
70-
iz = 0;
71-
}
72-
for ( i = 0; i < N; i++ ) {
73-
z[ iz ] = fcn( x[ ix ], y[ iy ] );
74-
ix += strideX;
75-
iy += strideY;
76-
iz += strideZ;
77-
}
78-
return z;
56+
return ndarray( N, x, strideX, stride2offset( N, strideX ), y, strideY, stride2offset( N, strideY ), z, strideZ, stride2offset( N, strideZ ), fcn ); // eslint-disable-line max-len
7957
}
8058

8159

lib/node_modules/@stdlib/strided/base/smap2/manifest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
],
3333
"libraries": [],
3434
"libpath": [],
35-
"dependencies": []
35+
"dependencies": [
36+
"@stdlib/strided/base/stride2offset"
37+
]
3638
}
3739
]
3840
}

lib/node_modules/@stdlib/strided/base/smap2/src/main.c

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919
#include "stdlib/strided/base/smap2.h"
20+
#include "stdlib/strided/base/stride2offset.h"
2021
#include <stdint.h>
2122

2223
/**
@@ -55,21 +56,9 @@ void stdlib_strided_smap2( const int64_t N, const float *X, const int64_t stride
5556
if ( N <= 0 ) {
5657
return;
5758
}
58-
if ( strideX < 0 ) {
59-
ix = (1-N) * strideX;
60-
} else {
61-
ix = 0;
62-
}
63-
if ( strideY < 0 ) {
64-
iy = (1-N) * strideY;
65-
} else {
66-
iy = 0;
67-
}
68-
if ( strideZ < 0 ) {
69-
iz = (1-N) * strideZ;
70-
} else {
71-
iz = 0;
72-
}
59+
ix = stdlib_strided_stride2offset( N, strideX );
60+
iy = stdlib_strided_stride2offset( N, strideY );
61+
iz = stdlib_strided_stride2offset( N, strideZ );
7362
for ( i = 0; i < N; i++ ) {
7463
Z[ iz ] = fcn( X[ ix ], Y[ iy ] );
7564
ix += strideX;

0 commit comments

Comments
 (0)