Skip to content

Commit efc86d8

Browse files
committed
revert tests changes
1 parent 2078cbb commit efc86d8

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

test/stats/test_mean.fypp

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,9 @@ contains
173173
type(error_type), allocatable, intent(out) :: error
174174

175175
#:for rank in range(1, NRANK+1)
176-
call check(error, abs(mean(d${rank}$_${k1}$) - &
177-
sum(d${rank}$_${k1}$)/real(size(d${rank}$_${k1}$), ${k1}$)) &
178-
< ${k1}$tol &
179-
, 'mean(d${rank}$_${k1}$): uncorrect answer')
176+
call check(error, mean(d${rank}$_${k1}$), sum(d${rank}$_${k1}$)/real(size(d${rank}$_${k1}$), ${k1}$)&
177+
, 'mean(d${rank}$_${k1}$): uncorrect answer'&
178+
, thr = ${k1}$tol)
180179
if (allocated(error)) return
181180
#:endfor
182181
end subroutine
@@ -237,11 +236,10 @@ contains
237236
type(error_type), allocatable, intent(out) :: error
238237

239238
#:for rank in range(1, NRANK+1)
240-
call check(error, abs( mean(d${rank}$_${k1}$, d${rank}$_${k1}$ > 0) &
241-
- sum(d${rank}$_${k1}$, d${rank}$_${k1}$ > 0)/real(count(d${rank}$_${k1}$ > 0), ${k1}$))&
242-
< ${k1}$tol &
239+
call check(error, mean(d${rank}$_${k1}$, d${rank}$_${k1}$ > 0)&
240+
, sum(d${rank}$_${k1}$, d${rank}$_${k1}$ > 0)/real(count(d${rank}$_${k1}$ > 0), ${k1}$)&
243241
, 'mean(d${rank}$_${k1}$, d${rank}$_${k1}$ > 0): uncorrect answer'&
244-
)
242+
, thr = ${k1}$tol)
245243
if (allocated(error)) return
246244
#:endfor
247245
end subroutine
@@ -276,11 +274,9 @@ contains
276274
type(error_type), allocatable, intent(out) :: error
277275

278276
#:for rank in range(1, NRANK+1)
279-
call check(error, abs( mean(d${rank}$_c${k1}$) - &
280-
sum(d${rank}$_c${k1}$)/real(size(d${rank}$_c${k1}$), ${k1}$) )&
281-
< ${k1}$tol &
277+
call check(error, mean(d${rank}$_c${k1}$), sum(d${rank}$_c${k1}$)/real(size(d${rank}$_c${k1}$), ${k1}$)&
282278
, 'mean(d${rank}$_c${k1}$): uncorrect answer'&
283-
)
279+
, thr = ${k1}$tol)
284280
if (allocated(error)) return
285281
#:endfor
286282
end subroutine
@@ -341,11 +337,10 @@ contains
341337
type(error_type), allocatable, intent(out) :: error
342338

343339
#:for rank in range(1, NRANK+1)
344-
call check(error, abs(mean(d${rank}$_c${k1}$, d${rank}$_c${k1}$%re > 0) - &
345-
sum(d${rank}$_c${k1}$, d${rank}$_c${k1}$%re > 0)/real(count(d${rank}$_c${k1}$%re > 0), ${k1}$))&
346-
< ${k1}$tol &
340+
call check(error, mean(d${rank}$_c${k1}$, d${rank}$_c${k1}$%re > 0)&
341+
, sum(d${rank}$_c${k1}$, d${rank}$_c${k1}$%re > 0)/real(count(d${rank}$_c${k1}$%re > 0), ${k1}$)&
347342
, 'mean(d${rank}$_c${k1}$, d${rank}$_c${k1}$%re > 0): uncorrect answer'&
348-
)
343+
, thr = ${k1}$tol)
349344
if (allocated(error)) return
350345
#:endfor
351346
end subroutine

test/stats/test_median.fypp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,9 @@ contains
330330
if (allocated(error)) return
331331

332332
#:for rank in range(1, NRANK + 1)
333-
call check(error, abs( median(d${rank}$_${k1}$) - 1.5_${k1}$)<${k1}$tol&
333+
call check(error, median(d${rank}$_${k1}$), 1.5_${k1}$&
334334
, 'median(d${rank}$_${k1}$): uncorrect answer'&
335-
)
335+
, thr = ${k1}$tol)
336336
if (allocated(error)) return
337337
#:endfor
338338
end subroutine
@@ -341,19 +341,19 @@ contains
341341
!> Error handling
342342
type(error_type), allocatable, intent(out) :: error
343343

344-
call check(error, abs(median(d1odd_${k1}$) - 2._${k1}$)<${k1}$tol&
344+
call check(error, median(d1odd_${k1}$), 2._${k1}$&
345345
, 'median(d1odd_${k1}$): uncorrect answer'&
346-
)
346+
, thr = ${k1}$tol)
347347
if (allocated(error)) return
348348

349-
call check(error, abs(median(d2odd_${k1}$)-1._${k1}$)<${k1}$tol&
349+
call check(error, median(d2odd_${k1}$), 1._${k1}$&
350350
, 'median(d2odd_${k1}$): uncorrect answer'&
351-
)
351+
, thr = ${k1}$tol)
352352
if (allocated(error)) return
353353

354-
call check(error, abs(median(d2odd_${k1}$)-1._${k1}$)<${k1}$tol&
354+
call check(error, median(d2odd_${k1}$), 1._${k1}$&
355355
, 'median(d2odd_${k1}$): uncorrect answer'&
356-
)
356+
, thr = ${k1}$tol)
357357
if (allocated(error)) return
358358

359359
end subroutine

0 commit comments

Comments
 (0)