Skip to content

chi_calc determination of WA State data improved #21

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
rwbuie merged 1 commit into from
Apr 14, 2025
Merged

chi_calc determination of WA State data improved #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions R/chi_calc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,11 @@ chi_calc <- function(ph.data = NULL,
tempbv <- unique(na.omit(c(tempbv1, tempbv2)))
tempend <- current_row$end
tempstart <- current_row$start
temptab <- current_row$tab

# use calc()----
if(rate == FALSE){ # standard proportion analysis
if(any(grepl('wastate', tempbv))){
if(temptab == '_wastate'){
tempest <- rads::calc(ph.data = ph.data[chi_year >= tempstart & chi_year <= tempend],
what = current_row$indicator_key,
by = tempbv,
Expand All @@ -214,7 +215,7 @@ chi_calc <- function(ph.data = NULL,
}
}
if(rate == TRUE){
if(any(grepl('wastate', tempbv))){
if(temptab == '_wastate'){
tempest <- rads::calc(ph.data = ph.data[chi_year >= tempstart & chi_year <= tempend],
what = current_row$indicator_key,
by = tempbv,
Expand Down