Skip to content
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

Jump to bottom

Switch to Position-Based Percentile Calculation for Regulatory Compliance | timeAverage #396

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Switch to Position-Based Percentile Calculation for Regulatory Compliance | timeAverage #396

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7319b9f
Update timeAverage.R
marcelooyaneder Feb 9, 2023
50ce31e
Merge branch 'davidcarslaw:master' into master
marcelooyaneder Aug 27, 2024
ed02179
Update timeAverage.R
marcelooyaneder Aug 27, 2024
02b3173
Update timeAverage.R
marcelooyaneder Aug 28, 2024
16be225
Update timeAverage.R
marcelooyaneder Aug 28, 2024
8eeb1cc
Update timeAverage.R
marcelooyaneder Aug 28, 2024
c888596
Update timeAverage.R
marcelooyaneder Aug 28, 2024
4671f9e
Update timeAverage.R
marcelooyaneder Aug 29, 2024
a47ee16
Update timeAverage.R
marcelooyaneder Aug 29, 2024
3871d12
Update timeAverage.R
marcelooyaneder Aug 29, 2024
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
12 changes: 10 additions & 2 deletions R/timeAverage.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
#' }
timeAverage <- function(mydata, avg.time = "day", data.thresh = 0,
statistic = "mean", type = "default", percentile = NA,
percentileInterpolation=TRUE,
start.date = NA, end.date = NA, interval = NA,
vector.ws = FALSE, fill = FALSE, progress = TRUE, ...) {

Expand Down Expand Up @@ -236,9 +237,16 @@ timeAverage <- function(mydata, avg.time = "day", data.thresh = 0,
}
}

if (statistic == "percentile") {
if (statistic == "percentile" & percentileInterpolation==TRUE) {
FUN <- function(x)
quantile(x, probs = percentile, na.rm = TRUE)
quantile(x, probs = percentile,na.rm = TRUE)
} else if (statistic == "percentile" & percentileInterpolation==FALSE){
FUN <-function(x){
sorted_data <- sort(na.omit(x))
n <- length(sorted_data)
position <- trunc(((percentile) * n)+sign(((percentile) * n))*0.5)
return(sorted_data[position])
}
}

calc.mean <- function(mydata, start.date) { ## function to calculate means
Expand Down