Rebase on develop to avoid weird conflicts

Open-Systems-Pharmacology · Apr 2, 2021 · 5c9144d · 5c9144d
1 parent 75fe7ee
commit 5c9144d
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 47 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,8 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
 export(CompareBy)
-export(Dimensions)
-export(DimensionsUnits)
 export(Gender)
 export(HumanPopulation)
 export(IndividualCharacteristics)
@@ -82,6 +80,8 @@ export(loadAgingDataFromCSV)
 export(loadDataRepositoryFromPKML)
 export(loadPopulation)
 export(loadSimulation)
+export(ospDimensions)
+export(ospUnits)
 export(pkAnalysesAsDataFrame)
 export(pkParameterByName)
 export(populationAsDataFrame)

diff --git a/R/init-package.R b/R/init-package.R
@@ -19,5 +19,5 @@ initPackage <- function() {
 
   rClr::clrCallStatic("OSPSuite.R.Api", "InitializeOnce", apiConfig$ref)
 
-  Dimensions <<- enum(allAvailableDimensions())
+  initializeDimensionAndUnitLists()
 }
diff --git a/R/utilities-units.R b/R/utilities-units.R
@@ -221,18 +221,11 @@ getDimensionForUnit <- function(unit) {
 #' @export
 getUnitsForDimension <- function(dimension) {
   validateIsString(dimension)
+  dimension <- encodeUnit(dimension)
   dimensionTask <- getDimensionTask()
   rClr::clrCall(dimensionTask, "AllAvailableUnitNamesFor", dimension)
 }
 
-#' Supported dimensions.
-#'
-#' @include enum.R
-#'
-#' @export
-Dimensions <- list()
-
-
 #' Return an instance of the .NET Task `DimensionTask`
 #' This is purely for optimization purposes
 #'
@@ -247,8 +240,7 @@ getDimensionTask <- function() {
 }
 
 
-
-#'Loop through dimensions and build a list containing an enum of all units available for each dimension
+#' Loop through dimensions and build a list containing an enum of all units available for each dimension
 #' @return enum of all units for each dimension
 #' @export
 getUnitsEnum <- function() {
@@ -267,3 +259,21 @@ getDimensionsEnum <- function() {
   dimensions <- enum(allAvailableDimensions())
   return(dimensions)
 }
+
+
+#' Supported dimensions defined as a named list
+#'
+#' ospDimensions$Mass => "Mass"
+#' @export
+ospDimensions <- list()
+
+#' Supported units defined as a named list of lists
+#'
+#' ospUnits$Mass$kg => "kg"
+#' @export
+ospUnits <- list()
+
+initializeDimensionAndUnitLists <- function() {
+  ospDimensions <<- getDimensionsEnum()
+  ospUnits <<- getUnitsEnum()
+}
diff --git a/R/utilities.R b/R/utilities.R
@@ -49,10 +49,6 @@ ifNotNull <- function(condition, outputIfNotNull, outputIfNull = NULL) {
 #' @param unit Unit to encode
 #' @import stringr
 encodeUnit <- function(unit) {
-
-  # TODO maybe we don't even need to load from .NET
-  # dimensionTask <- getNetTask("DimensionTask")
-  # ospsuiteEnv$muSymbol <- rClr::clrGet(dimensionTask, "MuSymbol")
   mu <- ospsuiteEnv$muSymbol
   unit <- enc2utf8(unit)
   unit <- str_replace(unit, rawToChar(as.raw(c(0xce, 0xbc))), mu)

diff --git a/inst/lib/OSPSuite.Assets.dll b/inst/lib/OSPSuite.Assets.dll
diff --git a/inst/lib/OSPSuite.Core.dll b/inst/lib/OSPSuite.Core.dll
diff --git a/inst/lib/OSPSuite.Infrastructure.Autofac.dll b/inst/lib/OSPSuite.Infrastructure.Autofac.dll
diff --git a/inst/lib/OSPSuite.Infrastructure.Import.dll b/inst/lib/OSPSuite.Infrastructure.Import.dll
diff --git a/inst/lib/OSPSuite.Infrastructure.dll b/inst/lib/OSPSuite.Infrastructure.dll
diff --git a/inst/lib/OSPSuite.R.dll b/inst/lib/OSPSuite.R.dll
diff --git a/man/getDimensionsEnum.Rd b/man/getDimensionsEnum.Rd
diff --git a/man/DimensionsUnits.Rd → man/ospDimensions.Rd b/man/DimensionsUnits.Rd → man/ospDimensions.Rd
diff --git a/man/Dimensions.Rd → man/ospUnits.Rd b/man/Dimensions.Rd → man/ospUnits.Rd
diff --git a/man/toUnit.Rd b/man/toUnit.Rd
diff --git a/packages.config b/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OSPSuite.Assets" version="10.0.113"/>
-  <package id="OSPSuite.Core" version="10.0.113"/>
-  <package id="OSPSuite.Infrastructure" version="10.0.113"/>
-  <package id="OSPSuite.Infrastructure.Import" version="10.0.113"/>
-  <package id="OSPSuite.Infrastructure.Autofac" version="10.0.113"/>
-  <package id="OSPSuite.R" version="10.0.113 "/>
+  <package id="OSPSuite.Assets" version="10.0.122"/>
+  <package id="OSPSuite.Core" version="10.0.122"/>
+  <package id="OSPSuite.Infrastructure" version="10.0.122"/>
+  <package id="OSPSuite.Infrastructure.Import" version="10.0.122"/>
+  <package id="OSPSuite.Infrastructure.Autofac" version="10.0.122"/>
+  <package id="OSPSuite.R" version="10.0.122 "/>
   <package id="OSPSuite.Serializer" version="3.0.0.1"/>
   <package id="OSPSuite.Utility" version="4.0.0.4"/>
   <package id="LumenWorksCsvReader" version="4.0.0"/>