Proper handling of environments in R6 classes

mattwarkentin · Jan 17, 2024 · d63e1a2 · d63e1a2
1 parent 80ddc59
commit d63e1a2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/R/R6ClassModelRun.R b/R/R6ClassModelRun.R
@@ -46,11 +46,11 @@ OpenMppModelRun <-
       #' @field RunMetadata Run metadata.
       RunMetadata = NULL,
 
-      #' @field Parameters Run parameters.
-      Parameters = rlang::env(),
+      #' @field Parameters Model run parameters.
+      Parameters = NULL,
 
-      #' @field Tables Run tables
-      Tables = rlang::env(),
+      #' @field Tables Model run output tables
+      Tables = NULL,
 
       #' @field OpenMppType OpenM++ object type (used for `print()`).
       OpenMppType = 'ModelRun',
@@ -159,6 +159,7 @@ OpenMppModelRun <-
         private$.tables <- total
       },
       .load_table_bindings = function() {
+        self$Tables <- rlang::env()
         purrr::walk(private$.run$Table, \(table) {
           private$.add_table(table$Name)
           f <- function() {
@@ -169,6 +170,7 @@ OpenMppModelRun <-
         })
       },
       .load_run_param_bindings = function() {
+        self$Parameters <- rlang::env()
         purrr::walk(private$.run$Param, \(param) {
           f <- function() {
             param_name <- param$Name

diff --git a/R/R6ClassModelRunSet.R b/R/R6ClassModelRunSet.R
@@ -40,8 +40,8 @@ OpenMppModelRunSet <-
       #' @field OpenMppType OpenM++ object type (used for `print()`).
       OpenMppType = 'ModelRunSet',
 
-      #' @field Tables Run tables
-      Tables = rlang::env(),
+      #' @field Tables Model run output tables
+      Tables = NULL,
 
       #' @description
       #' Create a new OpenMppModelRunSet object.
@@ -130,6 +130,7 @@ OpenMppModelRunSet <-
         private$.tables <- total
       },
       .load_table_bindings = function() {
+        self$Tables <- rlang::env()
         purrr::walk(private$.runs[[1]]$private$.run$Table, \(table) {
           private$.add_table(table$Name)
           f <- function() {

diff --git a/R/R6ClassWorkset.R b/R/R6ClassWorkset.R
@@ -43,7 +43,7 @@ OpenMppWorkset <-
       OpenMppType = 'Workset',
 
       #' @field Parameters Workset parameters.
-      Parameters = rlang::env(),
+      Parameters = NULL,
 
       #' @description
       #' Create a new OpenMppWorkset object.
@@ -284,6 +284,7 @@ OpenMppWorkset <-
       },
       .load_param_bindings = function() {
         private$.params <- NULL
+        self$Parameters <- rlang::env()
         purrr::walk(private$.workset$Param, \(param) {
           private$.add_params(param$Name)
           f <- function(data) {

diff --git a/man/load_model_run.Rd b/man/load_model_run.Rd
diff --git a/man/load_model_runs.Rd b/man/load_model_runs.Rd