Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d5fb3c0

Browse files
authored
remove unnecessary merge(.true.,.false.,...) (#959)
2 parents 5c64ee6 + d9dc075 commit d5fb3c0

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

‎src/stdlib_math_is_close.fypp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ contains
2323
equal_nan_ = optval(equal_nan, .false.)
2424

2525
if (ieee_is_nan(a) .or. ieee_is_nan(b)) then
26-
close = merge(.true., .false., equal_nan_ .and. ieee_is_nan(a) .and. ieee_is_nan(b))
26+
close = equal_nan_ .and. ieee_is_nan(a) .and. ieee_is_nan(b)
2727
else
2828
close = abs(a - b) <= max( abs(optval(rel_tol, sqrt_eps_${k1}$)*max(abs(a), abs(b))), &
2929
abs(optval(abs_tol, 0.0_${k1}$)) )

‎src/stdlib_stats_corr.fypp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ contains
202202
case(1)
203203
do i = 1, size(res, 2)
204204
do j = 1, size(res, 1)
205-
mask_ = merge(.true., .false., mask(:, i) .and. mask(:, j))
205+
mask_ = mask(:, i) .and. mask(:, j)
206206
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),&
207207
#:if t1[0] == 'r'
208208
0._${k1},ドル&
@@ -227,7 +227,7 @@ contains
227227
case(2)
228228
do i = 1, size(res, 2)
229229
do j = 1, size(res, 1)
230-
mask_ = merge(.true., .false., mask(i, :) .and. mask(j, :))
230+
mask_ = mask(i, :) .and. mask(j, :)
231231
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),&
232232
#:if t1[0] == 'r'
233233
0._${k1},ドル&
@@ -274,11 +274,9 @@ contains
274274
case(1)
275275
do i = 1, size(res, 2)
276276
do j = 1, size(res, 1)
277-
mask_ = merge(.true., .false., mask(:, i) .and. mask(:, j))
278-
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),&
279-
0._dp, mask_)
280-
centerj_ = merge( x(:, j) - mean(x(:, j), mask = mask_),&
281-
0._dp, mask_)
277+
mask_ = mask(:, i) .and. mask(:, j)
278+
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),0._dp, mask_)
279+
centerj_ = merge( x(:, j) - mean(x(:, j), mask = mask_),0._dp, mask_)
282280

283281
res(j, i) = dot_product( centerj_, centeri_)&
284282
/sqrt(dot_product( centeri_, centeri_)*&
@@ -289,11 +287,9 @@ contains
289287
case(2)
290288
do i = 1, size(res, 2)
291289
do j = 1, size(res, 1)
292-
mask_ = merge(.true., .false., mask(i, :) .and. mask(j, :))
293-
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),&
294-
0._dp, mask_)
295-
centerj_ = merge( x(j, :) - mean(x(j, :), mask = mask_),&
296-
0._dp, mask_)
290+
mask_ = mask(i, :) .and. mask(j, :)
291+
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),0._dp, mask_)
292+
centerj_ = merge( x(j, :) - mean(x(j, :), mask = mask_),0._dp, mask_)
297293

298294
res(j, i) = dot_product( centeri_, centerj_)&
299295
/sqrt(dot_product( centeri_, centeri_)*&

‎src/stdlib_stats_cov.fypp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ contains
186186
case(1)
187187
do i = 1, size(res, 2)
188188
do j = 1, size(res, 1)
189-
mask_ = merge(.true., .false., mask(:, i) .and. mask(:, j))
189+
mask_ = mask(:, i) .and. mask(:, j)
190190
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),&
191191
#:if t1[0] == 'r'
192192
0._${k1},ドル&
@@ -211,7 +211,7 @@ contains
211211
case(2)
212212
do i = 1, size(res, 2)
213213
do j = 1, size(res, 1)
214-
mask_ = merge(.true., .false., mask(i, :) .and. mask(j, :))
214+
mask_ = mask(i, :) .and. mask(j, :)
215215
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),&
216216
#:if t1[0] == 'r'
217217
0._${k1},ドル&
@@ -260,11 +260,9 @@ contains
260260
case(1)
261261
do i = 1, size(res, 2)
262262
do j = 1, size(res, 1)
263-
mask_ = merge(.true., .false., mask(:, i) .and. mask(:, j))
264-
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),&
265-
0._dp, mask_)
266-
centerj_ = merge( x(:, j) - mean(x(:, j), mask = mask_),&
267-
0._dp, mask_)
263+
mask_ = mask(:, i) .and. mask(:, j)
264+
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),0._dp, mask_)
265+
centerj_ = merge( x(:, j) - mean(x(:, j), mask = mask_),0._dp, mask_)
268266

269267
n = count(mask_)
270268
res(j, i) = dot_product( centerj_, centeri_)&
@@ -275,11 +273,9 @@ contains
275273
case(2)
276274
do i = 1, size(res, 2)
277275
do j = 1, size(res, 1)
278-
mask_ = merge(.true., .false., mask(i, :) .and. mask(j, :))
279-
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),&
280-
0._dp, mask_)
281-
centerj_ = merge( x(j, :) - mean(x(j, :), mask = mask_),&
282-
0._dp, mask_)
276+
mask_ = mask(i, :) .and. mask(j, :)
277+
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),0._dp, mask_)
278+
centerj_ = merge( x(j, :) - mean(x(j, :), mask = mask_),0._dp, mask_)
283279

284280
n = count(mask_)
285281
res(j, i) = dot_product( centeri_, centerj_)&

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /