Merge branch...

Merge branch '137-fix-extractoutputsmodel-function-to-manage-the-new-elements-of-outputsmodel' into 'dev'

Resolve "Fix .ExtractOutputsModel function to manage the new elements of OutputsModel"

Closes #137

See merge request !65

R/SeriesAggreg.OutputsModel.R

@@ -2,6 +2,6 @@ SeriesAggreg.OutputsModel <- function(x, Format, ...) {
   SeriesAggreg.list(x,
                     Format,
                     ConvertFun = NA,
-                    except = c("WarmUpQsim", "StateEnd", "Param"),
+                    except = c("RunOptions", "StateEnd"),
                     ...)
 }

R/SeriesAggreg.list.R

@@ -100,7 +100,8 @@ SeriesAggreg.list <- function(x,
 
     # Exploration of embedded lists and data.frames
     if (is.null(recursive) || recursive) {
-      listCols <- x[sapply(x, inherits, "list")]
+      listCols <- x[!names(x) %in% except]
+      listCols <- listCols[sapply(listCols, inherits, "list")]
       dfCols <- x[sapply(x, inherits, "data.frame")]
       dfCols <- c(dfCols, x[sapply(x, inherits, "matrix")])
       listCols <- listCols[setdiff(names(listCols), names(dfCols))]