Merge branch 'develop' into 'master'

Fix regression in plot_effect()

See merge request !20

DESCRIPTION

 Package: stressaddition
 Type: Package
 Title: Modeling Tri-Phasic Concentration-Response Relationships
-Version: 2.1.0
-Date: 2020-02-25
+Version: 2.1.1
+Date: 2020-02-26
 Authors@R: c(person("Sebastian", 
                     "Henz", 
                     role = c("aut", "cre"), 

NEWS.md

+# stressaddition 2.1.1
+
+* Restore the default behaviour of `plot_effect()` to also show `effect_tox` and `effect_tox_env`.
+
 # stressaddition 2.1.0
 
 * The functions `plot_effect()` and `plot_stress()` gain a `which` argument that controls which curves are plotted. Consequently, the `show_LL5_model` argument of `plot_effect()` was removed.

R/plot_effect.R

@@ -11,9 +11,9 @@ plot_effect <- function(model,
     curve_names <- names(model$curves)
     valid_names <- curve_names[startsWith(curve_names, "effect")]
     if (is.null(which)) {
-        which <- c("effect_tox_sys")
+        which <- c("effect_tox", "effect_tox_sys")
         if (model$with_env) {
-            which <- c(which, "effect_tox_env_sys")
+            which <- c(which, "effect_tox_env", "effect_tox_env_sys")
         }
     } else if ("all" %in% which) {
         if (length(which) == 1) {