Skip to content

Commit fb19b1a

Browse files
committed
refactor: apply suggestions from code review
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: missing_dependencies - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: passed - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 791abf2 commit fb19b1a

2 files changed

Lines changed: 15 additions & 18 deletions

File tree

  • lib/node_modules/@stdlib/blas/ext/base/dvander

lib/node_modules/@stdlib/blas/ext/base/dvander/lib/base.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ var dfill = require( '@stdlib/blas/ext/base/dfill' ).ndarray;
5454
* // out => <Float64Array>[ 1.0, 1.0, 1.0, 4.0, 2.0, 1.0, 9.0, 3.0, 1.0 ]
5555
*/
5656
function dvander( mode, M, N, x, strideX, offsetX, out, strideOut1, strideOut2, offsetOut ) {
57+
var isrm;
5758
var do0;
5859
var do1;
59-
var rm;
6060
var S0;
6161
var S1;
6262
var sx;
@@ -66,11 +66,10 @@ function dvander( mode, M, N, x, strideX, offsetX, out, strideOut1, strideOut2,
6666
var i1;
6767

6868
// Note on variable naming convention: S#, do#, io, i# where # corresponds to the loop number, with `0` being the innermost loop...
69-
rm = isRowMajor( [ strideOut1, strideOut2 ] );
69+
isrm = isRowMajor( [ strideOut1, strideOut2 ] );
7070
sx = strideX;
7171

72-
// For a Vandermonde matrix, each row `i` contains powers of `x[i]`:
73-
if ( rm && mode > 0 ) {
72+
if ( isrm && mode > 0 ) {
7473
// Row-major, increasing: x^0, x^1, ..., x^(N-1)
7574
S0 = N;
7675
S1 = M;
@@ -88,7 +87,7 @@ function dvander( mode, M, N, x, strideX, offsetX, out, strideOut1, strideOut2,
8887
ix += sx;
8988
io += do1;
9089
}
91-
} else if ( rm ) {
90+
} else if ( isrm ) {
9291
// Row-major, decreasing: x^(N-1), x^(N-2), ..., x^0
9392
S0 = N;
9493
S1 = M;
@@ -114,7 +113,7 @@ function dvander( mode, M, N, x, strideX, offsetX, out, strideOut1, strideOut2,
114113
do1 = strideOut2 - ( S0*strideOut1 );
115114
io = offsetOut;
116115
dfill( S0, 1.0, out, do0, io );
117-
io += ( S0 * do0 ) + do1;
116+
io += strideOut2;
118117
for ( i1 = 1; i1 < S1; i1++ ) {
119118
ix = offsetX;
120119
for ( i0 = 0; i0 < S0; i0++ ) {
@@ -128,15 +127,14 @@ function dvander( mode, M, N, x, strideX, offsetX, out, strideOut1, strideOut2,
128127
// Column-major, decreasing: column 0 contains x^(N-1), last column all ones
129128
S0 = M;
130129
S1 = N;
131-
do0 = strideOut1;
132-
dfill( S0, 1.0, out, do0, offsetOut + ( ( S1-1 ) * strideOut2 ) );
130+
dfill( S0, 1.0, out, strideOut1, offsetOut + ( ( S1-1 ) * strideOut2 ) );
133131
for ( i1 = S1 - 2; i1 >= 0; i1-- ) {
134132
io = offsetOut + ( i1 * strideOut2 );
135133
ix = offsetX;
136134
for ( i0 = 0; i0 < S0; i0++ ) {
137135
out[ io ] = out[ io + strideOut2 ] * x[ ix ];
138136
ix += sx;
139-
io += do0;
137+
io += strideOut1;
140138
}
141139
}
142140
}

lib/node_modules/@stdlib/blas/ext/base/dvander/src/main.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ void API_SUFFIX(stdlib_strided_dvander)( const CBLAS_LAYOUT order, const double
108108
*/
109109
void API_SUFFIX(stdlib_strided_dvander_ndarray)( const double mode, const CBLAS_INT M, const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, double *Out, const CBLAS_INT strideOut1, const CBLAS_INT strideOut2, const CBLAS_INT offsetOut ) {
110110
int64_t sa[ 2 ];
111+
CBLAS_INT isrm;
111112
CBLAS_INT do0;
112113
CBLAS_INT do1;
113-
CBLAS_INT rm;
114114
CBLAS_INT S0;
115115
CBLAS_INT S1;
116116
CBLAS_INT sx;
@@ -140,13 +140,13 @@ void API_SUFFIX(stdlib_strided_dvander_ndarray)( const double mode, const CBLAS_
140140
sa[ 0 ] = strideOut1;
141141
sa[ 1 ] = strideOut2;
142142
if ( stdlib_ndarray_is_row_major( 2, sa ) ) {
143-
rm = 1;
143+
isrm = 1;
144144
} else {
145-
rm = 0;
145+
isrm = 0;
146146
}
147147
sx = strideX;
148148

149-
if ( rm && mode > 0 ) {
149+
if ( isrm && mode > 0 ) {
150150
// Row-major, increasing: x^0, x^1, ..., x^(N-1)
151151
S0 = N;
152152
S1 = M;
@@ -164,7 +164,7 @@ void API_SUFFIX(stdlib_strided_dvander_ndarray)( const double mode, const CBLAS_
164164
ix += sx;
165165
io += do1;
166166
}
167-
} else if ( rm ) {
167+
} else if ( isrm ) {
168168
// Row-major, decreasing: x^(N-1), x^(N-2), ..., x^0
169169
S0 = N;
170170
S1 = M;
@@ -190,7 +190,7 @@ void API_SUFFIX(stdlib_strided_dvander_ndarray)( const double mode, const CBLAS_
190190
do1 = strideOut2 - ( S0 * strideOut1 );
191191
io = offsetOut;
192192
API_SUFFIX(stdlib_strided_dfill_ndarray)( S0, 1.0, Out, do0, io );
193-
io += ( S0 * do0 ) + do1;
193+
io += strideOut2;
194194
for ( i1 = 1; i1 < S1; i1++ ) {
195195
ix = offsetX;
196196
for ( i0 = 0; i0 < S0; i0++ ) {
@@ -204,15 +204,14 @@ void API_SUFFIX(stdlib_strided_dvander_ndarray)( const double mode, const CBLAS_
204204
// Column-major, decreasing: column 0 contains x^(N-1), last column all ones
205205
S0 = M;
206206
S1 = N;
207-
do0 = strideOut1;
208-
API_SUFFIX(stdlib_strided_dfill_ndarray)( S0, 1.0, Out, do0, offsetOut + ( ( S1-1 ) * strideOut2 ) );
207+
API_SUFFIX(stdlib_strided_dfill_ndarray)( S0, 1.0, Out, strideOut1, offsetOut + ( ( S1-1 ) * strideOut2 ) );
209208
for ( i1 = S1 - 2; i1 >= 0; i1-- ) {
210209
io = offsetOut + ( i1 * strideOut2 );
211210
ix = offsetX;
212211
for ( i0 = 0; i0 < S0; i0++ ) {
213212
Out[ io ] = Out[ io + strideOut2 ] * X[ ix ];
214213
ix += sx;
215-
io += do0;
214+
io += strideOut1;
216215
}
217216
}
218217
}

0 commit comments

Comments
 (0)