Skip to content

Commit

Permalink
Reintegrate changes in develop (#2668)
Browse files Browse the repository at this point in the history
* 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

* 2364 export expression profile domain object  (#2461)

* 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 <261477+rwmcintosh@users.noreply.github.com>

* Fixes #2470 Refactor StartValues vs PathWithValueEntity (#2473)

* 2475 expression profile from pksim (#2476)

* #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

* Fixes #2480 individual serialization (#2494)

* 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

* Update core (#2502)

* Fixes #2508 Do not export calculation methods with Individual when there 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

* update core osmoses (#2513)

* update core (#2528)

* Fixes update latest core (#2541)

* 2525 creating individual from MoBi (PK-Sim code changes) (#2526)



---------

Co-authored-by: Robert McIntosh <261477+rwmcintosh@users.noreply.github.com>

* Fixes #2534 Imported expression profile is not populated from the PKS… (#2548)

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

* PR Changes

* PR feedback

* update core

* Fixes #2552 Export of Expression profile to PKML - include initial conditions (#2554)

* Update PKSIm with latest changes (#2555)

* Fixes #2551 Use DevExpress skin to color grid cells (#2556)

* No more psv (#2567)

* 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 <261477+rwmcintosh@users.noreply.github.com>

* 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 <Yuri05@github.com>

* 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 <261477+rwmcintosh@users.noreply.github.com>
Co-authored-by: Juri Solodenko <Yuri05@users.noreply.github.com>
Co-authored-by: Yuri05 <Yuri05@github.com>

* Fixes #2570 Move IndividualToIndividualBuildingBlockMapper from presentation to core (#2572)

* 2569 use individualbuildingblock and module from core (#2571)

* 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

* Fixes #2577 Exported expression profiles contains duplicate formulae (#2578)

* 2584 update to support moduleconfiguration (#2585)

* Fixes #2584 update to support module configuration

* Fixes #2584 update to support module configuration

* Make test pass again

* 2586 parameters not common for all species (#2587)

* 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 <Yuri05@github.com>

* Fixes #2589 only export species indepednent parameters to spatial str… (#2591)

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

* Update to real DLLs

* Fixes typo

* Remove unused action

* Fixes update core (#2593)

* Fixes update core

* Fixes weird definition

* Update latest core (#2594)

* update to core 12.0.170 (#2604)

* Fixes #2596 implement hepatic impairment disease state (#2597)

* 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

* 2615 overriding ref conc and applying hi should use the updated refconc (#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 <261477+rwmcintosh@users.noreply.github.com>

* Core updates (#2625)

* Update to 12.0.178

* update to 12.0.178

* Update core

* update core (#2629)

* Fixes #2621. Fixes #2622 (#2630)

* Fixes #2621. Fixes #2622

* Fixes #2621. Fixes #2622

* Fixes #2621

* update core (#2633)

* Fixes #2624. Fixes #2623 (#2637)

* Fixes #2638 cannot export HI to snapshot (#2639)

* 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

* 2632 errorvalue cannot be null parameter name source (#2641)

* WIP #2632

* Fixes #2632 error value cannot be null

* Also null for protocol mapper

* Fixes #2643 when to show global pk analysis (#2644)

* Fixes #2643 when to show global pk analysis

* Fixes #2643 when to show global pk analysis

* Could not let it go

* 2627 no expression profiles created when exporting a simulation from pk sim to mobi (#2645)

* Fixes #2627 no expression profiles created

* Fixes #2627 no expression profiles created

* Fixes type

* Fixes update latest core (#2648)

* 2640 export initial conditions for expressions as part of the expression 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

* core updated to 12.0.191. No diffbuilders with Dimension specified (#2652)

* 2654 fix failing tests (#2655)

* Fixes #2654 by removing support for version <7.0

* Fixes #2654 by removing support for version <7.0

* Fixes #2658 differences in simulations created by pk sim and mobi molecule types (#2659)

* Too many molecules in molecules list for some observers

* Do not change container observer type to Drug

* Fixes #2532 (#2636)

* 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

* 2657 ontogeny factor is it dimensionless or fraction (#2662)

* Fixes #2657 ontogeny factor dimensionless

* Fixes #2657

* Fixes #2661 exception when using 2 pore simulations (#2663)

* Fixes #2660 remove estimated ga and use PMA instead (#2664)

* Fixes #2660 remove estimated ga and use PMA instead

* Actual real formula

* Fixes #2617 export to snapshot (#2665)

* undo changes in appveryor

* undo changes in appveryor

* Update to latest core

---------

Co-authored-by: Robert McIntosh <261477+rwmcintosh@users.noreply.github.com>
Co-authored-by: georgeDaskalakis <37107428+georgeDaskalakis@users.noreply.github.com>
Co-authored-by: Juri Solodenko <Yuri05@users.noreply.github.com>
Co-authored-by: Yuri05 <Yuri05@github.com>
  • Loading branch information
5 people authored Jun 23, 2023
1 parent ea6b9aa commit 3d4f47b
Show file tree
Hide file tree
Showing 647 changed files with 18,936 additions and 17,092 deletions.
10 changes: 5 additions & 5 deletions PKSim.sln
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.R", "src\PKSim.R\PKSi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.R.Tests", "tests\PKSim.R.Tests\PKSim.R.Tests.csproj", "{4E310F99-4604-4502-8F0B-A4E4F27B062B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.UI.Starter", "tests\PKSim.UI.Starter\PKSim.UI.Starter.csproj", "{795B1096-E236-4A0B-AB67-590F264F9F8E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.UI.Starter", "src\PKSim.UI.Starter\PKSim.UI.Starter.csproj", "{35E511E9-0130-4E28-9DB3-EDCCB098D383}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -128,10 +128,10 @@ Global
{4E310F99-4604-4502-8F0B-A4E4F27B062B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E310F99-4604-4502-8F0B-A4E4F27B062B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E310F99-4604-4502-8F0B-A4E4F27B062B}.Release|Any CPU.Build.0 = Release|Any CPU
{795B1096-E236-4A0B-AB67-590F264F9F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{795B1096-E236-4A0B-AB67-590F264F9F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{795B1096-E236-4A0B-AB67-590F264F9F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{795B1096-E236-4A0B-AB67-590F264F9F8E}.Release|Any CPU.Build.0 = Release|Any CPU
{35E511E9-0130-4E28-9DB3-EDCCB098D383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35E511E9-0130-4E28-9DB3-EDCCB098D383}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35E511E9-0130-4E28-9DB3-EDCCB098D383}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35E511E9-0130-4E28-9DB3-EDCCB098D383}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
10 changes: 1 addition & 9 deletions appveyor-coverage.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
configuration: Debug
image: Visual Studio 2019

environment:
MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
image: Visual Studio 2022

version: '{build}'

Expand All @@ -27,11 +24,6 @@ install:
Start-Process msiexec.exe -ArgumentList /i, C:\msxml.msi, /quiet, /qn, /norestart -Wait
- ps: >-
(new-object net.webclient).DownloadFile('https://github.com/Open-Systems-Pharmacology/MiKTeX/releases/download/v2.9.3/MikTex.2.9.3.msi', 'C:\\MikTex.msi')
Start-Process msiexec.exe -ArgumentList /i, C:\MikTex.msi, /quiet, /qn, /norestart, INSTALLDIR=$env:MIK_TEX_INSTALL_DIR -Wait
before_build:
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
Expand Down
2 changes: 1 addition & 1 deletion appveyor-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
configuration: Debug
image: Visual Studio 2019
image: Visual Studio 2022

version: '{build}'

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
configuration: Debug
image: Visual Studio 2019
image: Visual Studio 2022

version: '{build}'

Expand Down
2 changes: 1 addition & 1 deletion documentation
Empty file added fileName
Empty file.
2 changes: 1 addition & 1 deletion rakefile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
packages_dir = src_dir_for("Debug")

all_users_dir = ENV['ALLUSERSPROFILE']
all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '11.1')
all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '12.0')

copy_dependencies solution_dir, all_users_application_dir do
copy_dimensions_xml
Expand Down
84 changes: 83 additions & 1 deletion src/Db/Diff/PKSimDB_diff.txt

Large diffs are not rendered by default.

20,726 changes: 10,416 additions & 10,310 deletions src/Db/Dump/PKSimDB_dump.txt

Large diffs are not rendered by default.

Binary file modified src/Db/Dump/sqlite3.exe
Binary file not shown.
Binary file modified src/Db/PKSimDB.sqlite
Binary file not shown.
14 changes: 7 additions & 7 deletions src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<Version>11.1.0</Version>
<PackageVersion>11.1.0</PackageVersion>
<AssemblyVersion>11.1.0</AssemblyVersion>
<FileVersion>11.1.0</FileVersion>
<InformationalVersion>11.1.0</InformationalVersion>
<Version>12.0.0</Version>
<PackageVersion>12.0.0</PackageVersion>
<AssemblyVersion>12.0.0</AssemblyVersion>
<FileVersion>12.0.0</FileVersion>
<InformationalVersion>12.0.0</InformationalVersion>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
Expand All @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.198" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.198" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/PKSim.Assets/PKSim.Assets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>11.1.0</Version>
<PackageVersion>11.1.0</PackageVersion>
<AssemblyVersion>11.1.0</AssemblyVersion>
<FileVersion>11.1.0</FileVersion>
<InformationalVersion>11.1.0</InformationalVersion>
<Version>12.0.0</Version>
<PackageVersion>12.0.0</PackageVersion>
<AssemblyVersion>12.0.0</AssemblyVersion>
<FileVersion>12.0.0</FileVersion>
<InformationalVersion>12.0.0</InformationalVersion>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
Expand All @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.198" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.198" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 11 additions & 2 deletions src/PKSim.Assets/PKSimConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,8 @@ public static string SimulationPKAnalysesFileDoesNotHaveTheExpectedFormat

public const string CKDOnlyAvailableForAdult = "Chronic kidney disease model is only available for adult. Make sure the input age is greater than or equal to 18 years.";

public const string HIOnlyAvailableForAdult = "Hepatic impairment disease model is only available for adult. Make sure the input age is greater than or equal to 18 years.";

public const string EventTemplateNotDefined = "Event template not defined.";

public static string FormulationIsRequiredForType(string applicationType) => $"Formulation is required for type '{applicationType}'.";
Expand Down Expand Up @@ -934,6 +936,9 @@ public static string MultipleOperatorFoundForContainer(int containerId, string p

public static string ExpressionProfileForMoleculeNotFound(string molecule, string buildingBlockName, string buildingBlockType) =>
$"Expression profile for molecule '{molecule}' was not found in the project. Please delete this molecule from {buildingBlockType.ToLower()} '{buildingBlockName}'.";

public static string CouldNotFindMoleculeType(string moleculeType) =>
$"Could not find the molecule type {moleculeType}";
}

public static class Information
Expand Down Expand Up @@ -1147,7 +1152,6 @@ public static class MenuNames
public static readonly string NewFormulation = "Add &Formulation...";
public static readonly string NewEvent = "Add &Event...";
public static readonly string NewObservers = "Add &Observers...";
public static readonly string NewExpressionProfile = "Add &Expression Profile";
public static readonly string AddObservedData = "Add &Observed Data...";
public static readonly string AddObservedDataFor = "Add Observed Data for";
public static readonly string SaveAs = "Save As...";
Expand Down Expand Up @@ -1883,7 +1887,6 @@ public static class UI
public static readonly string NewFormulationDescription = "Create a new formulation...";
public static readonly string NewEventDescription = "Create a new event...";
public static readonly string NewObserversDescription = "Create a new observer list...";
public static readonly string NewExpressionProfileDescription = "Create a new expression profile...";
public static readonly string NewCompoundDescription = "Create a new compound...";
public static readonly string OptionsDescription = "Manage the options for the application and the current user...";
public static readonly string ExitDescription = "Exit the application";
Expand Down Expand Up @@ -1945,6 +1948,8 @@ public static class UI
public static readonly string No = "No";
public static readonly string Yes = "Yes";
public static readonly string ExportObservedDataToPkml = "Export observed data to pkml";
public static readonly string ExportExpressionProfile = "Export expression profile to pkml";
public static readonly string ExportIndividual = "Export individual to pkml";
public static readonly string ExportSimulationResultsToExcel = $"Export simulation results to {Excel}";
public static readonly string ExportPopulationAnalysisToExcelTitle = $"Export analysis to {Excel}";
public static readonly string ExportSimulationResultsToCSV = $"Export simulation results to CSV";
Expand Down Expand Up @@ -2357,6 +2362,8 @@ public static string ImportSolubilityTableDescription

public static string OntogenyFor(string moleculeName) => $"{Ontogeny} for {moleculeName}";

public static string OntogenyFor(string moleculeName, string container) => $"{Ontogeny} for {moleculeName} - {container}";

public static string AddParameterAsFavorites(string parameterName) => $"Add '{parameterName}' as favorite";

public static string ProductIsUpToDate(string productName) => $"{productName} is up to date!";
Expand Down Expand Up @@ -2592,6 +2599,8 @@ public static string UserTemplateDatabaseDatabaseUsedOldFormatAndCannotBeLoaded(
public static readonly string DidYouReallyBackupProject = "Did you really make a backup of your project?";

public static string LinkedExpressionProfileIs(string expressionProfileName) => $"Using expression profile <b>{expressionProfileName}</b>";

public static string ChildPughScoreFor (string score)=> $"Child-Pugh {score}";
}

public static class Reporting
Expand Down
14 changes: 7 additions & 7 deletions src/PKSim.BatchTool/PKSim.BatchTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<OutputType>WinExe</OutputType>
<Version>11.1.0</Version>
<PackageVersion>11.1.0</PackageVersion>
<AssemblyVersion>11.1.0</AssemblyVersion>
<FileVersion>11.1.0</FileVersion>
<InformationalVersion>11.1.0</InformationalVersion>
<Version>12.0.0</Version>
<PackageVersion>12.0.0</PackageVersion>
<AssemblyVersion>12.0.0</AssemblyVersion>
<FileVersion>12.0.0</FileVersion>
<InformationalVersion>12.0.0</InformationalVersion>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<Authors>Open-Systems-Pharmacology</Authors>
Expand Down Expand Up @@ -59,8 +59,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
<PackageReference Include="OSPSuite.Core" Version="12.0.198" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.198" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
Expand Down
14 changes: 7 additions & 7 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>11.1.0</Version>
<PackageVersion>11.1.0</PackageVersion>
<AssemblyVersion>11.1.0</AssemblyVersion>
<FileVersion>11.1.0</FileVersion>
<InformationalVersion>11.1.0</InformationalVersion>
<Version>12.0.0</Version>
<PackageVersion>12.0.0</PackageVersion>
<AssemblyVersion>12.0.0</AssemblyVersion>
<FileVersion>12.0.0</FileVersion>
<InformationalVersion>12.0.0</InformationalVersion>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
Expand All @@ -27,9 +27,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.198" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
<PackageReference Include="OSPSuite.Core" Version="12.0.198" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/PKSim.CLI/PKSim.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<OutputType>Exe</OutputType>
<Version>11.1.0</Version>
<PackageVersion>11.1.0</PackageVersion>
<AssemblyVersion>11.1.0</AssemblyVersion>
<FileVersion>11.1.0</FileVersion>
<InformationalVersion>11.1.0</InformationalVersion>
<Version>12.0.0</Version>
<PackageVersion>12.0.0</PackageVersion>
<AssemblyVersion>12.0.0</AssemblyVersion>
<FileVersion>12.0.0</FileVersion>
<InformationalVersion>12.0.0</InformationalVersion>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
Expand Down Expand Up @@ -61,9 +61,9 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
<PackageReference Include="OSPSuite.Presentation" Version="11.2.155" />
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
<PackageReference Include="OSPSuite.Core" Version="12.0.198" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.198" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.198" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
Expand Down
8 changes: 7 additions & 1 deletion src/PKSim.Core/ApplicationSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public interface IApplicationSettings : OSPSuite.Core.IApplicationSettings
void AddSpeciesDatabaseMap(SpeciesDatabaseMap speciesDatabaseMap);
void RemoveSpeciesDatabaseMap(string speciesName);
bool HasExpressionsDatabaseFor(Species species);
bool HasExpressionsDatabaseFor(string speciesName);
SpeciesDatabaseMap SpeciesDatabaseMapsFor(string speciesName);

/// <summary>
Expand All @@ -37,9 +38,14 @@ public void RemoveSpeciesDatabaseMap(string species)
_allMaps.Remove(species);
}

public bool HasExpressionsDatabaseFor(string speciesName)
{
return _allMaps.Contains(speciesName);
}

public bool HasExpressionsDatabaseFor(Species species)
{
return _allMaps.Contains(species.Name);
return HasExpressionsDatabaseFor(species.Name);
}

public SpeciesDatabaseMap SpeciesDatabaseMapsFor(string speciesName)
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Core/Commands/AddObserverToObserverSetCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

namespace PKSim.Core.Commands
{
public class AddObserverToObserverSetCommand : AddEntityToContainerCommand<IObserverBuilder, ObserverSet, AddObserverToObserverSetEvent>
public class AddObserverToObserverSetCommand : AddEntityToContainerCommand<ObserverBuilder, ObserverSet, AddObserverToObserverSetEvent>
{
public AddObserverToObserverSetCommand(IObserverBuilder observer, ObserverSet observerSet, IExecutionContext context)
public AddObserverToObserverSetCommand(ObserverBuilder observer, ObserverSet observerSet, IExecutionContext context)
: base(observer, observerSet, context)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

namespace PKSim.Core.Commands
{
public class RemoveObserverFromObserverSetCommand : RemoveEntityFromContainerCommand<IObserverBuilder, ObserverSet, RemoveObserverFromObserverSetEvent>
public class RemoveObserverFromObserverSetCommand : RemoveEntityFromContainerCommand<ObserverBuilder, ObserverSet, RemoveObserverFromObserverSetEvent>
{
public RemoveObserverFromObserverSetCommand(IObserverBuilder observer, ObserverSet observerSet, IExecutionContext context)
public RemoveObserverFromObserverSetCommand(ObserverBuilder observer, ObserverSet observerSet, IExecutionContext context)
: base(observer, observerSet, context)
{
}
Expand Down
7 changes: 4 additions & 3 deletions src/PKSim.Core/Commands/SetExpressionLocalizationCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using PKSim.Core.Model;
using PKSim.Core.Services;
using static PKSim.Core.Model.Localization;
using static OSPSuite.Core.Domain.Constants.Parameters;

namespace PKSim.Core.Commands
{
Expand Down Expand Up @@ -119,7 +120,7 @@ private IEnumerable<IOSPSuiteCommand> updateTissueExpressionParameters(IExecutio
x.IsNamed(CoreConstants.Parameters.FRACTION_EXPRESSED_INTRACELLULAR) && x.ParentContainer.IsNamed(_protein.Name));

var allTissueRelExpParameters = _simulationSubject.Individual.GetAllChildren<IParameter>(x =>
x.IsNamed(CoreConstants.Parameters.REL_EXP) && x.ParentContainer.IsNamed(_protein.Name));
x.IsNamed(REL_EXP) && x.ParentContainer.IsNamed(_protein.Name));


//not in tissue=> set expression to 0
Expand All @@ -141,7 +142,7 @@ private IEnumerable<IOSPSuiteCommand> updateVascularEndotheliumExpressionParamet
var command = new PKSimMacroCommand();
var f_exp_pls_side = _protein.Parameter(CoreConstants.Parameters.FRACTION_EXPRESSED_VASC_ENDO_PLASMA_SIDE);
var f_exp_endosome = _protein.Parameter(CoreConstants.Parameters.FRACTION_EXPRESSED_VASC_ENDO_ENDOSOME);
var rel_exp_vasc = _protein.Parameter(CoreConstants.Parameters.REL_EXP_VASCULAR_ENDOTHELIUM);
var rel_exp_vasc = _protein.Parameter(REL_EXP_VASCULAR_ENDOTHELIUM);

//not in vasc endo => set expression to 0
command.AddRange(setParametersForFlags(context, None, InVascularEndothelium, (rel_exp_vasc, 0)));
Expand Down Expand Up @@ -173,7 +174,7 @@ private IEnumerable<IOSPSuiteCommand> updateBloodCellsExpressionParameters(IExec
{
var command = new PKSimMacroCommand();
var f_exp_bc_cell = _protein.Parameter(CoreConstants.Parameters.FRACTION_EXPRESSED_BLOOD_CELLS);
var rel_exp_bc = _protein.Parameter(CoreConstants.Parameters.REL_EXP_BLOOD_CELLS);
var rel_exp_bc = _protein.Parameter(REL_EXP_BLOOD_CELLS);

//not in blood cells => set expression to 0
command.AddRange(setParametersForFlags(context, None, InBloodCells, (rel_exp_bc, 0)));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using OSPSuite.Core.Commands.Core;
using OSPSuite.Core.Domain;
using OSPSuite.Core.Domain.Formulas;
using OSPSuite.Core.Domain.Services;
using PKSim.Assets;
using PKSim.Core.Events;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Linq;
using OSPSuite.Core.Commands.Core;
using OSPSuite.Core.Domain;
using OSPSuite.Core.Domain.Formulas;
using OSPSuite.Utility.Extensions;
using PKSim.Core.Mappers;
using PKSim.Core.Model;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using OSPSuite.Core.Commands.Core;
using OSPSuite.Core.Domain;
using OSPSuite.Core.Domain.Formulas;
using OSPSuite.Utility.Extensions;
using PKSim.Core.Model;

Expand Down
Loading

0 comments on commit 3d4f47b

Please sign in to comment.