Merge pull request #3 from KWB-R/dev

Dev

Author: hsonne

DESCRIPTION

@@ -24,6 +24,7 @@ Imports:
     kwb.utils,
     magrittr,
     methods,
+    parallel,
     xml2
 Remotes: 
     github::kwb-r/kwb.abimo,

NAMESPACE

@@ -3,9 +3,8 @@
 export("%>%")
 export(BERLIN_TYPES_TO_USAGE_YIELD_IRRIGATION)
 export(abimo_config_to_config)
-export(actualEvaporation)
+export(actualEvaporationWaterbodyOrPervious)
 export(call_with_data)
-export(getDefaultConfiguration)
 export(getPotentialEvaporation)
 export(getPrecipitation)
 export(getSoilProperties)
@@ -14,19 +13,32 @@ export(index_string_to_integers)
 export(list_to_data_frame_with_keys)
 export(prepareInputData)
 export(realEvapoTranspiration)
+export(run_rabimo)
 export(yearlyHeightToVolumeFlow)
 importFrom(dplyr,left_join)
+importFrom(kwb.utils,catAndRun)
 importFrom(kwb.utils,catIf)
+importFrom(kwb.utils,checkForMissingColumns)
+importFrom(kwb.utils,createAccessor)
+importFrom(kwb.utils,defaultIfNULL)
+importFrom(kwb.utils,getAttribute)
+importFrom(kwb.utils,inRange)
 importFrom(kwb.utils,moveColumnsToFront)
 importFrom(kwb.utils,multiColumnLookup)
 importFrom(kwb.utils,printIf)
 importFrom(kwb.utils,removeColumns)
 importFrom(kwb.utils,removeElements)
+importFrom(kwb.utils,renameAndSelect)
 importFrom(kwb.utils,renameColumns)
 importFrom(kwb.utils,resetRowNames)
 importFrom(kwb.utils,safeRowBindAll)
 importFrom(kwb.utils,selectColumns)
 importFrom(kwb.utils,selectElements)
 importFrom(kwb.utils,stopFormatted)
+importFrom(kwb.utils,stringList)
 importFrom(magrittr,"%>%")
 importFrom(methods,formalArgs)
+importFrom(parallel,detectCores)
+importFrom(parallel,makeCluster)
+importFrom(parallel,parLapply)
+importFrom(parallel,stopCluster)

R/abimo_config_to_config.R

@@ -1,7 +1,9 @@
 #' Convert Abimo Configuration to List
 #'
 #' @param abimo_config as returned by \code{kwb.abimo:::read_config}
-#' @return list of data frames
+#' @return list with elements \code{"potentialEvaporation"},
+#'   \code{"runoffFactors"}, \code{"bagrovValues"}, \code{"diverse"},
+#'   \code{"resultDigits"}
 #' @export
 abimo_config_to_config <- function(abimo_config)
 {
@@ -37,7 +39,39 @@ abimo_config_to_config <- function(abimo_config)
   result[["potentialEvaporation"]] <- rbind(evap_water, evap_else) %>%
     move_columns_to_front("isWaterbody")
 
-  remove_elements(result, c(element_water, element_else))
+  convert_element <- function(config, from, to, convert = identity) {
+    x <- select_elements(config, from)
+    config[[to]] <- stats::setNames(
+      convert(select_columns(x, "value")),
+      select_columns(x, "key")
+    )
+    remove_elements(config, from)
+  }
+
+  result %>%
+    remove_elements(c(
+      element_water,
+      element_else
+    )) %>%
+    convert_element(
+      from = "Infiltrationsfaktoren",
+      to = "runoffFactors",
+      convert = function(x) 1 - as.numeric(x)
+    ) %>%
+    convert_element(
+      from = "Bagrovwerte",
+      to = "bagrovValues",
+      convert = as.numeric
+    ) %>%
+    convert_element(
+      from = "Diverse",
+      to = "diverse"
+    ) %>%
+    convert_element(
+      from = "ErgebnisNachkommaStellen",
+      to = "resultDigits",
+      convert = as.numeric
+    )
 }
 
 # get_all_item_data ------------------------------------------------------------