Skip to content

change error message to be more human readable #16

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

Open
christophertull wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change error message to be more human readable #16

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
11 changes: 8 additions & 3 deletions R/tier_calcs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,20 @@ calculate_variable_bill <- function(data, rate_type, start_name="tier_starts",
tier_starts <- parse_numerics(tier_start_str)
tier_prices <- parse_numerics(tier_price_str)
#check that prices are same length as tiers
stopifnot(length(tier_starts)==length(tier_prices))
if(length(tier_starts)!=length(tier_prices)){
stop("Length of tier_starts and tier_prices is not equal. This could also be
caused by a uniform rate specified without the flat_rate field.")
}
bill_info <- calculate_tiered_charge(data, tier_starts, tier_prices, is_sewer=is_sewer)
}
else if(rate_type == "Budget"){
tier_starts <- get_budget_tiers(data, parse_strings(tier_start_str), budget_col=budget_col)
tier_prices <- parse_numerics(tier_price_str )
#check that prices are same length as tiers
stopifnot(ncol(tier_starts)==length(tier_prices))
if(ncol(tier_starts)!=length(tier_prices)){
stop("Length of tier_starts and tier_prices is not equal. This could also be
caused by a uniform rate specified without the flat_rate field.")
}
bill_info <- calculate_tiered_charge(data, tier_starts, tier_prices, budget_based=TRUE, is_sewer=is_sewer)
}

Expand Down Expand Up @@ -140,7 +146,6 @@ get_budget_tiers <- function(data, tier_start_strs, budget_col){
else if( grepl("%", t) ){
percent <- as.numeric( gsub("[^0-9\\.]", "", t, "") )
stopifnot(is.finite(percent))

budget_tiers[,i] <- round((percent/100)*budget)
}
}
Expand Down