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

Reintegrate changes in develop #2668

Merged
merged 55 commits into from
Jun 23, 2023
Merged

Reintegrate changes in develop #2668

merged 55 commits into from
Jun 23, 2023

Conversation

msevestre
Copy link
Member

No description provided.

rwmcintosh and others added 30 commits November 28, 2022 09:32
* waiting for Core PR to be accepted

* nugets updated

* updating nuget
* initial try

* temp nuget update

* adjusting mapper

* Fixes #2344 Implement "Parameter Value Export" for Expression Profiles BB in PK-Sim (#2442)

* use GetAllChildren of Individual (#2445)

* 2438 outptu mappings not cleared (#2444)

* waiting for Core PR to be accepted

* nugets updated

* updating nuget

* temp nuget update

* working export

* spacing

* updating packages

* do not map object path for  'ROOT'

* do not repeat formulae in the formula cache

* adding tests

* fixing test

* correction

* consolidate assets

* correcting nugets

* code review changes

* code review

* PR feedback

* update core version

* Appveyor builds turned on

* PR feedback

* pr feedback

Co-authored-by: Robert McIntosh <[email protected]>
* #784_expression_profile_from_pksim

* updating with mapper

* Fixes #2475 Create expression profile from PK-sim

* add dimensions as resource for tests

* Add pkparameters for test project

* add sqlite db

* PR feedback
* work in progress

* work in progress

* Revise to map origin data as strings instead of keeping a common OriginData class

* Update core and mapping of origin data

* Testing the mapper

* testing the mapper

* revert an unintentional change

* PR Feedback
…ere is only one possible value (#2510)

* Fixes #2508 Do not export calculation methods with Individual when there is only one possible value

* PR feedback

* PR feedback and update core

* update core
#2548)

* Fixes #2534 Imported expression profile is not populated from the PKSim Database

* PR Changes

* PR feedback

* update core
* Fixes #2439 Misleading info in global POP PK Analysis if no parameter… (#2459)

* Fixes #2439 Misleading info in global POP PK Analysis if no parameters can be calculated

* PR feedback

* Fixes #2469 show hidden entities (#2488)

* Fixes buil failing (#2489)

* Fixes #2495 failing tests (#2499)

* Fixes #2485 observed added mobi (#2500)

* Fixes #2484 bug when exporting pop simulation (#2503)

* Fixes #2275 #2279 #2277 by updating OSPSuite.Core (#2506)

* Fixes #2405 mapping lost after configure (#2507)

* Fixes #2255 resetting concentration issue (#2512)

* Fixes #2255 resetting concentration issue

* Small update to stay symetrical

* Update MoleculeExpressionTask.cs

* Modify the comment to reflect population

Co-authored-by: Robert McIntosh <[email protected]>

* update core (#2514)

* Prepare for v11_1 (#2515)

* Fixes #2516 Cannot run population simulations imported from pkml (#2517)

* Fixes #2516 Cannot run population simulations imported from pkml

* PR feedback

* Fixes #2518 11.1 Cannot show PK-Analysis in a population simulations … (#2520)

* Fixes #2518 11.1 Cannot show PK-Analysis in a population simulations imported from pkml

* PR feedback

* PR feedback

* Updated OSPSuite.Core and OSPSuite.BuildingBlockTemplates (#2524)

* Updated OSPSuite.Core and OSPSuite.BuildingBlockTemplates

* Updated OSPSuite.Core again

Co-authored-by: Yuri05 <[email protected]>

* Update documentation v11.1

* Fixes #2553 pksim changes molecule name (#2561)

* Fixes #2536 loading project from snapshot observed data (#2560)

* Fixes #2536 loading project from snapshot observed data

* Fixes #2536 loading project from snapshot observed data

* Fixes #2536 loading project from snapshot observed data

* Fixes #2558 project created with v10< do not export properly (#2559)

* Fixes #2563 notification weird column no image data (#2564)

* Try update core

* Update to latest core

* More work to make sure we can still load indiviudals

* Remove creation of PSV for simulation

* Fixes test project"

* Fixes test project"

* No more psv

---------

Co-authored-by: Robert McIntosh <[email protected]>
Co-authored-by: Juri Solodenko <[email protected]>
Co-authored-by: Yuri05 <[email protected]>
* WIP #2569 use Individual Building block and module from core

* Some local variable rename. Build configuration not used anymore

* Map also indiviudal and expression building block. Needs #2570 to compile

* More work on #2569 to make test pass again:

* Fixes #2569 use of individual building blocks

* Fixes #2569 use individual building block and module from core
# Conflicts:
#	src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
#	src/PKSim.Assets/PKSim.Assets.csproj
#	src/PKSim.BatchTool/PKSim.BatchTool.csproj
#	src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
#	src/PKSim.CLI/PKSim.CLI.csproj
#	src/PKSim.Core/Mappers/RangeChartDataToDataTableMapper.cs
#	src/PKSim.Core/PKSim.Core.csproj
#	src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
#	src/PKSim.Matlab/PKSim.Matlab.csproj
#	src/PKSim.Presentation/PKSim.Presentation.csproj
#	src/PKSim.R/PKSim.R.csproj
#	src/PKSim.UI/PKSim.UI.csproj
#	src/PKSim/PKSim.csproj
#	tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
#	tests/PKSim.R.Tests/PKSim.R.Tests.csproj
#	tests/PKSim.Tests/Core/SimulationPersistableUpdaterSpecs.cs
#	tests/PKSim.Tests/Data/expression_and_individual_V10.pksim5
#	tests/PKSim.Tests/PKSim.Tests.csproj
#	tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
#	tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
* Fixes #2584 update to support module configuration

* Fixes #2584 update to support module configuration

* Make test pass again
* Added views to DB

* DB - adjusted naming of view and columns

* Fixes #2586 Provide info which parameters are not common for all species

* Fixes #2586 Provide info which parameters are not common for all species

* review comments

* Add serializer for the new dummy type

---------

Co-authored-by: Yuri05 <[email protected]>
#2591)

* Fixes #2589 only export species indepednent parameters to spatial structure

* Update to real DLLs

* Fixes typo
* Fixes update core

* Fixes weird definition
msevestre and others added 25 commits May 5, 2023 16:48
* WIP #2596 implement hepatic impairment disease state

* More work on #2596

* More work on #2596

* More work on #2592

* Fixes #2596 implement hepatic impairement disease sate

* Fixes #2596

* Fixes #2596

* Small update

* Fixes merge conflict
…nc (#2620)

* Some rename first

* Add test showing issue with #2615

* Update to algorithm to match specificaitons

* Move logic of disease state to own view

* Fixes #2615 overriding ref conc

* Update DiseaseStateDTO.cs

just a typo

* Fixes failing test

* Fixes #2615 overriding ref conc

---------

Co-authored-by: Robert McIntosh <[email protected]>
* Update to 12.0.178

* update to 12.0.178

* Update core
* Fixes #2621. Fixes #2622

* Fixes #2621. Fixes #2622

* Fixes #2621
* Fixes #2638 cannot export HI to snapshot

* Update DiseaseState.cs

make sure we use old way of namespacing

* Update DiseaseStateMapper.cs

* Update DiseaseStateMapper.cs

* Fixes #2638. Use file scoped namespace

* Fixes #2638 by reverting to namespace
* WIP #2632

* Fixes #2632 error value cannot be null

* Also null for protocol mapper
* Fixes #2643 when to show global pk analysis

* Fixes #2643 when to show global pk analysis

* Could not let it go
…pk sim to mobi (#2645)

* Fixes #2627 no expression profiles created

* Fixes #2627 no expression profiles created

* Fixes type
…ion profile (#2649)

* Fixes #2640 Export initial conditions for expressions as part of the expression profile

* Update core

* separate MoleculeBuilders by their presence and definition in the individual

* rename

* refactor enumerable

* PR feedback

* remove dead starter tests project
* Fixes #2654 by removing support for version <7.0

* Fixes #2654 by removing support for version <7.0
…ecule types (#2659)

* Too many molecules in molecules list for some observers

* Do not change container observer type to Drug
* WIP #2532

* fix using the wrong assertion

* Add default parameters to all molecules

* add parameter to actual proten

* Also add the parmaeter values

* add reference to tablews

* WIP #2532 ontogeny factor in expression profile

* WIP #2532 ontogeny factor

* WIP #2532 ontogeny factor

* Rename db field

* Make PMA only human dependent
* Fixes #2657 ontogeny factor dimensionless

* Fixes #2657
* Fixes #2660 remove estimated ga and use PMA instead

* Actual real formula
@msevestre msevestre merged commit 3d4f47b into develop Jun 23, 2023
@msevestre msevestre deleted the OSMOSES branch June 23, 2023 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants