Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project-based Workflow #651

Draft
wants to merge 117 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
f5b0804
- Fixes #554 (#628)
PavelBal Apr 15, 2024
00558d5
Change outputFolder for plots (#630)
PavelBal Apr 18, 2024
fac1fbf
Rename createDefaultProjectConfiguration to createProjectConfiguratio…
Felixmil Apr 18, 2024
4c4dc69
Harmonize Excel configuration files (#633)
Felixmil Apr 18, 2024
9d5e142
renamed the `Parameters` folder to `Configurations` (#631)
Felixmil Apr 18, 2024
b91a6b4
Created helpers for frequently used paths/ProjectConfiguration in tests
Felixmil Apr 18, 2024
e483c03
fix devtools::document() errors
Felixmil Apr 18, 2024
5e3d508
skip some test on CI (instead of CRAN)
Felixmil Apr 18, 2024
304a209
Update NEWS
Felixmil Apr 18, 2024
3ed3769
Merge remote-tracking branch 'origin/new-project-structure' into para…
Felixmil Apr 18, 2024
bded53d
enable GitHub actions when making PR in any branch
Felixmil Apr 18, 2024
9b8b75a
remove snapshot for projectConfiguration as it contains absolute path…
Felixmil Apr 18, 2024
e5b9063
`NULL` for arguments `simulatedScenarios` and `observedData` in `cre…
PavelBal Apr 19, 2024
9d9f89d
start working on project definition
Felixmil Apr 19, 2024
c3f77f3
Add populationsCSV path in projectConfiguration
Felixmil Apr 19, 2024
4a88401
Fix "Indiv" to "Indiv1" to prevent warnings
Felixmil Apr 19, 2024
060de9a
Merge remote-tracking branch 'origin/new-project-structure' into para…
Felixmil Apr 19, 2024
8a5c783
devtools::document()
Felixmil Apr 19, 2024
db97314
Update test expectation
Felixmil Apr 19, 2024
ae68c65
Merge branch 'paramsFile-to-modelParamsFile' into implement-project
Felixmil Apr 19, 2024
fa85e3d
Add Project object that contains all esqlabsR workflow components (co…
Felixmil May 6, 2024
c2de183
Improve projectConfiguration print method
Felixmil May 6, 2024
11bec57
style pkg
Felixmil May 6, 2024
3990ce7
keep inactivated scenarios status when changing configurations
Felixmil May 6, 2024
97db00d
Improve Project Structure (#635)
Felixmil May 13, 2024
6345886
Correct projectConfiguration related documentation (#653)
Felixmil May 13, 2024
8ba5ec3
ignore excel temporary files
Felixmil May 15, 2024
14c2202
Merge branch 'new-project-structure' into implement-project
Felixmil May 15, 2024
24c7dde
Add an optional path argument to save ProjectCOnfiguration
Felixmil May 16, 2024
2c45a72
Add test for Project
Felixmil May 16, 2024
baf1b05
rename file and relocate functions
Felixmil May 29, 2024
f8ce9fd
Rename files and add "-legacy" to older versions (temporary)
Felixmil May 29, 2024
324b151
style + document
Felixmil May 29, 2024
bf39aaa
replace function with latest name
Felixmil May 29, 2024
a6ffb83
Better user feedback on simulation results
Felixmil May 30, 2024
82b9d94
Add documentation
Felixmil May 30, 2024
a334d50
Add simulationTime objects
Felixmil May 30, 2024
2360f80
Rename time and timeUnit to simulationTime and simulationTimeUnit
Felixmil May 31, 2024
46dee0b
Apply simulationTime output intervals to simulation
Felixmil May 31, 2024
51c0e44
Add OutputPaths
Felixmil Jun 5, 2024
2075bc2
Add simulationTimeUnit validation
Felixmil Jun 6, 2024
0ae6e46
Add steadyState simulation run
Felixmil Jun 6, 2024
902d537
Add pretty printing method for individuals
Felixmil Jun 6, 2024
f0eae00
Rename validation function
Felixmil Jun 6, 2024
604571b
Rename ModelParameter to SimulationParameter
Felixmil Jun 11, 2024
e9ffb05
Add Population object and pop simulation capabilities
Felixmil Jun 11, 2024
84a7289
devtools::document()
Felixmil Jun 11, 2024
c5e768d
minor fix and optimizations
Felixmil Jun 11, 2024
f3785f8
merge main into branch
Felixmil Jul 30, 2024
812b45e
Merge branch 'main' into new-project-structure
Felixmil Jul 30, 2024
07bfb1e
merge branch `main` into `implement-project`
Felixmil Jul 30, 2024
c673ca4
git merge
Felixmil Jul 30, 2024
e9f2da4
Merge branch 'new-project-structure' into implement-project
Felixmil Jul 30, 2024
cbc3f47
Merge commit 'cf580734044e7a8267bf78a7a6dd67b0667b465d'
Felixmil Aug 28, 2024
ee5a512
Merge branch 'new-project-structure' into implement-project
Felixmil Aug 28, 2024
cabbeea
Merge branch 'implement-project' of https://github.com/esqLABS/esqlab…
Felixmil Aug 28, 2024
879e255
fix save function
Felixmil Aug 28, 2024
3e3387b
Fix tests
Felixmil Sep 2, 2024
26a5b99
Remove duplicated tests
Felixmil Sep 2, 2024
65d8d72
fix bad merge conflict resolution
Felixmil Sep 2, 2024
a56dc59
Restore populationsFolder to populationCSV
Felixmil Sep 2, 2024
8e0b7ef
remove PI as dependency
Felixmil Sep 2, 2024
2a4b9a5
Update project directory structure in presentation
Felixmil Sep 2, 2024
02492cf
Add prerequisite section for installation
Felixmil Sep 2, 2024
51df94e
Use latest functions in README
Felixmil Sep 2, 2024
74ec864
Rename Population Folder ProjectConfiguration property
Felixmil Sep 2, 2024
e8a255d
styler::style_pkg()
Felixmil Sep 2, 2024
fc48fbf
correct object case
Felixmil Sep 2, 2024
4eefed1
Add a test that makes sure that ProjectConfiguration can be customize…
Felixmil Sep 2, 2024
19cb881
Add NEWS entries
Felixmil Sep 2, 2024
22cf619
devtools::document()
Felixmil Sep 2, 2024
5a559df
extend project configuration tests
Felixmil Sep 2, 2024
e0a1a7f
Update project.R
AKostiv8 Sep 17, 2024
108dddb
Prevent user from modifying scenarios directly
Felixmil Sep 18, 2024
9856304
Refactor repeated error messages
Felixmil Sep 19, 2024
4858a9f
config validation
AKostiv8 Oct 1, 2024
3b52677
Feedback implemented
AKostiv8 Oct 2, 2024
9edd4c8
Update project.R
AKostiv8 Oct 2, 2024
d365de0
Project status tests
AKostiv8 Oct 3, 2024
15457b4
Test adjustment to the new project structure.
AKostiv8 Oct 7, 2024
a6b9298
update time param warning
AKostiv8 Oct 7, 2024
77eb334
fix files names
Felixmil Oct 10, 2024
6864357
Improve readme (closes #721)
Felixmil Oct 10, 2024
d7a9672
Update documentation
Felixmil Oct 10, 2024
919545a
Remove pksim initialization steps (closes #693)
Felixmil Oct 10, 2024
cab0796
Merge commit '7d4271027aff77abe19c41cf1749106570fce118'
Felixmil Oct 10, 2024
4ae81b5
Merge commit '7d4271027aff77abe19c41cf1749106570fce118'
Felixmil Oct 10, 2024
6ee1646
replace deprecated function
Felixmil Oct 11, 2024
758f034
pull from main
Felixmil Oct 11, 2024
032a45d
Update path to where results are stored now
Felixmil Oct 11, 2024
b41e61d
Remove embeded shiny apps
Felixmil Oct 11, 2024
ef67c18
Update plots test for new project structure
Felixmil Oct 11, 2024
cda1c45
remove/relocate outdated test
Felixmil Oct 11, 2024
5ff0443
update snaps
Felixmil Oct 11, 2024
bdbc595
shiny app remove
AKostiv8 Oct 14, 2024
872e3d2
shiny app remove
AKostiv8 Oct 14, 2024
803c2a3
conflicts resolved
AKostiv8 Oct 14, 2024
a9d5a1e
Rename / Comment out of date tests
Felixmil Oct 14, 2024
860c0d7
remove shiny app launching script
Felixmil Oct 14, 2024
0bccc89
merge from main
Felixmil Oct 14, 2024
fe55689
devtools::documen()
Felixmil Oct 14, 2024
17081d0
merge new-project-structure into branch
Felixmil Oct 14, 2024
42c8b55
Merge branch 'individual-validation-demo' into implement-project
AKostiv8 Oct 14, 2024
a8df746
Merge branch 'implement-project' of https://github.com/esqLABS/esqlab…
AKostiv8 Oct 14, 2024
b4d589a
Revert "Validation object & individual modification validation" (#726)
AKostiv8 Oct 14, 2024
e42ecdb
update snapshot after updating packages
Felixmil Oct 14, 2024
f5d01f1
Merge branch 'implement-project' of https://github.com/esqLABS/esqlab…
Felixmil Oct 14, 2024
7cb9054
fix code examples in documentation
Felixmil Oct 14, 2024
34b110d
fix path to Example Project Configuration File
Felixmil Oct 14, 2024
85a04d1
remove old test files
Felixmil Oct 14, 2024
d67fd79
fix exampleProject
Felixmil Oct 14, 2024
247d269
Move some objects to Internal
Felixmil Oct 14, 2024
84aea3b
disable vignettes (temporary)
Felixmil Oct 14, 2024
050fbd7
restore original build options
Felixmil Oct 14, 2024
e267a54
remove unsuported character in doc
Felixmil Oct 14, 2024
df5c786
Add Object validation in Project (#728)
AKostiv8 Jan 20, 2025
27494dd
import plots configuration (#730)
AKostiv8 Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ tests/testthat/Rplots.pdf
*.code-workspace
docs
pkgdown
**/~\$*\.xlsx
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ Depends:
ospsuite (>= 12.1.0),
R (>= 4.1)
Imports:
cli,
colorspace,
dplyr,
fs,
ggplot2,
grDevices,
labeling,
ospsuite.parameteridentification (>= 1.3.0),
lifecycle,
ospsuite.utils (>= 1.5.0),
parallel,
patchwork,
Expand Down Expand Up @@ -69,5 +70,4 @@ RoxygenNote: 7.3.2
Remotes:
ospsuite.utils=Open-Systems-Pharmacology/OSPSuite.RUtils,
tlf=Open-Systems-Pharmacology/TLF-Library,
ospsuite=Open-Systems-Pharmacology/OSPSuite-R,
Open-Systems-Pharmacology/ospsuite.parameteridentification
ospsuite=Open-Systems-Pharmacology/OSPSuite-R
23 changes: 7 additions & 16 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ export(ExportConfiguration)
export(GenderInt)
export(LLOQMode)
export(ProjectConfiguration)
export(Scenario)
export(ScenarioConfiguration)
export(ScenarioConfigurationLegacy)
export(ScenarioLegacy)
export(ULOQMode)
export(applyIndividualParameters)
export(calculateMeanDataSet)
export(col2hsv)
export(compareSimulations)
Expand All @@ -20,12 +19,14 @@ export(createEsqlabsExportConfiguration)
export(createEsqlabsPlotConfiguration)
export(createEsqlabsPlotGridConfiguration)
export(createPlotsFromExcel)
export(createScenarios)
export(createProjectConfiguration)
export(enumPutList)
export(escapeForRegex)
export(esqLABS_colors)
export(esqlabsRSettingNames)
export(example_ProjectConfiguration)
export(exampleProject)
export(exampleProjectConfiguration)
export(exampleProjectConfigurationFile)
export(executeInParallel)
export(exportParametersToXLS)
export(extendParameterStructure)
Expand All @@ -40,40 +41,30 @@ export(getIndexClosestToValue)
export(getMoleculeNameFromQuantity)
export(hillFunction)
export(init_project)
export(initializeSimulation)
export(isParametersEqual)
export(isTableFormulasEqual)
export(loadObservedData)
export(loadObservedDataFromPKML)
export(loadScenarioResults)
export(pathFromClipboard)
export(readExcel)
export(readIndividualCharacteristicsFromXLS)
export(readParametersFromXLS)
export(readPopulationCharacteristicsFromXLS)
export(readScenarioConfigurationFromExcel)
export(removeFromList)
export(runScenarios)
export(sampleRandomValue)
export(saveScenarioResults)
export(sensitivityCalculation)
export(sensitivitySpiderPlot)
export(sensitivityTimeProfiles)
export(sensitivityTornadoPlot)
export(setApplications)
export(setParameterValuesByPathWithCondition)
export(sineFunction)
export(sourceAll)
export(startFunctionVisualizer)
export(startUnitConverter)
export(stringToNum)
export(writeIndividualToXLS)
export(writeParameterStructureToXLS)
import(cli)
import(fs)
import(ggplot2)
import(grDevices)
import(ospsuite)
import(ospsuite.parameteridentification)
import(ospsuite.utils)
import(parallel)
import(readxl)
Expand Down
54 changes: 37 additions & 17 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,39 @@

## Breaking changes

- Function `sensitivityCalculation()` with renamed parameter `pkDataFilePath`
to `saOutputFilePath` and updated output files to include PK parameter units (\#696).
- Function `sensitivityCalculation()` with renamed parameter `pkDataFilePath`
to `saOutputFilePath` and updated output files to include PK parameter units
(\#696).

## Major Changes

- `createDefaultProjectConfiguration` is now soft-deprecated in favor of
`createProjectConfiguration`. (\#692)

- `ProjectConfiguration` fields have been renamed to be more consistant and
easier to understand. (\#692)

- Files and folders names in project directory have been harmonized and
improved (\#692)
- `Parameters` folder is now `Configurations`
- `Populations` folder is now `PopulationsCSV`
- `ApplicationParameters.xslx` file is now `Applications.xlsx`
- `PopulationParameters.xslx` file is now `Populations.xlsx`
- Previous directory structure is still supported but deprecated.

- `{ospsuite.parameteridentification}` is not longer a dependency of
`{esqlabsR}`.

## Minor improvements and bug fixes

- Handle simulation failures in `sensitivityCalculation` (\#694).

- Function `sensitivityCalculation()` supports new parameter `customOutputFunctions`,
allowing user-defined functions for PK parameter calculation (\#685).

- Function `sensitivitySpiderPlot` now supports `xAxisType` and `yAxisType` options
for switching between percent and absolute values (\#695).
- Function `sensitivityCalculation()` supports new parameter
`customOutputFunctions`, allowing user-defined functions for PK parameter
calculation (\#685).

- Function `sensitivitySpiderPlot` now supports `xAxisType` and `yAxisType`
options for switching between percent and absolute values (\#695).

- Function `sensitivityCalculation()` will throw more informative messages when
`outputPaths` or `parameterPaths` is not a character vector or NULL (\#712).
Expand All @@ -24,8 +43,8 @@

## Breaking changes

- `{esqlabsR}` now requires `{ospsuite}` version 12.1.0 or higher to benefit from
embedded PK-Sim core files.
- `{esqlabsR}` now requires `{ospsuite}` version 12.1.0 or higher to benefit
from embedded PK-Sim core files.

- Function `exportSteadyStateToXLS` has been removed in favor of
`ospsuite::exportSteadyStateToXLS` (\#598)
Expand All @@ -37,12 +56,13 @@
customization options through `defaultPlotConfiguration` (\#632).

- Function `sensitivityTimeProfiles` with new signature and enhanced visuals:
- `xAxisScale` and `yAxisScale` to set axis scales to `log` or `lin` (\#669).
- `xUnits` and `yUnits` to change units in the plot (\#688).
- Enhanced plot customization options through `defaultPlotConfiguration` as
described in the documentation (\#669).
- Support for adding `observedData` (single or multiple `DataSet` objects)
to the plots (\#674).
- `xAxisScale` and `yAxisScale` to set axis scales to `log` or `lin`
(\#669).
- `xUnits` and `yUnits` to change units in the plot (\#688).
- Enhanced plot customization options through `defaultPlotConfiguration`
as described in the documentation (\#669).
- Support for adding `observedData` (single or multiple `DataSet` objects)
to the plots (\#674).

- Function `writeExcel()` is no longer exported. (\#672)

Expand Down Expand Up @@ -73,8 +93,8 @@
- More explicit error is shown if x/yOffsetsUnit is not set when x/yOffset is
defined.

- Plotting functions have improved dynamic axis breaks, limits calculation, and
labeling (\#691).
- Plotting functions have improved dynamic axis breaks, limits calculation,
and labeling (\#691).

# esqlabsR 5.1.3

Expand Down
Loading