Skip to content

addition of stdlib_experimental_stats mean #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 27, 2020
Merged

addition of stdlib_experimental_stats mean #124

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d9b916
addition of stdlib_experimental_stats mean
jvdp1 Jan 23, 2020
c7a6070
Install fypp on Windows (#5)
certik Jan 23, 2020
e586bff
stat_mean_dev_2: replacing loops by sum for real arrays
jvdp1 Jan 24, 2020
4005374
Merge branch 'stat_mean_dev_1' into stat_mean_dev_2
jvdp1 Jan 24, 2020
8d9e475
stat_mean_dev_3: replace all loops by the function sum
jvdp1 Jan 24, 2020
dedc284
stat_mean_dev_3: add kind=int64 in function size
jvdp1 Jan 24, 2020
26f23a5
add CMAKE_MAXIMUM_RANK
jvdp1 Jan 24, 2020
bf41273
Removed loops and add CMAKE_MAXIMUM_RANK
jvdp1 Jan 24, 2020
c8bf3c1
stat_mean_dev_1: limited to 4 dimensions
jvdp1 Jan 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stat_mean_dev_2: replacing loops by sum for real arrays
  • Loading branch information
@jvdp1
jvdp1 committed Jan 24, 2020
commit e586bffd3e15b698cc71488bf73b3badafe8b5fb
64 changes: 6 additions & 58 deletions src/stdlib_experimental_stats_mean.fypp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@ module function mean_1_${k1}$_${k1}$(x) result(res)
${t1}$, intent(in) :: x(:)
${t1}$ :: res

integer :: i1

res = 0.0_${k1}$
do i1 = 1, size(x)
res = res + x(i1)
end do
res = res / real(size(x), ${k1}$)
res = sum(x) / real(size(x), ${k1}$)

end function mean_1_${k1}$_${k1}$
#:endfor
Expand All @@ -51,15 +45,7 @@ module function mean_2_all_${k1}$_${k1}$(x) result(res)
${t1}$, intent(in) :: x(:,:)
${t1}$ :: res

integer :: i1, i2

res = 0.0_${k1}$
do i2 = 1, size(x, 2)
do i1 = 1, size(x, 1)
res = res + x(i1, i2)
end do
end do
res = res / real(size(x), ${k1}$)
res = sum(x) / real(size(x), ${k1}$)

end function mean_2_all_${k1}$_${k1}$
#:endfor
Expand Down Expand Up @@ -88,29 +74,15 @@ module function mean_2_${k1}$_${k1}$(x, dim) result(res)
integer, intent(in) :: dim
${t1}$ :: res(size(x)/size(x, dim))

integer :: i1, i2

res = 0.0_${k1}$

select case(dim)
case(1)
do i2 = 1, size(x, 2)
do i1 = 1, size(x, 1)
res(i2) = res(i2) + x(i1, i2)
end do
end do
res = sum(x, 1) / real(size(x, 1), ${k1}$)
case(2)
do i2 = 1, size(x, 2)
do i1 = 1, size(x, 1)
res(i1) = res(i1) + x(i1, i2)
end do
end do
res = sum(x, 2) / real(size(x, 2), ${k1}$)
case default
call error_stop("ERROR (mean): wrong dimension")
end select

res = res / real(size(x, dim), ${k1}$)

end function mean_2_${k1}$_${k1}$
#:endfor

Expand Down Expand Up @@ -180,19 +152,7 @@ module function mean_${rank}$_all_${k1}$_${k1}$(x) result(res)
${t1}$, intent(in) :: x${ranksuffix(rank)}$
${t1}$ :: res

integer :: ${varlist("i",1,rank)}$

res = 0.0_${k1}$

#:for fj in range(rank,0,-1)
${" "* (rank - fj)}$do i${varsuffix(fj)}$ = 1, size(x, ${fj}$)
#:endfor
${" "* (rank)}$res = res + x(${varlist("i",1,rank)}$)
#:for fj in range(rank,0,-1)
${" "* (fj-1)}$end do
#:endfor

res = res / real(size(x), ${k1}$)
res = sum(x) / real(size(x), ${k1}$)

end function mean_${rank}$_all_${k1}$_${k1}$
#:endfor
Expand Down Expand Up @@ -233,27 +193,15 @@ module function mean_${rank}$_${k1}$_${k1}$(x, dim) result(res)
#:endfor
merge(size(x,${rank-1}$),size(x,${rank}$),mask = ${rank-1}$ < dim ) )

integer :: ${varlist("i",1,rank)}$

res = 0.0_${k1}$

select case(dim)
#:for fi in range(1,rank+1)
case(${fi}$)
#:for fj in range(rank,0,-1)
${" "* (rank - fj)}$do i${varsuffix(fj)}$ = 1, size(x, ${fj}$)
#:endfor
${" "* (rank)}$res(${varlistskip("i", rank, fi)}$) = res(${varlistskip("i", rank, fi)}$) + x(${varlist("i",1,rank)}$)
#:for fj in range(rank,0,-1)
${" "* (fj-1)}$end do
#:endfor
res=sum(x, ${fi}$) / real(size(x, ${fi}$), ${k1}$)
#:endfor
case default
call error_stop("ERROR (mean): wrong dimension")
end select

res = res / real(size(x, dim), ${k1}$)

end function mean_${rank}$_${k1}$_${k1}$
#:endfor
#:endfor
Expand Down