Fix Division-by-Zero in Masked Statistical Functions #1122
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -181,28 +181,37 @@ contains | |||||
| ${t1}$ :: centeri_(merge(size(x, 2), size(x, 1), mask = 1<dim)) | ||||||
| ${t1}$ :: centerj_(merge(size(x, 2), size(x, 1), mask = 1<dim)) | ||||||
| logical :: mask_(merge(size(x, 2), size(x, 1), mask = 1<dim)) | ||||||
| ${t1}$ :: mean_i, mean_j | ||||||
|
|
||||||
| select case(dim) | ||||||
| case(1) | ||||||
| do i = 1, size(res, 2) | ||||||
| do j = 1, size(res, 1) | ||||||
| mask_ = mask(:, i) .and. mask(:, j) | ||||||
| n = count(mask_) | ||||||
| if (n < 2) then | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
|
||||||
| res(j, i) = ieee_value(1._${k1}$, ieee_quiet_nan) | ||||||
| cycle | ||||||
| end if | ||||||
|
|
||||||
| mean_i = sum(x(:, i), mask = mask_) / real(n, ${k1}$) | ||||||
| mean_j = sum(x(:, j), mask = mask_) / real(n, ${k1}$) | ||||||
|
Comment on lines
+197
to
+198
Member
There was a problem hiding this comment. I suggest to use |
||||||
|
|
||||||
| centeri_ = merge( x(:, i) - mean_i,& | ||||||
| #:if t1[0] == 'r' | ||||||
| 0._${k1}$,& | ||||||
| #:else | ||||||
| cmplx(0,0,kind=${k1}$),& | ||||||
| #:endif | ||||||
| mask_) | ||||||
| centerj_ = merge( x(:, j) - mean_j,& | ||||||
| #:if t1[0] == 'r' | ||||||
| 0._${k1}$,& | ||||||
| #:else | ||||||
| cmplx(0,0,kind=${k1}$),& | ||||||
| #:endif | ||||||
| mask_) | ||||||
|
|
||||||
| res(j, i) = dot_product( centerj_, centeri_)& | ||||||
| / (n - merge(1, 0,& | ||||||
| optval(corrected, .true.) .and. n > 0)) | ||||||
|
|
@@ -212,22 +221,30 @@ contains | |||||
| do i = 1, size(res, 2) | ||||||
| do j = 1, size(res, 1) | ||||||
| mask_ = mask(i, :) .and. mask(j, :) | ||||||
| n = count(mask_) | ||||||
| if (n < 2) then | ||||||
| res(j, i) = ieee_value(1._${k1}$, ieee_quiet_nan) | ||||||
| cycle | ||||||
| end if | ||||||
|
|
||||||
| mean_i = sum(x(i, :), mask = mask_) / real(n, ${k1}$) | ||||||
| mean_j = sum(x(j, :), mask = mask_) / real(n, ${k1}$) | ||||||
|
|
||||||
| centeri_ = merge( x(i, :) - mean_i,& | ||||||
| #:if t1[0] == 'r' | ||||||
| 0._${k1}$,& | ||||||
| #:else | ||||||
| cmplx(0,0,kind=${k1}$),& | ||||||
| #:endif | ||||||
| mask_) | ||||||
| centerj_ = merge( x(j, :) - mean_j,& | ||||||
| #:if t1[0] == 'r' | ||||||
| 0._${k1}$,& | ||||||
| #:else | ||||||
| cmplx(0,0,kind=${k1}$),& | ||||||
| #:endif | ||||||
| mask_) | ||||||
|
|
||||||
| res(j, i) = dot_product( centeri_, centerj_)& | ||||||
| / (n - merge(1, 0,& | ||||||
| optval(corrected, .true.) .and. n > 0)) | ||||||
|
|
@@ -255,16 +272,25 @@ contains | |||||
| real(dp) :: centeri_(merge(size(x, 2), size(x, 1), mask = 1<dim)) | ||||||
| real(dp) :: centerj_(merge(size(x, 2), size(x, 1), mask = 1<dim)) | ||||||
| logical :: mask_(merge(size(x, 2), size(x, 1), mask = 1<dim)) | ||||||
| real(dp) :: mean_i, mean_j | ||||||
|
|
||||||
| select case(dim) | ||||||
| case(1) | ||||||
| do i = 1, size(res, 2) | ||||||
| do j = 1, size(res, 1) | ||||||
| mask_ = mask(:, i) .and. mask(:, j) | ||||||
| n = count(mask_) | ||||||
| if (n < 2) then | ||||||
| res(j, i) = ieee_value(1._dp, ieee_quiet_nan) | ||||||
| cycle | ||||||
| end if | ||||||
|
|
||||||
| mean_i = sum(real(x(:, i), dp), mask = mask_) / real(n, dp) | ||||||
| mean_j = sum(real(x(:, j), dp), mask = mask_) / real(n, dp) | ||||||
|
|
||||||
| centeri_ = merge( real(x(:, i), dp) - mean_i, 0._dp, mask_) | ||||||
| centerj_ = merge( real(x(:, j), dp) - mean_j, 0._dp, mask_) | ||||||
|
|
||||||
| res(j, i) = dot_product( centerj_, centeri_)& | ||||||
| / (n - merge(1, 0,& | ||||||
| optval(corrected, .true.) .and. n > 0)) | ||||||
|
|
@@ -274,10 +300,18 @@ contains | |||||
| do i = 1, size(res, 2) | ||||||
| do j = 1, size(res, 1) | ||||||
| mask_ = mask(i, :) .and. mask(j, :) | ||||||
| n = count(mask_) | ||||||
| if (n < 2) then | ||||||
| res(j, i) = ieee_value(1._dp, ieee_quiet_nan) | ||||||
| cycle | ||||||
| end if | ||||||
|
|
||||||
| mean_i = sum(real(x(i, :), dp), mask = mask_) / real(n, dp) | ||||||
| mean_j = sum(real(x(j, :), dp), mask = mask_) / real(n, dp) | ||||||
|
|
||||||
| centeri_ = merge( real(x(i, :), dp) - mean_i, 0._dp, mask_) | ||||||
| centerj_ = merge( real(x(j, :), dp) - mean_j, 0._dp, mask_) | ||||||
|
|
||||||
| res(j, i) = dot_product( centeri_, centerj_)& | ||||||
| / (n - merge(1, 0,& | ||||||
| optval(corrected, .true.) .and. n > 0)) | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -105,8 +105,15 @@ contains | |
| ${t1}$, intent(in) :: x${ranksuffix(rank)}$ | ||
| logical, intent(in) :: mask${ranksuffix(rank)}$ | ||
| ${t1}$ :: res | ||
| real(${k1}$) :: n | ||
|
|
||
| n = real(count(mask, kind = int64), ${k1}$) | ||
| if (n == 0._${k1}$) then | ||
| res = ieee_value(1._${k1}$, ieee_quiet_nan) | ||
| return | ||
| end if | ||
|
|
||
| res = sum(x, mask) / n | ||
|
Comment on lines
+111
to
+116
Member
There was a problem hiding this comment. I am puzzle by this change as the original code will return NaN when count(mask)=0. So, what is the benefit of this change? |
||
|
|
||
| end function ${RName}$ | ||
| #:endfor | ||
|
|
@@ -120,8 +127,15 @@ contains | |
| ${t1}$, intent(in) :: x${ranksuffix(rank)}$ | ||
| logical, intent(in) :: mask${ranksuffix(rank)}$ | ||
| real(dp) :: res | ||
| real(dp) :: n | ||
|
|
||
| n = real(count(mask, kind = int64), dp) | ||
| if (n == 0._dp) then | ||
| res = ieee_value(1._dp, ieee_quiet_nan) | ||
| return | ||
| end if | ||
|
|
||
| res = sum(real(x, dp), mask) / n | ||
|
|
||
| end function ${RName}$ | ||
| #:endfor | ||
|
|
@@ -135,9 +149,24 @@ contains | |
| integer, intent(in) :: dim | ||
| logical, intent(in) :: mask${ranksuffix(rank)}$ | ||
| ${t1}$ :: res${reduced_shape('x', rank, 'dim')}$ | ||
| real(${k1}$) :: n${reduced_shape('x', rank, 'dim')}$ | ||
|
|
||
| if (dim >= 1 .and. dim <= ${rank}$) then | ||
| #:if rank == 1 | ||
| n = real(count(mask), ${k1}$) | ||
| if (n == 0._${k1}$) then | ||
| res = ieee_value(1._${k1}$, ieee_quiet_nan) | ||
| else | ||
| res = sum(x, dim, mask) / n | ||
| end if | ||
|
Comment on lines
+156
to
+161
Member
There was a problem hiding this comment. Why is this code duplicated for |
||
| #:else | ||
| n = real(count(mask, dim), ${k1}$) | ||
| where (n > 0._${k1}$) | ||
| res = sum(x, dim, mask) / n | ||
| elsewhere | ||
| res = ieee_value(1._${k1}$, ieee_quiet_nan) | ||
| end where | ||
| #:endif | ||
|
Comment on lines
+155
to
+169
Member
There was a problem hiding this comment. This code is more complex to undertand than the original one. So,what is its benefit? |
||
| else | ||
| call error_stop("ERROR (mean): wrong dimension") | ||
| end if | ||
|
|
@@ -155,9 +184,24 @@ contains | |
| integer, intent(in) :: dim | ||
| logical, intent(in) :: mask${ranksuffix(rank)}$ | ||
| real(dp) :: res${reduced_shape('x', rank, 'dim')}$ | ||
| real(dp) :: n${reduced_shape('x', rank, 'dim')}$ | ||
|
|
||
| if (dim >= 1 .and. dim <= ${rank}$) then | ||
| #:if rank == 1 | ||
| n = real(count(mask), dp) | ||
| if (n == 0._dp) then | ||
| res = ieee_value(1._dp, ieee_quiet_nan) | ||
| else | ||
| res = sum(real(x, dp), dim, mask) / n | ||
| end if | ||
| #:else | ||
| n = real(count(mask, dim), dp) | ||
| where (n > 0._dp) | ||
| res = sum(real(x, dp), dim, mask) / n | ||
| elsewhere | ||
| res = ieee_value(1._dp, ieee_quiet_nan) | ||
| end where | ||
| #:endif | ||
| else | ||
| call error_stop("ERROR (mean): wrong dimension") | ||
| end if | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -162,6 +162,12 @@ contains | |
| ${t1}$ :: mean | ||
|
|
||
| n = real(count(mask, kind = int64), ${k1}$) | ||
|
|
||
| if (n == 0._${k1}$) then | ||
| res = ieee_value(1._${k1}$, ieee_quiet_nan) | ||
| return | ||
| end if | ||
|
|
||
| mean = sum(x, mask) / n | ||
|
|
||
| #:if t1[0] == 'r' | ||
|
|
@@ -188,6 +194,12 @@ contains | |
| real(dp) :: n, mean | ||
|
|
||
| n = real(count(mask, kind = int64), dp) | ||
|
|
||
| if (n == 0._dp) then | ||
| res = ieee_value(1._dp, ieee_quiet_nan) | ||
| return | ||
| end if | ||
|
|
||
| mean = sum(real(x, dp), mask) / n | ||
|
|
||
| res = sum((real(x, dp) - mean)**2, mask) / (n -& | ||
|
|
@@ -217,7 +229,19 @@ contains | |
| #:for fi in range(1, rank+1) | ||
| case(${fi}$) | ||
| n = count(mask, dim) | ||
| #:if rank == 1 | ||
| if (n > 0) then | ||
| mean = sum(x, dim, mask) / n | ||
| else | ||
| mean = 0 | ||
| end if | ||
| #:else | ||
| where (n > 0) | ||
| mean = sum(x, dim, mask) / n | ||
| elsewhere | ||
| mean = 0 | ||
| end where | ||
| #:endif | ||
| do i = 1, size(x, dim) | ||
| #:if t1[0] == 'r' | ||
| res = res + merge( (x${select_subarray(rank, [(fi, 'i')])}$ - mean)**2,& | ||
|
|
@@ -257,7 +281,19 @@ contains | |
| #:for fi in range(1, rank+1) | ||
| case(${fi}$) | ||
| n = count(mask, dim) | ||
| #:if rank == 1 | ||
| if (n > 0) then | ||
| mean = sum(real(x, dp), dim, mask) / n | ||
| else | ||
| mean = 0 | ||
| end if | ||
| #:else | ||
| where (n > 0) | ||
| mean = sum(real(x, dp), dim, mask) / n | ||
| elsewhere | ||
| mean = 0 | ||
| end where | ||
| #:endif | ||
| do i = 1, size(x, dim) | ||
| res = res + merge((real(x${select_subarray(rank, [(fi, 'i')])}$, dp) - mean)**2,& | ||
| 0._dp, mask${select_subarray(rank, [(fi, 'i')])}$) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.