improve software/setParameters

r-geoflow · Nov 26, 2024 · 6f3797c · 6f3797c
1 parent d7427f7
commit 6f3797c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/R/geoflow_software.R b/R/geoflow_software.R
@@ -122,9 +122,8 @@ geoflow_software <- R6Class("geoflow_software",
     },
 
     #'@description Set properties. Function to call to pass argument values for a given \code{geoflow_software}
-    #'@param ... named list of properties
-    setProperties = function(...){
-      props <- list(...)[[1]]
+    #'@param props named list of properties
+    setProperties = function(props){
       propNames <- names(props)
       if(length(propNames)>0){
         for(propName in propNames){
@@ -144,9 +143,8 @@ geoflow_software <- R6Class("geoflow_software",
     },
 
     #'@description Set parameters. Function to call to pass argument values for a given \code{geoflow_software}
-    #'@param ... named list of parameters
-    setParameters = function(...){
-      params <- list(...)[[1]]
+    #'@param params named list of parameters
+    setParameters = function(params){
       paramNames <- names(params)
       if(length(paramNames)>0){
         for(paramName in paramNames){

diff --git a/R/initWorkflow.R b/R/initWorkflow.R
@@ -221,7 +221,7 @@ initWorkflow <- function(file, dir = ".", jobDirPath = NULL, handleMetadata = TR
         config$logger.info(sprintf("Configuring %s software '%s' (%s)", software$type, software$id, software$software_type))
         target_software$setId(software$id)
         target_software$setType(software$type)
-        if(!is.null(software$parameters)) target_software$setParameters(unlist(software$parameters))
+        if(!is.null(software$parameters)) target_software$setParameters(software$parameters)
 
         #check software dependencies
         target_software$checkPackages()