Skip to content

Commit c63ea07

Browse files
committed
rawmoment: progress in test files
1 parent ef6deec commit c63ea07

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/tests/stats/test_moment.f90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ subroutine test_sp(x1, x2)
4646
!1dim
4747
print*,' test_sp_1dim', order
4848
call assert( abs(moment(x1, order, center=mean(x1))) < sptol)
49-
call assert( abs(moment(x1, order, dim=1, center = mean(x1, dim=1))) < sptol)
49+
call assert( abs(moment(x1, order, 1, center = mean(x1, 1))) < sptol)
5050

5151
print*,' test_sp_1dim_mask', order
5252
call assert( ieee_is_nan(moment(x1, order, center = mean(x1, .false.), mask = .false.)))
@@ -102,7 +102,7 @@ subroutine test_sp(x1, x2)
102102
!1dim
103103
print*,' test_sp_1dim', order
104104
call assert( abs(moment(x1, order, center = mean(x1)) - 2._sp) < sptol)
105-
call assert( abs(moment(x1, order, dim=1, center = mean(x1, dim=1)) - 2._sp) < sptol)
105+
call assert( abs(moment(x1, order, 1, center = mean(x1, 1)) - 2._sp) < sptol)
106106

107107
print*,' test_sp_1dim_mask', order
108108
call assert( ieee_is_nan(moment(x1, order, center = mean(x1, .false.), mask = .false.)))
@@ -337,7 +337,7 @@ subroutine test_int32(x1, x2)
337337
!1dim
338338
print*,' test_dp_1dim', order
339339
call assert( abs(moment(x1, order, center = mean(x1))) < dptol)
340-
call assert( abs(moment(x1, order, dim=1, center = mean(x1, dim=1))) < dptol)
340+
call assert( abs(moment(x1, order, 1, center = mean(x1, 1))) < dptol)
341341

342342
print*,' test_dp_1dim_mask', order
343343
call assert( ieee_is_nan(moment(x1, order, center = mean(x1, .false.), mask = .false.)))
@@ -393,7 +393,7 @@ subroutine test_int32(x1, x2)
393393
!1dim
394394
print*,' test_dp_1dim', order
395395
call assert( abs(moment(x1, order, center = mean(x1)) - 2._dp) < dptol)
396-
call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1) - 2._dp) < dptol)
396+
call assert( abs(moment(x1, order, 1, center = mean(x1, 1)) - 2._dp) < dptol)
397397

398398
print*,' test_dp_1dim_mask', order
399399
call assert( ieee_is_nan(moment(x1, order, center = mean(x1, .false.), mask = .false.)))
@@ -629,7 +629,7 @@ subroutine test_csp(x1, x2)
629629
!1dim
630630
print*,' test_sp_1dim', order
631631
call assert( abs(moment(x1, order, center = mean(x1))) < sptol)
632-
call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1)) < sptol)
632+
call assert( abs(moment(x1, order, 1, center = mean(x1, 1))) < sptol)
633633

634634
print*,' test_sp_1dim_mask', order
635635
call assert( ieee_is_nan(abs(moment(x1, order, center = mean(x1, .false.), mask = .false.))))
@@ -661,7 +661,7 @@ subroutine test_csp(x1, x2)
661661
!1dim
662662
print*,' test_sp_1dim', order
663663
call assert( abs(moment(x1, order, center = mean(x1)) - (-6.459422410E-02,-0.556084037)) < sptol)
664-
call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1) -&
664+
call assert( abs(moment(x1, order, 1, center = mean(x1, 1)) -&
665665
(-6.459422410E-02,-0.556084037)) < sptol)
666666

667667
print*,' test_sp_1dim_mask', order

src/tests/stats/test_rawmoment.f90

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
program test_moment
1+
program test_rawmoment
22
use stdlib_experimental_error, only: assert
33
use stdlib_experimental_kinds, only: sp, dp, int32, int64
44
use stdlib_experimental_stats, only: mean, moment
@@ -44,7 +44,7 @@ subroutine test_sp(x1, x2)
4444
!1dim
4545
print*,' test_sp_1dim', order
4646
call assert( abs(moment(x1, order) - mean(x1)) < sptol)
47-
call assert( abs(moment(x1, order, dim=1) - mean(x1)) < sptol)
47+
call assert( abs(moment(x1, order, 1) - mean(x1)) < sptol)
4848

4949
print*,' test_sp_1dim_mask', order
5050
call assert( ieee_is_nan(moment(x1, order, mask = .false.)))
@@ -100,7 +100,7 @@ subroutine test_sp(x1, x2)
100100
!1dim
101101
! print*,' test_sp_1dim', order
102102
! call assert( abs(moment(x1, order, center = mean(x1)) - 2._sp) < sptol)
103-
! call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1) - 2._sp) < sptol)
103+
! call assert( abs(moment(x1, order, center = mean(x1, 1), 1) - 2._sp) < sptol)
104104
!
105105
print*,' test_sp_1dim_mask', order
106106
call assert( ieee_is_nan(moment(x1, order, mask = .false.)))
@@ -189,7 +189,7 @@ subroutine test_int32(x1, x2)
189189
! !1dim
190190
! print*,' test_dp_1dim', order
191191
! call assert( abs(moment(x1, order, center = mean(x1))) < dptol)
192-
! call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1)) < dptol)
192+
! call assert( abs(moment(x1, order, center = mean(x1, 1), 1)) < dptol)
193193
!
194194
! print*,' test_dp_1dim_mask', order
195195
! call assert( ieee_is_nan(moment(x1, order, center = mean(x1, .false.), mask = .false.)))
@@ -245,7 +245,7 @@ subroutine test_int32(x1, x2)
245245
! !1dim
246246
! print*,' test_dp_1dim', order
247247
! call assert( abs(moment(x1, order, center = mean(x1)) - 2._dp) < dptol)
248-
! call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1) - 2._dp) < dptol)
248+
! call assert( abs(moment(x1, order, center = mean(x1, 1), 1) - 2._dp) < dptol)
249249
!
250250
! print*,' test_dp_1dim_mask', order
251251
! call assert( ieee_is_nan(moment(x1, order, center = mean(x1, .false.), mask = .false.)))
@@ -335,7 +335,7 @@ subroutine test_csp(x1, x2)
335335
! !1dim
336336
! print*,' test_sp_1dim', order
337337
! call assert( abs(moment(x1, order, center = mean(x1))) < sptol)
338-
! call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1)) < sptol)
338+
! call assert( abs(moment(x1, order, center = mean(x1, 1), 1)) < sptol)
339339
!
340340
! print*,' test_sp_1dim_mask', order
341341
! call assert( ieee_is_nan(abs(moment(x1, order, center = mean(x1, .false.), mask = .false.))))
@@ -367,7 +367,7 @@ subroutine test_csp(x1, x2)
367367
! !1dim
368368
! print*,' test_sp_1dim', order
369369
! call assert( abs(moment(x1, order, center = mean(x1)) - (-6.459422410E-02,-0.556084037)) < sptol)
370-
! call assert( abs(moment(x1, order, center = mean(x1, dim=1), dim=1) -&
370+
! call assert( abs(moment(x1, order, center = mean(x1, 1), 1) -&
371371
! (-6.459422410E-02,-0.556084037)) < sptol)
372372
!
373373
! print*,' test_sp_1dim_mask', order

0 commit comments

Comments
 (0)