bugfixes

Author: KarinSchork

R/05_writing_results.R

@@ -133,7 +133,8 @@ assemble_results <- function(X,
     substance = rep(substance, nrow(X)),
     concentration = X$Concentration,
     measurement = X$Measurement,
-    removed_while_cleaning = !(X$Concentration %in% concentrations_after_cleaning),
+    removed_while_cleaning = !(X$Concentration %in% concentrations_after_cleaning) |
+      is.na(X$Measurement) | X$Measurement == 0 | X$Concentration == 0,
     percentage_bias = NA,
     response_factor = NA,
     RF_within_thres = NA,
@@ -142,6 +143,10 @@ assemble_results <- function(X,
   rownames(result_table_obs) <- NULL
 
   ## result only for concentrations that were not removed during cleaning:
+
+  resFacDataV2 <<- resFacDataV
+  result_table_obs2 <<- result_table_obs
+
   result_table_obs$response_factor[!result_table_obs$removed_while_cleaning] <- unlist(resFacDataV)
   result_table_obs$RF_within_thres <- result_table_obs$response_factor <= hLineUpper & result_table_obs$response_factor >= hLineLow
 

R/NEW_06_plotting.R

@@ -157,8 +157,8 @@ plotCalibraCurve <- function(RES,
     if (show_data_points) {
       pl <- pl +
         ggplot2::geom_point(size = 1.7, color = point_colour) +
-        ggplot2::scale_alpha_manual(labels = c("No", "Yes"), values = c("Yes" = 1, "No" = 0.1), name = "Linear range") #+
-        #ggplot2::facet_wrap(substance ~., scales = multiplot_scales, nrow = multiplot_nrow, ncol = multiplot_ncol)
+        ggplot2::scale_alpha_manual(labels = c("No", "Yes"), values = c("Yes" = 1, "No" = 0.1), name = "Linear range") +
+        ggplot2::facet_wrap(substance ~., scales = multiplot_scales, nrow = multiplot_nrow, ncol = multiplot_ncol)
     }
 
     ### add calibration curve