mv_to_central_moment: simplification

Author: jvdp1

src/stdlib_experimental_stats_moment.fypp

@@ -82,28 +82,16 @@ contains
         logical, intent(in), optional :: mask
         ${t1}$ :: res${reduced_shape('x', rank, 'dim')}$
 
-        integer :: i
-        real(${k1}$) :: n
-
         if (.not.optval(mask, .true.)) then
           res = ieee_value(1._${k1}$, ieee_quiet_nan)
           return
         end if
 
-        n = size(x, dim)
-
-        res = 0
-        select case(dim)
-          #:for fi in range(1, rank+1)
-          case(${fi}$)
-            do i = 1, size(x, ${fi}$)
-              res = res + (x${select_subarray(rank, [(fi, 'i')])}$ - center)**order
-            end do
-          #:endfor
-          case default
-            call error_stop("ERROR (moment): wrong dimension")
-        end select
-        res = res / n
+        if (dim >= 1 .and. dim <= ${rank}$) then
+          res = sum((x - center)**order, dim) / size(x, dim)
+        else
+          call error_stop("ERROR (moment): wrong dimension")
+        end if
 
       end function ${RName}$
     #:endfor
@@ -169,29 +157,16 @@ contains
         logical, intent(in), optional :: mask
         real(dp) :: res${reduced_shape('x', rank, 'dim')}$
 
-        integer :: i
-        real(dp) :: n
-
         if (.not.optval(mask, .true.)) then
           res = ieee_value(1._dp, ieee_quiet_nan)
           return
         end if
 
-        n = size(x, dim)
-
-        res = 0
-        select case(dim)
-          #:for fi in range(1, rank+1)
-          case(${fi}$)
-            do i = 1, size(x, ${fi}$)
-              res = res + (real(x${select_subarray(rank, [(fi, 'i')])}$, dp) -&
-                center)**order
-            end do
-          #:endfor
-          case default
-            call error_stop("ERROR (moment): wrong dimension")
-        end select
-        res = res / n
+        if (dim >= 1 .and. dim <= ${rank}$) then
+          res = sum( (real(x, dp) - center)**order, dim) / size(x, dim)
+        else
+          call error_stop("ERROR (moment): wrong dimension")
+        end if
 
       end function ${RName}$
     #:endfor
@@ -308,30 +283,11 @@ contains
         logical, intent(in) :: mask${ranksuffix(rank)}$
         ${t1}$ :: res${reduced_shape('x', rank, 'dim')}$
 
-        integer :: i
-        real(${k1}$) :: n${reduced_shape('x', rank, 'dim')}$
-
-        n = count(mask, dim)
-
-        res = 0
-        select case(dim)
-          #:for fi in range(1, rank+1)
-          case(${fi}$)
-            do i = 1, size(x, ${fi}$)
-              res = res + merge( (x${select_subarray(rank, [(fi, 'i')])}$ -&
-                center)**order,&
-                #:if t1[0] == 'r'
-                  0._${k1}$,&
-                #:else
-                  cmplx(0,0,kind=${k1}$),&
-                #:endif
-                  mask${select_subarray(rank, [(fi, 'i')])}$)
-            end do
-          #:endfor
-          case default
-            call error_stop("ERROR (moment): wrong dimension")
-        end select
-        res = res / n
+        if (dim >= 1 .and. dim <= ${rank}$) then
+          res = sum((x - center)**order, dim, mask) / count(mask, dim)
+        else
+          call error_stop("ERROR (moment): wrong dimension")
+        end if
 
       end function ${RName}$
     #:endfor
@@ -405,25 +361,11 @@ contains
         logical, intent(in) :: mask${ranksuffix(rank)}$
         real(dp) :: res${reduced_shape('x', rank, 'dim')}$
 
-        integer :: i
-        real(dp) :: n${reduced_shape('x', rank, 'dim')}$
-
-        n = count(mask, dim)
-
-        res = 0
-        select case(dim)
-          #:for fi in range(1, rank+1)
-          case(${fi}$)
-            do i = 1, size(x, ${fi}$)
-              res = res + merge((real(x${select_subarray(rank, [(fi, 'i')])}$, dp) -&
-                                  center)**order,&
-                                  0._dp, mask${select_subarray(rank, [(fi, 'i')])}$)
-            end do
-          #:endfor
-          case default
-            call error_stop("ERROR (moment): wrong dimension")
-        end select
-        res = res / n
+        if (dim >= 1 .and. dim <= ${rank}$) then
+          res = sum(( real(x, dp) - center)**order, dim, mask) / count(mask, dim)
+        else
+          call error_stop("ERROR (moment): wrong dimension")
+        end if
 
       end function ${RName}$
     #:endfor