Merge pull request #61 from rte-antares-rpackage/dev_v83

Evolutions 8.3.2

R/createBindingConstraint.R

@@ -143,8 +143,8 @@ createBindingConstraint_ <- function(bindingConstraints,
                                      enabled,
                                      timeStep,
                                      operator,
-                                     filter_year_by_year,
-                                     filter_synthesis,
+                                     filter_year_by_year = "hourly, daily, weekly, monthly, annual",
+                                     filter_synthesis = "hourly, daily, weekly, monthly, annual",
                                      coefficients,
                                      overwrite,
                                      links,
@@ -170,8 +170,8 @@ createBindingConstraint_ <- function(bindingConstraints,
     operator = operator
   )
 
-  # Marginal price granularity (v8.4)
-  if (opts$antaresVersion >= 840){
+  # Marginal price granularity (v8.3.2)
+  if (opts$antaresVersion >= 832){
     iniParams$`filter-year-by-year` <- filter_year_by_year
     iniParams$`filter-synthesis` <- filter_synthesis
   }

R/editBindingConstraint.R

@@ -33,6 +33,8 @@ editBindingConstraint <- function(name,
                                   enabled = NULL,
                                   timeStep = NULL,
                                   operator = NULL,
+                                  filter_year_by_year = NULL,
+                                  filter_synthesis = NULL,
                                   coefficients = NULL,
                                   opts = antaresRead::simOptions()) {
   assertthat::assert_that(inherits(opts, "simOptions"))
@@ -93,6 +95,12 @@ editBindingConstraint <- function(name,
   if(!is.null(enabled)) iniParams$enabled <- enabled
   if(!is.null(timeStep)) iniParams$type <- timeStep
   if(!is.null(operator)) iniParams$operator <- operator
+  if(!is.null(filter_year_by_year)){
+    if(opts$antaresVersion >= 832) iniParams$`filter-year-by-year` <- filter_year_by_year
+  }
+  if(!is.null(filter_synthesis)){
+    if(opts$antaresVersion >= 832) iniParams$`filter-synthesis` <- filter_synthesis
+  }
 
   bindingConstraints[[bc_update_pos]]$name <- iniParams$name
   bindingConstraints[[bc_update_pos]]$id <- iniParams$id

R/updateOptimizationSettings.R

@@ -15,7 +15,7 @@
 #' @param include.strategicreserve true or false
 #' @param include.spinningreserve true or false
 #' @param include.primaryreserve true or false
-#' @param include.exportmps true or false
+#' @param include.exportmps true or false (since v8.3.2 can take also : none, optim-1, optim-2, both-optims)
 #' @param power.fluctuations free modulations, minimize excursions or minimize ramping
 #' @param shedding.strategy share margins
 #' @param shedding.policy shave peaks or minimize duration
@@ -83,8 +83,17 @@ updateOptimizationSettings <- function(simplex.range = NULL,
     assertthat::assert_that(include.spinningreserve %in% c("true", "false"))
   if (!is.null(include.primaryreserve))
     assertthat::assert_that(include.primaryreserve %in% c("true", "false"))
-  if (!is.null(include.exportmps))
-    assertthat::assert_that(include.exportmps %in% c("true", "false"))
+  if (!is.null(include.exportmps)){
+    if (opts$antaresVersion >= 832){
+      assertthat::assert_that(include.exportmps %in% c("true", "false",
+                                                       "none", "optim-1", "optim-2", "both-optims"))
+      if (include.exportmps == "true") include.exportmps <- "both-optims"
+      if (include.exportmps == "false") include.exportmps <- "none"
+    } else {
+      assertthat::assert_that(include.exportmps %in% c("true", "false"))
+    }
+  }
+
 
   if (!is.null(power.fluctuations))
     assertthat::assert_that(