Skip to content
Snippets Groups Projects
Commit 42d72b41 authored by Sebastian Henz's avatar Sebastian Henz
Browse files

Merge branch 'develop' into 'master'

rename internal adjust_plot_concentrations

See merge request !22
parents 0ccd1d23 5691c770
No related branches found
No related tags found
1 merge request!22rename internal adjust_plot_concentrations
Pipeline #2871 passed with stage
in 9 minutes and 21 seconds
...@@ -2,7 +2,7 @@ Package: stressaddition ...@@ -2,7 +2,7 @@ Package: stressaddition
Type: Package Type: Package
Title: Modeling Tri-Phasic Concentration-Response Relationships Title: Modeling Tri-Phasic Concentration-Response Relationships
Version: 2.2.0 Version: 2.2.0
Date: 2020-02-27 Date: 2020-02-28
Authors@R: person("Sebastian", "Henz", role = c("aut", "cre"), Authors@R: person("Sebastian", "Henz", role = c("aut", "cre"),
email = "sebastian.henz@ufz.de", email = "sebastian.henz@ufz.de",
comment = c(ORCID = "0000-0001-8299-8852")) comment = c(ORCID = "0000-0001-8299-8852"))
......
...@@ -33,11 +33,11 @@ get_log_ticks <- function(x) { ...@@ -33,11 +33,11 @@ get_log_ticks <- function(x) {
} }
adjust_smooth_concentrations <- function(model) { adjust_plot_concentrations <- function(model) {
# Helper for the plot functions, not exported. # Helper for the plot functions, not exported.
# Deals with the concentrations which are unnecessary for plotting. # Deals with the concentrations which are unnecessary for plotting. This
# This means it removes the concentrations in the gap and scales the # means it removes the concentrations in the gap and increases the
# concentrations left of the gap up. # concentrations left of the gap.
curves <- model$curves curves <- model$curves
gap_idx <- min(which(!curves$use_for_plotting)) gap_idx <- min(which(!curves$use_for_plotting))
......
...@@ -30,7 +30,7 @@ plot_effect <- function(model, ...@@ -30,7 +30,7 @@ plot_effect <- function(model,
which <- which[which %in% valid_names] which <- which[which %in% valid_names]
} }
temp <- adjust_smooth_concentrations(model) temp <- adjust_plot_concentrations(model)
curves <- temp$curves curves <- temp$curves
log_ticks <- get_log_ticks(curves$concentration) log_ticks <- get_log_ticks(curves$concentration)
concentration <- c(curves$concentration[1], model$args$concentration[-1]) concentration <- c(curves$concentration[1], model$args$concentration[-1])
......
...@@ -35,7 +35,7 @@ plot_stress <- function(model, ...@@ -35,7 +35,7 @@ plot_stress <- function(model,
} }
} }
temp <- adjust_smooth_concentrations(model) temp <- adjust_plot_concentrations(model)
curves <- temp$curves curves <- temp$curves
log_ticks <- get_log_ticks(curves$concentration) log_ticks <- get_log_ticks(curves$concentration)
concentration <- c(curves$concentration[1], model$args$concentration[-1]) concentration <- c(curves$concentration[1], model$args$concentration[-1])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment