Merge branch 'develop' into 'master'

rename internal adjust_plot_concentrations

See merge request !22

DESCRIPTION

@@ -2,7 +2,7 @@ Package: stressaddition
 Type: Package
 Title: Modeling Tri-Phasic Concentration-Response Relationships
 Version: 2.2.0
-Date: 2020-02-27
+Date: 2020-02-28
 Authors@R: c(person("Sebastian", 
                     "Henz", 
                     role = c("aut", "cre"), 

R/helpers.R

@@ -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.
-    # Deals with the concentrations which are unnecessary for plotting.
-    # This means it removes the concentrations in the gap and scales the
-    # concentrations left of the gap up.
+    # Deals with the concentrations which are unnecessary for plotting. This
+    # means it removes the concentrations in the gap and increases the
+    # concentrations left of the gap.
     curves <- model$curves
     gap_idx <- min(which(!curves$use_for_plotting))
 

R/plot_effect.R

@@ -30,7 +30,7 @@ plot_effect <- function(model,
         which <- which[which %in% valid_names]
     }
 
-    temp <- adjust_smooth_concentrations(model)
+    temp <- adjust_plot_concentrations(model)
     curves <- temp$curves
     log_ticks <- get_log_ticks(curves$concentration)
     concentration <- c(curves$concentration[1], model$args$concentration[-1])

R/plot_stress.R

@@ -35,7 +35,7 @@ plot_stress <- function(model,
         }
     }
 
-    temp <- adjust_smooth_concentrations(model)
+    temp <- adjust_plot_concentrations(model)
     curves <- temp$curves
     log_ticks <- get_log_ticks(curves$concentration)
     concentration <- c(curves$concentration[1], model$args$concentration[-1])