From de5ad2241a2b3031cf179b14583afe5f17772236 Mon Sep 17 00:00:00 2001
From: Sebastian Henz <sebastian.henz@ufz.de>
Date: Fri, 28 Feb 2020 11:37:05 +0100
Subject: [PATCH] Change the way stress_tox_ca is calculated to make the steps
 more logical. Does not change the results.

---
 R/predict_mixture.R | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/R/predict_mixture.R b/R/predict_mixture.R
index 253503e..f1bb632 100644
--- a/R/predict_mixture.R
+++ b/R/predict_mixture.R
@@ -67,6 +67,7 @@ predict_mixture <- function(model_1,
         model_1$effect_tox_mod,
         data.frame(concentration = concentration_1 + concentration_2_equivalent)
     )
+    stress_tox_ca_1 <- effect_to_stress(effect_tox_ca_1)
 
     response_level_1 <- 100 - predicted_model_1$effect_tox / model_1$args$effect_max * 100
     response_level_1 <- clamp(response_level_1, 1e-10, 100 - 1e-10)
@@ -79,8 +80,9 @@ predict_mixture <- function(model_1,
         model_2$effect_tox_mod,
         data.frame(concentration = concentration_2 + concentration_1_equivalent)
     )
+    stress_tox_ca_2 <- effect_to_stress(effect_tox_ca_2)
 
-    stress_tox_ca <- effect_to_stress(effect_tox_ca_1 * 0.5 + effect_tox_ca_2 * 0.5)
+    stress_tox_ca <- (stress_tox_ca_1 + stress_tox_ca_2) / 2
 
     # sys -----------------------------------------------------------------
     sys_1 <- predict(model_1$sys_tox_mod, data.frame(stress_tox = stress_tox_ca))
-- 
GitLab