From bdb24b8f0c6a60dbfdc76c10c454a1b76b71d1aa Mon Sep 17 00:00:00 2001
From: Samuel Buis <samuel.buis@inra.fr>
Date: Tue, 12 Sep 2023 15:29:53 +0200
Subject: [PATCH 1/2] FIXed test on presence of NA in model results

now test Inf or NA values only for variables and dates included in observations.
---
 R/main_crit.R | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/R/main_crit.R b/R/main_crit.R
index d3a172f..d0f4573 100644
--- a/R/main_crit.R
+++ b/R/main_crit.R
@@ -367,18 +367,33 @@ main_crit <- function(param_values, crit_options) {
     warning("Intersection of simulations and observations is empty (no date and/or variable in common)!")
     return(crit <- NA)
   }
-  if (any(sapply(obs_sim_list$sim_list, function(x) any(sapply(x, is.nan)))) ||
-    any(sapply(obs_sim_list$sim_list,
-               function(x) any(sapply(x, is.infinite))))) {
-    warning(
-      "The model wrapper returned NaN or infinite values: \n ",
-      obs_sim_list$sim_list, "\n Estimated parameters: ",
-      paste(param_names, collapse = " "), ", values: ",
-      paste(param_values, collapse = " ")
-    )
-    return(crit <- NA)
-  }
 
+  for (sit in names(obs_sim_list$sim_list)) {
+    var_list <- lapply(names(obs_sim_list$sim_list[[sit]]), function(x) {
+      if (any(is.infinite(obs_sim_list$sim_list[[sit]][!is.na(obs_sim_list$obs_list[[sit]][,x]),x])) ||
+          any(is.na(obs_sim_list$sim_list[[sit]][!is.na(obs_sim_list$obs_list[[sit]][,x]),x]))) {
+        return(list(obs_sim_list$sim_list[[sit]]$Date[is.infinite(obs_sim_list$sim_list[[sit]][!is.na(obs_sim_list$obs_list[[sit]][,x]),x]) |
+                                                        is.na(obs_sim_list$sim_list[[sit]][!is.na(obs_sim_list$obs_list[[sit]][,x]),x])]))
+      }  else {
+        return(NULL)
+      }
+    })
+    names(var_list) <- names(obs_sim_list$sim_list[[sit]])
+    if (!is.null(unlist(var_list))) {
+      warning(
+        "The model wrapper returned NA or infinite values for situation ",sit,
+        paste(sapply(names(var_list), function(x) {
+          if (!is.null(var_list[x])) paste(" \n variable ",x," at date(s) ",
+                                          paste(var_list[x], collapse = " "))
+          })),
+        "\n for estimated parameters: ",
+        paste(param_names, collapse = " "), ", and values: ",
+        paste(param_values, collapse = " "),
+        "\n The optimized criterion is set to NA."
+      )
+      return(crit <- NA)
+    }
+  }
 
   # Filter reserved columns that should not be taken into account in the computation of the criterion
   obs_sim_list$sim_list <- sapply(obs_sim_list$sim_list,

From 8efc0de41417ce379858988f5f39acf2924db0bc Mon Sep 17 00:00:00 2001
From: Samuel Buis <samuel.buis@inra.fr>
Date: Tue, 28 Nov 2023 13:56:06 +0100
Subject: [PATCH 2/2] Added comments

---
 R/main_crit.R | 1 +
 1 file changed, 1 insertion(+)

diff --git a/R/main_crit.R b/R/main_crit.R
index d0ea866..b518acf 100644
--- a/R/main_crit.R
+++ b/R/main_crit.R
@@ -394,6 +394,7 @@ main_crit <- function(param_values, crit_options) {
     return(crit <- NA)
   }
 
+  # check presence of Inf/NA in simulated results where obs is not NA
   for (sit in names(obs_sim_list$sim_list)) {
     var_list <- lapply(names(obs_sim_list$sim_list[[sit]]), function(x) {
       if (any(is.infinite(obs_sim_list$sim_list[[sit]][!is.na(obs_sim_list$obs_list[[sit]][,x]),x])) ||