diff --git a/R/snapshots.R b/R/snapshots.R
index 9c1db5a7..85a28d20 100644
--- a/R/snapshots.R
+++ b/R/snapshots.R
@@ -95,6 +95,8 @@ runSimulationsFromSnapshot <- function(..., output = ".", exportCSV = TRUE, expo
#' @param ... character strings, path to files or a directory containing files to convert
#' @param format, character string, target format either "snapshot" or "project".
#' @param output character string, path to the output directory where to write the converted files
+#' @param runSimulations logical, whether to run simulations during conversion (default = FALSE).
+#' Only when converting from snapshot to project.
#'
#' @return NULL
#' @export
@@ -104,7 +106,7 @@ runSimulationsFromSnapshot <- function(..., output = ".", exportCSV = TRUE, expo
#' convertSnapshot("path/to/snapshot.json", format = "project")
#' convertSnapshot("path/to/project.pksim5", format = "snapshot")
#' }
-convertSnapshot <- function(..., format, output = ".") {
+convertSnapshot <- function(..., format, output = ".", runSimulations = FALSE) {
rlang::arg_match(arg = format, values = c("snapshot", "project"))
initPKSim()
@@ -115,6 +117,12 @@ convertSnapshot <- function(..., format, output = ".") {
SnapshotRunOptions$set(name = "InputFolder", value = temp_dir)
SnapshotRunOptions$set(name = "OutputFolder", value = normalizePath(output))
+ if (isTRUE(runSimulations)) {
+ SnapshotRunOptions$set(name = "RunSimulations", value = TRUE)
+ } else {
+ SnapshotRunOptions$set(name = "RunSimulations", value = FALSE)
+ }
+
if (format == "project") {
SnapshotRunOptions$set("ExportMode", 0L)
nfiles <- length(list.files(temp_dir, pattern = ".json"))
@@ -124,12 +132,25 @@ convertSnapshot <- function(..., format, output = ".") {
}
cli::cli_process_start(
- msg = "Converting {nfiles} files{?s} to {format} format",
+ msg = "Converting {nfiles} file{?s} to {format} format",
msg_done = "Conversion completed",
msg_failed = "An error occured while converting files"
)
- rSharp::callStatic("PKSim.R.Api", "RunSnapshot", SnapshotRunOptions)
+ tryCatch(
+ {
+ invisible(rSharp::callStatic("PKSim.R.Api", "RunSnapshot", SnapshotRunOptions))
+ },
+ error = function(e) {
+ message <- stringr::str_extract(as.character(e), "(?<=Message: )[^\\n]*")
+
+ if (is.na(message)){
+ message <- e
+ }
+
+ cli::cli_abort(message = message, call = rlang::caller_env(n = 4))
+ }
+ )
}
diff --git a/inst/lib/ConsoleApp.deps.json b/inst/lib/ConsoleApp.deps.json
index 87bb55b0..5494d979 100644
--- a/inst/lib/ConsoleApp.deps.json
+++ b/inst/lib/ConsoleApp.deps.json
@@ -9,10 +9,10 @@
"ConsoleApp/1.0.0": {
"dependencies": {
"OSPSuite.FuncParser.Ubuntu22": "4.0.0.59",
- "OSPSuite.R": "12.0.313",
+ "OSPSuite.R": "12.0.317",
"OSPSuite.SimModel.Ubuntu22": "4.0.0.59",
"OSPSuite.SimModelSolver_CVODES.Ubuntu22": "4.1.0.9",
- "PKSim.R": "12.0.328"
+ "PKSim.R": "12.0.338"
},
"runtime": {
"ConsoleApp.dll": {}
@@ -374,36 +374,36 @@
}
}
},
- "OSPSuite.Assets/12.0.313": {
+ "OSPSuite.Assets/12.0.317": {
"dependencies": {
"OSPSuite.Utility": "4.1.0.6"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Assets.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Assets.Images/12.0.313": {
+ "OSPSuite.Assets.Images/12.0.317": {
"dependencies": {
"DevExpress.Data": "21.2.3",
- "OSPSuite.Assets": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
"OSPSuite.Utility": "4.1.0.6",
"System.Drawing.Common": "6.0.0"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Assets.Images.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Core/12.0.313": {
+ "OSPSuite.Core/12.0.317": {
"dependencies": {
"MathNet.Numerics": "4.15.0",
"Microsoft.Extensions.Logging.Abstractions": "3.1.0",
- "OSPSuite.Assets": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
"OSPSuite.FuncParser": "4.0.0.59",
"OSPSuite.Serializer": "3.0.0.1",
"OSPSuite.SimModel": "4.0.0.59",
@@ -412,8 +412,8 @@
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Core.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
@@ -426,11 +426,11 @@
}
},
"OSPSuite.FuncParser.Ubuntu22/4.0.0.59": {},
- "OSPSuite.Infrastructure/12.0.313": {
+ "OSPSuite.Infrastructure/12.0.317": {
"dependencies": {
"Microsoft.Extensions.Logging": "3.1.0",
"Newtonsoft.Json": "12.0.3",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.Utility": "4.1.0.6",
"Serilog": "2.10.0",
"Serilog.Extensions.Logging.File": "2.0.0",
@@ -439,137 +439,137 @@
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Infrastructure.Autofac/12.0.313": {
+ "OSPSuite.Infrastructure.Autofac/12.0.317": {
"dependencies": {
"Autofac": "4.9.4",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.Utility": "4.1.0.6"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.Autofac.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Infrastructure.Castle/12.0.313": {
+ "OSPSuite.Infrastructure.Castle/12.0.317": {
"dependencies": {
"Castle.Windsor": "5.0.1",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.Utility": "4.1.0.6"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.Castle.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Infrastructure.Export/12.0.313": {
+ "OSPSuite.Infrastructure.Export/12.0.317": {
"dependencies": {
"NPOI": "2.5.5",
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.Utility": "4.1.0.6"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.Export.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Infrastructure.Import/12.0.313": {
+ "OSPSuite.Infrastructure.Import/12.0.317": {
"dependencies": {
"LumenWorksCsvReader": "4.0.0",
"NPOI": "2.5.5",
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Assets.Images": "12.0.313",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Assets.Images": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.Utility": "4.1.0.6"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.Import.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Infrastructure.Reporting/12.0.313": {
+ "OSPSuite.Infrastructure.Reporting/12.0.317": {
"dependencies": {
"Newtonsoft.Json": "12.0.3",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.TeXReporting": "3.0.0.5"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.Reporting.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Infrastructure.Serialization/12.0.313": {
+ "OSPSuite.Infrastructure.Serialization/12.0.317": {
"dependencies": {
"Dapper": "2.0.123",
"NHibernate": "5.4.9",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Core": "12.0.317",
"System.Data.SQLite.Core": "1.0.118"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Infrastructure.Serialization.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Presentation/12.0.313": {
+ "OSPSuite.Presentation/12.0.317": {
"dependencies": {
"DevExpress.Data": "21.2.3",
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Assets.Images": "12.0.313",
- "OSPSuite.Core": "12.0.313",
- "OSPSuite.Infrastructure.Import": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Assets.Images": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
+ "OSPSuite.Infrastructure.Import": "12.0.317",
"OSPSuite.Utility": "4.1.0.6",
"System.Runtime": "4.3.1"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Presentation.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.Presentation.Serialization/12.0.313": {
+ "OSPSuite.Presentation.Serialization/12.0.317": {
"dependencies": {
- "OSPSuite.Core": "12.0.313",
- "OSPSuite.Presentation": "12.0.313",
+ "OSPSuite.Core": "12.0.317",
+ "OSPSuite.Presentation": "12.0.317",
"OSPSuite.Serializer": "3.0.0.1"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.Presentation.Serialization.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
- "OSPSuite.R/12.0.313": {
+ "OSPSuite.R/12.0.317": {
"dependencies": {
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Core": "12.0.313",
- "OSPSuite.Infrastructure": "12.0.313",
- "OSPSuite.Infrastructure.Autofac": "12.0.313",
- "OSPSuite.Infrastructure.Import": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
+ "OSPSuite.Infrastructure": "12.0.317",
+ "OSPSuite.Infrastructure.Autofac": "12.0.317",
+ "OSPSuite.Infrastructure.Import": "12.0.317",
"OSPSuite.Utility": "4.1.0.6"
},
"runtime": {
"lib/netstandard2.0/OSPSuite.R.dll": {
- "assemblyVersion": "12.0.313.0",
- "fileVersion": "12.0.313.0"
+ "assemblyVersion": "12.0.317.0",
+ "fileVersion": "12.0.317.0"
}
}
},
@@ -1348,65 +1348,65 @@
"System.Xml.ReaderWriter": "4.3.0"
}
},
- "PKSim.Assets/12.0.328": {
+ "PKSim.Assets/12.0.338": {
"dependencies": {
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Assets.Images": "12.0.313",
- "OSPSuite.Core": "12.0.313"
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Assets.Images": "12.0.317",
+ "OSPSuite.Core": "12.0.317"
},
"runtime": {
"PKSim.Assets.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
},
- "PKSim.Assets.Images/12.0.328": {
+ "PKSim.Assets.Images/12.0.338": {
"dependencies": {
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Assets.Images": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Assets.Images": "12.0.317",
"System.Resources.Extensions": "8.0.0"
},
"runtime": {
"PKSim.Assets.Images.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
},
- "PKSim.CLI.Core/12.0.328": {
+ "PKSim.CLI.Core/12.0.338": {
"dependencies": {
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.Utility": "4.1.0.6",
- "PKSim.Core": "12.0.328"
+ "PKSim.Core": "12.0.338"
},
"runtime": {
"PKSim.CLI.Core.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
},
- "PKSim.Core/12.0.328": {
+ "PKSim.Core/12.0.338": {
"dependencies": {
"Newtonsoft.Json": "12.0.3",
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Assets.Images": "12.0.313",
- "OSPSuite.Core": "12.0.313",
- "OSPSuite.Infrastructure.Import": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Assets.Images": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
+ "OSPSuite.Infrastructure.Import": "12.0.317",
"OSPSuite.Utility": "4.1.0.6",
- "PKSim.Assets": "12.0.328",
+ "PKSim.Assets": "12.0.338",
"System.ComponentModel.Annotations": "4.7.0"
},
"runtime": {
"PKSim.Core.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
},
- "PKSim.Infrastructure/12.0.328": {
+ "PKSim.Infrastructure/12.0.338": {
"dependencies": {
"FluentNHibernate": "3.4.0",
"LumenWorksCsvReader": "4.0.0",
@@ -1415,62 +1415,62 @@
"Microsoft.Extensions.Logging.Abstractions": "3.1.0",
"Newtonsoft.Json": "12.0.3",
"Newtonsoft.Json.Schema": "3.0.13",
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Core": "12.0.313",
- "OSPSuite.Infrastructure": "12.0.313",
- "OSPSuite.Infrastructure.Castle": "12.0.313",
- "OSPSuite.Infrastructure.Export": "12.0.313",
- "OSPSuite.Infrastructure.Import": "12.0.313",
- "OSPSuite.Infrastructure.Reporting": "12.0.313",
- "OSPSuite.Infrastructure.Serialization": "12.0.313",
- "OSPSuite.Presentation.Serialization": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
+ "OSPSuite.Infrastructure": "12.0.317",
+ "OSPSuite.Infrastructure.Castle": "12.0.317",
+ "OSPSuite.Infrastructure.Export": "12.0.317",
+ "OSPSuite.Infrastructure.Import": "12.0.317",
+ "OSPSuite.Infrastructure.Reporting": "12.0.317",
+ "OSPSuite.Infrastructure.Serialization": "12.0.317",
+ "OSPSuite.Presentation.Serialization": "12.0.317",
"OSPSuite.Utility": "4.1.0.6",
- "PKSim.Assets": "12.0.328",
- "PKSim.Core": "12.0.328",
- "PKSim.Presentation": "12.0.328"
+ "PKSim.Assets": "12.0.338",
+ "PKSim.Core": "12.0.338",
+ "PKSim.Presentation": "12.0.338"
},
"runtime": {
"PKSim.Infrastructure.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
},
- "PKSim.Presentation/12.0.328": {
+ "PKSim.Presentation/12.0.338": {
"dependencies": {
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Core": "12.0.313",
- "OSPSuite.Presentation": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
+ "OSPSuite.Presentation": "12.0.317",
"OSPSuite.TeXReporting": "3.0.0.5",
"OSPSuite.Utility": "4.1.0.6",
- "PKSim.Assets": "12.0.328",
- "PKSim.Assets.Images": "12.0.328",
- "PKSim.Core": "12.0.328"
+ "PKSim.Assets": "12.0.338",
+ "PKSim.Assets.Images": "12.0.338",
+ "PKSim.Core": "12.0.338"
},
"runtime": {
"PKSim.Presentation.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
},
- "PKSim.R/12.0.328": {
+ "PKSim.R/12.0.338": {
"dependencies": {
- "OSPSuite.Assets": "12.0.313",
- "OSPSuite.Core": "12.0.313",
+ "OSPSuite.Assets": "12.0.317",
+ "OSPSuite.Core": "12.0.317",
"OSPSuite.FuncParser": "4.0.0.59",
"OSPSuite.SimModel": "4.0.0.59",
"OSPSuite.SimModelSolver_CVODES": "4.1.0.9",
"OSPSuite.Utility": "4.1.0.6",
- "PKSim.CLI.Core": "12.0.328",
- "PKSim.Core": "12.0.328",
- "PKSim.Infrastructure": "12.0.328",
+ "PKSim.CLI.Core": "12.0.338",
+ "PKSim.Core": "12.0.338",
+ "PKSim.Infrastructure": "12.0.338",
"System.Data.SQLite.Core": "1.0.118"
},
"runtime": {
"PKSim.R.dll": {
- "assemblyVersion": "12.0.328",
- "fileVersion": "12.0.328"
+ "assemblyVersion": "12.0.338",
+ "fileVersion": "12.0.338"
}
}
}
@@ -1706,26 +1706,26 @@
"path": "npoi/2.5.5",
"hashPath": "npoi.2.5.5.nupkg.sha512"
},
- "OSPSuite.Assets/12.0.313": {
+ "OSPSuite.Assets/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-lwGmQQhcOECeJWrhzpC7r787+2vkOfxgRzwy169yTY9Lwg+L3kDljf2d5b+MrB4LL4yVqI0Uul6NiFsFtbx8Qw==",
- "path": "ospsuite.assets/12.0.313",
- "hashPath": "ospsuite.assets.12.0.313.nupkg.sha512"
+ "sha512": "sha512-x2ctPxx1uIG8fAgkEtKKCKoBPGhxPcQJoIEWBlm645y4My6vsdezKIxBAnMPR5hm12D4ALx/MvKy1guNLguADw==",
+ "path": "ospsuite.assets/12.0.317",
+ "hashPath": "ospsuite.assets.12.0.317.nupkg.sha512"
},
- "OSPSuite.Assets.Images/12.0.313": {
+ "OSPSuite.Assets.Images/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-SBgbTcT6UWOC/y08DT3dWhcqqbv+68EgPDl9DAOY9/TDO+ixUQbjF1f/XZKPB46wNWut6TtH4AWUuMsHOa26TQ==",
- "path": "ospsuite.assets.images/12.0.313",
- "hashPath": "ospsuite.assets.images.12.0.313.nupkg.sha512"
+ "sha512": "sha512-JKuFbrxgAa2yNE35TE0Qwehz1hglkPuVEIgiEnQzTV/srx0shC0zQ2jLbqWFvB07ESwqH0XzhTL8Ed5S5BJM5w==",
+ "path": "ospsuite.assets.images/12.0.317",
+ "hashPath": "ospsuite.assets.images.12.0.317.nupkg.sha512"
},
- "OSPSuite.Core/12.0.313": {
+ "OSPSuite.Core/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-Eku1AR07OjJzIhJ1tE82v8eoXVOKZQOlBcoILEp/HZBmdsHqdPJuTtu/+nJEMkQfoEG9QEHkP+OLtpAFmNxRow==",
- "path": "ospsuite.core/12.0.313",
- "hashPath": "ospsuite.core.12.0.313.nupkg.sha512"
+ "sha512": "sha512-JWUwdZotRSD9Dw/hlEaflYbGqs4yU9XTA8bfakRLfdAdbiA0LJwE4KXgb6/9jmgxYKQtpkMkUJ8JBU4WzwiYYw==",
+ "path": "ospsuite.core/12.0.317",
+ "hashPath": "ospsuite.core.12.0.317.nupkg.sha512"
},
"OSPSuite.FuncParser/4.0.0.59": {
"type": "package",
@@ -1741,75 +1741,75 @@
"path": "ospsuite.funcparser.ubuntu22/4.0.0.59",
"hashPath": "ospsuite.funcparser.ubuntu22.4.0.0.59.nupkg.sha512"
},
- "OSPSuite.Infrastructure/12.0.313": {
+ "OSPSuite.Infrastructure/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-t24ZeF0gEQ5e4xj5L3CNjJsOrR15kyTwF2yXuQdtxoje77q/9fTWMURB1QrtKL5PhravEbQkpyTcyvCYYESGSA==",
- "path": "ospsuite.infrastructure/12.0.313",
- "hashPath": "ospsuite.infrastructure.12.0.313.nupkg.sha512"
+ "sha512": "sha512-p2x9gsyRdNAByLeA38BVPKmA7ggvbGgSSA9amU3EoxtIeQfgYxnUifOvJPl/zQJ57pvA16O0c/GORW2bQrfThw==",
+ "path": "ospsuite.infrastructure/12.0.317",
+ "hashPath": "ospsuite.infrastructure.12.0.317.nupkg.sha512"
},
- "OSPSuite.Infrastructure.Autofac/12.0.313": {
+ "OSPSuite.Infrastructure.Autofac/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-p3D22DBB1BsQsTJQ9VGqDZjIy8lgSSbylpXQ4naMPlqXkF5oQjn6HUAzTZVwThdbvuuwGTsTtT3YyGeDhwWcqQ==",
- "path": "ospsuite.infrastructure.autofac/12.0.313",
- "hashPath": "ospsuite.infrastructure.autofac.12.0.313.nupkg.sha512"
+ "sha512": "sha512-osD/yrPQ8ww+ETyyjZVNdTfFME5VbWKSU/YPCTzKBMMdFNsTEBU9r8vrMJzNV05X3aPQCpUEZxrdlopiJ7AkAw==",
+ "path": "ospsuite.infrastructure.autofac/12.0.317",
+ "hashPath": "ospsuite.infrastructure.autofac.12.0.317.nupkg.sha512"
},
- "OSPSuite.Infrastructure.Castle/12.0.313": {
+ "OSPSuite.Infrastructure.Castle/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-PBQEOQcx3+fuhDv5DgbIpIHr+00P1WiWL8pn9VpHU0qWmZyL5uLw6cl3ccUE0htR1CUliB04fKsFJFtKDU9RpQ==",
- "path": "ospsuite.infrastructure.castle/12.0.313",
- "hashPath": "ospsuite.infrastructure.castle.12.0.313.nupkg.sha512"
+ "sha512": "sha512-Z85qerTKKDo0YOxqZRSYfy3yet0QUYC+qGdfmvTsWyk07qD1wv1bVft7ok+VNAptQzbmM2eyTqb6CgvCCpnyxA==",
+ "path": "ospsuite.infrastructure.castle/12.0.317",
+ "hashPath": "ospsuite.infrastructure.castle.12.0.317.nupkg.sha512"
},
- "OSPSuite.Infrastructure.Export/12.0.313": {
+ "OSPSuite.Infrastructure.Export/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-rvoGSggzLK5g+8sKN65gZLmSSmB5dgyPhdEPgSLsTFSzzkfBiq994zT5f3a93/BU0kSmh6bdzxUBzCz+ETG8bA==",
- "path": "ospsuite.infrastructure.export/12.0.313",
- "hashPath": "ospsuite.infrastructure.export.12.0.313.nupkg.sha512"
+ "sha512": "sha512-YwDSzpcUuBJp7BH13XSUehUeSO+qGtI+2dD/GewqT97gAd/W7s0dHpI4pwjVxGFuQ4ZEfOnQujDpYdo4Y5RgaQ==",
+ "path": "ospsuite.infrastructure.export/12.0.317",
+ "hashPath": "ospsuite.infrastructure.export.12.0.317.nupkg.sha512"
},
- "OSPSuite.Infrastructure.Import/12.0.313": {
+ "OSPSuite.Infrastructure.Import/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-PQh07UJ0QIChr8SN6QBPitGhRcJOeF0lTlE/0dTkIFzbm4+178W3zgKXqL7kLDmTIg+MHviUH+HRSePQ29aHBA==",
- "path": "ospsuite.infrastructure.import/12.0.313",
- "hashPath": "ospsuite.infrastructure.import.12.0.313.nupkg.sha512"
+ "sha512": "sha512-86GzeU05tU9apUKwkxWr/eLkI/QcJTc2DviSoa8++qlUkNn9wvz/2jLSWPrflE3NVUeBKSezf+wu3xUFdDISUA==",
+ "path": "ospsuite.infrastructure.import/12.0.317",
+ "hashPath": "ospsuite.infrastructure.import.12.0.317.nupkg.sha512"
},
- "OSPSuite.Infrastructure.Reporting/12.0.313": {
+ "OSPSuite.Infrastructure.Reporting/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-kIaf2imSQxwdy1ee3vuB0US4DqLjs6vH7PzVl/MprQmMUyTGZ7w8H0THcaQv7FKf5n/eESqD/UChI0Vx0yDOCw==",
- "path": "ospsuite.infrastructure.reporting/12.0.313",
- "hashPath": "ospsuite.infrastructure.reporting.12.0.313.nupkg.sha512"
+ "sha512": "sha512-8l48XTfFM2SCm7KxEKckDx3L+V5bRUOT92/F2QLeSt6TXMvG5Cympc9YEYYFwkHpYOtxVM4yFApaiiG/Hzd8+Q==",
+ "path": "ospsuite.infrastructure.reporting/12.0.317",
+ "hashPath": "ospsuite.infrastructure.reporting.12.0.317.nupkg.sha512"
},
- "OSPSuite.Infrastructure.Serialization/12.0.313": {
+ "OSPSuite.Infrastructure.Serialization/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-UNjHo4lKPkp1RINcO0ZXyYUG1MKNfICpb4GoARxAeEURCgcUcLPB/ioYn4DFEm49NJOYGnMLloytUDn94NOihA==",
- "path": "ospsuite.infrastructure.serialization/12.0.313",
- "hashPath": "ospsuite.infrastructure.serialization.12.0.313.nupkg.sha512"
+ "sha512": "sha512-cDpi/iMzw/C1fFOhXcM+mUUHFAS7yHOGkPNX0dCBEP487xu904X7t0m9E8E+kCxR5wx1Uoj0yGv2qEijpMnmSA==",
+ "path": "ospsuite.infrastructure.serialization/12.0.317",
+ "hashPath": "ospsuite.infrastructure.serialization.12.0.317.nupkg.sha512"
},
- "OSPSuite.Presentation/12.0.313": {
+ "OSPSuite.Presentation/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-BOHtH8pESdgMkz0lGe05+igCPjkaeBjxDNDvCcfCs0VLI0uQZM6bluUebVZO497A4D9anQT/GIJfa/qIrNFSfA==",
- "path": "ospsuite.presentation/12.0.313",
- "hashPath": "ospsuite.presentation.12.0.313.nupkg.sha512"
+ "sha512": "sha512-V6QmdtiWgWoqVuXE4696r55zFi2HXK/sDnAbG11VEi6Qd8oKb7gyoxOFyTDpEiRVH17w+9D+h2aRJ4EbEOIHVw==",
+ "path": "ospsuite.presentation/12.0.317",
+ "hashPath": "ospsuite.presentation.12.0.317.nupkg.sha512"
},
- "OSPSuite.Presentation.Serialization/12.0.313": {
+ "OSPSuite.Presentation.Serialization/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-iZCqTh3ILCqzDpjm+Jsvq0pajQL8wLV5wOXAneYCOAqAIUYESIuqAgI8bizac56IXnOzlbKb4czeq5TJIxXabg==",
- "path": "ospsuite.presentation.serialization/12.0.313",
- "hashPath": "ospsuite.presentation.serialization.12.0.313.nupkg.sha512"
+ "sha512": "sha512-3UupQ/CDTrpc5jINfP4eq7ydYsoOAydpm/n3DVzlo+rp7qX9g2klptf6BZXEpwlc7Cn/MVvzyP9/lvB1OcoZ3w==",
+ "path": "ospsuite.presentation.serialization/12.0.317",
+ "hashPath": "ospsuite.presentation.serialization.12.0.317.nupkg.sha512"
},
- "OSPSuite.R/12.0.313": {
+ "OSPSuite.R/12.0.317": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-h3ED28N8luHYTc15Z0MMLxIiyko6lyjCRGrVf/Nui+wUU6ADwvsq3JNZk8x+g0LuIo9QE6JigtinIMGYuaMq0Q==",
- "path": "ospsuite.r/12.0.313",
- "hashPath": "ospsuite.r.12.0.313.nupkg.sha512"
+ "sha512": "sha512-WvG63ScxQi46v8UGe7VpFMlJo97luHfO+Ov/1kFm6QExPX+DZeNdF7laxJHaR1jNnw4g5upznXqqep3CIZsllA==",
+ "path": "ospsuite.r/12.0.317",
+ "hashPath": "ospsuite.r.12.0.317.nupkg.sha512"
},
"OSPSuite.Serializer/3.0.0.1": {
"type": "package",
@@ -2371,37 +2371,37 @@
"path": "system.xml.xmldocument/4.3.0",
"hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
},
- "PKSim.Assets/12.0.328": {
+ "PKSim.Assets/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "PKSim.Assets.Images/12.0.328": {
+ "PKSim.Assets.Images/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "PKSim.CLI.Core/12.0.328": {
+ "PKSim.CLI.Core/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "PKSim.Core/12.0.328": {
+ "PKSim.Core/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "PKSim.Infrastructure/12.0.328": {
+ "PKSim.Infrastructure/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "PKSim.Presentation/12.0.328": {
+ "PKSim.Presentation/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "PKSim.R/12.0.328": {
+ "PKSim.R/12.0.338": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/inst/lib/ConsoleApp.dll b/inst/lib/ConsoleApp.dll
index 58c0bf11..2d2389dc 100644
Binary files a/inst/lib/ConsoleApp.dll and b/inst/lib/ConsoleApp.dll differ
diff --git a/inst/lib/OSPSuite.Assets.Images.dll b/inst/lib/OSPSuite.Assets.Images.dll
index acbe79e3..9e3ca48d 100644
Binary files a/inst/lib/OSPSuite.Assets.Images.dll and b/inst/lib/OSPSuite.Assets.Images.dll differ
diff --git a/inst/lib/OSPSuite.Assets.dll b/inst/lib/OSPSuite.Assets.dll
index 4edaa983..c26e466d 100644
Binary files a/inst/lib/OSPSuite.Assets.dll and b/inst/lib/OSPSuite.Assets.dll differ
diff --git a/inst/lib/OSPSuite.Core.dll b/inst/lib/OSPSuite.Core.dll
index b96ee6a2..25774a65 100644
Binary files a/inst/lib/OSPSuite.Core.dll and b/inst/lib/OSPSuite.Core.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.Autofac.dll b/inst/lib/OSPSuite.Infrastructure.Autofac.dll
index 38595bd1..2e80bf77 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.Autofac.dll and b/inst/lib/OSPSuite.Infrastructure.Autofac.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.Castle.dll b/inst/lib/OSPSuite.Infrastructure.Castle.dll
index a24f8af3..f0786217 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.Castle.dll and b/inst/lib/OSPSuite.Infrastructure.Castle.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.Export.dll b/inst/lib/OSPSuite.Infrastructure.Export.dll
index 16696f75..f8ced4c3 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.Export.dll and b/inst/lib/OSPSuite.Infrastructure.Export.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.Import.dll b/inst/lib/OSPSuite.Infrastructure.Import.dll
index 79ffe076..11f50854 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.Import.dll and b/inst/lib/OSPSuite.Infrastructure.Import.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.Reporting.dll b/inst/lib/OSPSuite.Infrastructure.Reporting.dll
index 402ffd90..cd9e3698 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.Reporting.dll and b/inst/lib/OSPSuite.Infrastructure.Reporting.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.Serialization.dll b/inst/lib/OSPSuite.Infrastructure.Serialization.dll
index a72af6ab..58bffc63 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.Serialization.dll and b/inst/lib/OSPSuite.Infrastructure.Serialization.dll differ
diff --git a/inst/lib/OSPSuite.Infrastructure.dll b/inst/lib/OSPSuite.Infrastructure.dll
index 19a60cd0..2842a163 100644
Binary files a/inst/lib/OSPSuite.Infrastructure.dll and b/inst/lib/OSPSuite.Infrastructure.dll differ
diff --git a/inst/lib/OSPSuite.Presentation.Serialization.dll b/inst/lib/OSPSuite.Presentation.Serialization.dll
index a8bb75e6..639c3ab8 100644
Binary files a/inst/lib/OSPSuite.Presentation.Serialization.dll and b/inst/lib/OSPSuite.Presentation.Serialization.dll differ
diff --git a/inst/lib/OSPSuite.Presentation.dll b/inst/lib/OSPSuite.Presentation.dll
index cfd3def7..9422cafa 100644
Binary files a/inst/lib/OSPSuite.Presentation.dll and b/inst/lib/OSPSuite.Presentation.dll differ
diff --git a/inst/lib/OSPSuite.R.dll b/inst/lib/OSPSuite.R.dll
index d7b2617c..bde8f084 100644
Binary files a/inst/lib/OSPSuite.R.dll and b/inst/lib/OSPSuite.R.dll differ
diff --git a/inst/lib/PKSim.Assets.Images.dll b/inst/lib/PKSim.Assets.Images.dll
index c4d45004..add9696c 100644
Binary files a/inst/lib/PKSim.Assets.Images.dll and b/inst/lib/PKSim.Assets.Images.dll differ
diff --git a/inst/lib/PKSim.Assets.dll b/inst/lib/PKSim.Assets.dll
index 65f42778..166da180 100644
Binary files a/inst/lib/PKSim.Assets.dll and b/inst/lib/PKSim.Assets.dll differ
diff --git a/inst/lib/PKSim.CLI.Core.dll b/inst/lib/PKSim.CLI.Core.dll
index d1a9271b..c13ddf44 100644
Binary files a/inst/lib/PKSim.CLI.Core.dll and b/inst/lib/PKSim.CLI.Core.dll differ
diff --git a/inst/lib/PKSim.Core.dll b/inst/lib/PKSim.Core.dll
index 6819a09b..651426b3 100644
Binary files a/inst/lib/PKSim.Core.dll and b/inst/lib/PKSim.Core.dll differ
diff --git a/inst/lib/PKSim.Infrastructure.dll b/inst/lib/PKSim.Infrastructure.dll
index 6b416bec..7450b686 100644
Binary files a/inst/lib/PKSim.Infrastructure.dll and b/inst/lib/PKSim.Infrastructure.dll differ
diff --git a/inst/lib/PKSim.Presentation.dll b/inst/lib/PKSim.Presentation.dll
index c0dd0262..c2928ef8 100644
Binary files a/inst/lib/PKSim.Presentation.dll and b/inst/lib/PKSim.Presentation.dll differ
diff --git a/inst/lib/PKSim.R.dll b/inst/lib/PKSim.R.dll
index 4ea6b241..0c783483 100644
Binary files a/inst/lib/PKSim.R.dll and b/inst/lib/PKSim.R.dll differ
diff --git a/tests/data/test_snapshot.json b/tests/data/test_snapshot.json
index f7108e90..38cce643 100644
--- a/tests/data/test_snapshot.json
+++ b/tests/data/test_snapshot.json
@@ -364,74 +364,7 @@
}
}
],
- "HasResults": true,
- "IndividualAnalyses": [
- {
- "Axes": [
- {
- "Unit": "h",
- "Dimension": "Time",
- "Type": "X",
- "GridLines": false,
- "Visible": true,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "None",
- "Scaling": "Linear",
- "NumberMode": "Normal"
- },
- {
- "Unit": "µmol/l",
- "Dimension": "Concentration (molar)",
- "Type": "Y",
- "GridLines": false,
- "Visible": true,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "Solid",
- "Scaling": "Log",
- "NumberMode": "Normal"
- }
- ],
- "Curves": [
- {
- "Name": "Generic_compound-Venous Blood-Plasma-Concentration",
- "X": "Time",
- "Y": "Simulation - IV + Weibull - Default tolerance|Organism|VenousBlood|Plasma|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#FF0000",
- "LegendIndex": 1
- }
- },
- {
- "Name": "Generic_compound-Skin-Intracellular-Concentration",
- "X": "Time",
- "Y": "Simulation - IV + Weibull - Default tolerance|Organism|Skin|Intracellular|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#0000FF",
- "LegendIndex": 2
- }
- }
- ],
- "Name": "Time Profile Analysis",
- "FontAndSize": {
- "Fonts": {
- "AxisSize": 10,
- "LegendSize": 8,
- "TitleSize": 16,
- "DescriptionSize": 12,
- "OriginSize": 8,
- "FontFamilyName": "Microsoft Sans Serif",
- "WatermarkSize": 32
- }
- },
- "Settings": {
- "SideMarginsEnabled": true,
- "LegendPosition": "RightInside",
- "BackColor": "#FFFFFF",
- "DiagramBackColor": "#FFFFFF"
- },
- "OriginText": "Comparison advanced admin with weibull\nSimulation - IV + Weibull - Default tolerance\n2024-08-30 09:51"
- }
- ]
+ "HasResults": false
},
{
"Name": "Simulation - IV only - Default tolerance",
@@ -511,266 +444,7 @@
}
}
],
- "HasResults": true,
- "IndividualAnalyses": [
- {
- "Axes": [
- {
- "Unit": "h",
- "Dimension": "Time",
- "Type": "X",
- "GridLines": false,
- "Visible": true,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "None",
- "Scaling": "Linear",
- "NumberMode": "Normal"
- },
- {
- "Unit": "µmol/l",
- "Dimension": "Concentration (molar)",
- "Type": "Y",
- "GridLines": false,
- "Visible": true,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "Solid",
- "Scaling": "Log",
- "NumberMode": "Normal"
- }
- ],
- "Curves": [
- {
- "Name": "Generic_compound-Skin-Intracellular-Concentration",
- "X": "Time",
- "Y": "Simulation - IV only - Default tolerance|Organism|Skin|Intracellular|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#FF0000",
- "LegendIndex": 1
- }
- },
- {
- "Name": "Generic_compound-Venous Blood-Plasma-Concentration",
- "X": "Time",
- "Y": "Simulation - IV only - Default tolerance|Organism|VenousBlood|Plasma|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#0000FF",
- "LegendIndex": 2
- }
- }
- ],
- "Name": "Time Profile Analysis",
- "FontAndSize": {
- "Fonts": {
- "AxisSize": 10,
- "LegendSize": 8,
- "TitleSize": 16,
- "DescriptionSize": 12,
- "OriginSize": 8,
- "FontFamilyName": "Microsoft Sans Serif",
- "WatermarkSize": 32
- }
- },
- "Settings": {
- "SideMarginsEnabled": true,
- "LegendPosition": "RightInside",
- "BackColor": "#FFFFFF",
- "DiagramBackColor": "#FFFFFF"
- },
- "OriginText": "Comparison advanced admin with weibull\nSimulation - IV only - Default tolerance\n2024-08-30 09:51"
- }
- ]
- }
- ],
- "SimulationComparisons": [
- {
- "Name": "Simulation Comparison - Tolerance reduced",
- "Simulations": [
- "Simulation - IV + Weibull - Tolerance reduced",
- "Simulation - IV only - Tolerance reduced"
- ],
- "IndividualComparison": {
- "Axes": [
- {
- "Unit": "h",
- "Dimension": "Time",
- "Type": "X",
- "GridLines": false,
- "Visible": true,
- "Min": 15.53561,
- "Max": 25.05864,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "None",
- "Scaling": "Linear",
- "NumberMode": "Normal"
- },
- {
- "Unit": "µmol/l",
- "Dimension": "Concentration (molar)",
- "Type": "Y",
- "GridLines": false,
- "Visible": true,
- "Min": 5.034298E-07,
- "Max": 0.3479374,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "Solid",
- "Scaling": "Log",
- "NumberMode": "Normal"
- }
- ],
- "Curves": [
- {
- "Name": "Simulation - IV only-Generic_compound-Venous Blood-Plasma-Concentration",
- "X": "Time",
- "Y": "Simulation - IV only - Tolerance reduced|Organism|VenousBlood|Plasma|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#800080",
- "LegendIndex": 2
- }
- },
- {
- "Name": "Simulation - IV only-Generic_compound-Skin-Intracellular-Concentration",
- "X": "Time",
- "Y": "Simulation - IV only - Tolerance reduced|Organism|Skin|Intracellular|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#0000FF",
- "LegendIndex": 3
- }
- },
- {
- "Name": "Simulation - IV + Weibull-Generic_compound-Venous Blood-Plasma-Concentration",
- "X": "Time",
- "Y": "Simulation - IV + Weibull - Tolerance reduced|Organism|VenousBlood|Plasma|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#FF00FF",
- "LegendIndex": 1,
- "LineStyle": "Dash"
- }
- },
- {
- "Name": "Simulation - IV + Weibull-Generic_compound-Skin-Intracellular-Concentration",
- "X": "Time",
- "Y": "Simulation - IV + Weibull - Tolerance reduced|Organism|Skin|Intracellular|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#008000",
- "LegendIndex": 2,
- "LineStyle": "Dash"
- }
- }
- ],
- "Name": "Simulation Comparison - Tolerance reduced",
- "FontAndSize": {
- "Fonts": {
- "AxisSize": 10,
- "LegendSize": 8,
- "TitleSize": 16,
- "DescriptionSize": 12,
- "OriginSize": 8,
- "FontFamilyName": "Microsoft Sans Serif",
- "WatermarkSize": 32
- }
- },
- "Settings": {
- "SideMarginsEnabled": true,
- "LegendPosition": "RightInside",
- "BackColor": "#FFFFFF",
- "DiagramBackColor": "#FFFFFF"
- }
- }
- },
- {
- "Name": "Simulation Comparison - Default tolerance",
- "Simulations": [
- "Simulation - IV only - Default tolerance",
- "Simulation - IV + Weibull - Default tolerance"
- ],
- "IndividualComparison": {
- "Axes": [
- {
- "Unit": "h",
- "Dimension": "Time",
- "Type": "X",
- "GridLines": false,
- "Visible": true,
- "Min": 15.75082,
- "Max": 23.63288,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "None",
- "Scaling": "Linear",
- "NumberMode": "Normal"
- },
- {
- "Unit": "µmol/l",
- "Dimension": "Concentration (molar)",
- "Type": "Y",
- "GridLines": false,
- "Visible": true,
- "Min": 4.803477E-07,
- "Max": 0.3479376,
- "DefaultColor": "#FFFFFF",
- "DefaultLineStyle": "Solid",
- "Scaling": "Log",
- "NumberMode": "Normal"
- }
- ],
- "Curves": [
- {
- "Name": "Simulation - IV only - Default tolerance-Generic_compound-Skin-Intracellular-Concentration",
- "X": "Time",
- "Y": "Simulation - IV only - Default tolerance|Organism|Skin|Intracellular|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#0000FF",
- "LegendIndex": 1
- }
- },
- {
- "Name": "Simulation - IV only - Default tolerance-Generic_compound-Venous Blood-Plasma-Concentration",
- "X": "Time",
- "Y": "Simulation - IV only - Default tolerance|Organism|VenousBlood|Plasma|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#800080",
- "LegendIndex": 2
- }
- },
- {
- "Name": "Simulation - IV + Weibull - Default tolerance-Generic_compound-Venous Blood-Plasma-Concentration",
- "X": "Time",
- "Y": "Simulation - IV + Weibull - Default tolerance|Organism|VenousBlood|Plasma|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#FF00FF",
- "LegendIndex": 1,
- "LineStyle": "Dash"
- }
- },
- {
- "Name": "Simulation - IV + Weibull - Default tolerance-Generic_compound-Skin-Intracellular-Concentration",
- "X": "Time",
- "Y": "Simulation - IV + Weibull - Default tolerance|Organism|Skin|Intracellular|Generic_compound|Concentration in container",
- "CurveOptions": {
- "Color": "#008000",
- "LegendIndex": 2,
- "LineStyle": "Dash"
- }
- }
- ],
- "Name": "Simulation Comparison - Default tolerance",
- "FontAndSize": {
- "Fonts": {
- "AxisSize": 10,
- "LegendSize": 8,
- "TitleSize": 16,
- "DescriptionSize": 12,
- "OriginSize": 8,
- "FontFamilyName": "Microsoft Sans Serif",
- "WatermarkSize": 32
- }
- },
- "Settings": {
- "SideMarginsEnabled": true,
- "LegendPosition": "RightInside",
- "BackColor": "#FFFFFF",
- "DiagramBackColor": "#FFFFFF"
- }
- }
+ "HasResults": false
}
]
}
\ No newline at end of file
diff --git a/tests/testthat/test-snapshots.R b/tests/testthat/test-snapshots.R
index f4614fcb..60981c42 100644
--- a/tests/testthat/test-snapshots.R
+++ b/tests/testthat/test-snapshots.R
@@ -40,6 +40,15 @@ test_that("Convert project to snapshot works", {
expect_length(list.files(temp_dir, pattern = ".json"), 1)
})
+test_that("RunSimulations argument is supported", {
+ path <- getTestDataFilePath("test_snapshot.json")
+ temp_dir <- withr::local_tempdir()
+ expect_no_error({
+ convertSnapshot(path, output = temp_dir, format = "project", runSimulations = TRUE)
+ convertSnapshot(path, output = temp_dir, format = "project", runSimulations = FALSE)
+ })
+})
+
test_that("gather files handles one file path", {
# create a temporary file
temp_file <- withr::local_tempfile(fileext = ".json", lines = "content")