Merge pull request #1281 from Open-Systems-Pharmacology/develop

Version 8.0
Open-Systems-Pharmacology · Jun 18, 2019 · 4f17a93 · 4f17a93
2 parents a450a3e + 20d5b32
commit 4f17a93
Show file tree

Hide file tree

Showing 638 changed files with 11,390 additions and 4,550 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/PKSim.sln b/PKSim.sln
@@ -106,8 +106,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {13620E23-1993-42C6-A4AB-468E29DD24DE}
 		VisualSVNWorkingCopyRoot = 
+		SolutionGuid = {13620E23-1993-42C6-A4AB-468E29DD24DE}
 	EndGlobalSection
 	GlobalSection(NDepend) = preSolution
 		Project = ".\PKSim.ndproj"

diff --git a/SolutionInfo.cs b/SolutionInfo.cs
@@ -3,11 +3,11 @@
 using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Open Systems Pharmacology")]
 [assembly: AssemblyProduct("PK-Sim")]
-[assembly: AssemblyCopyright("Copyright © 2002-2018 - Open Systems Pharmacology Community")]
+[assembly: AssemblyCopyright("Copyright © 2002-2019 - Open Systems Pharmacology Community")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("7.4.0.0")]
-[assembly: AssemblyFileVersion("7.4.0.0")]
-[assembly: AssemblyInformationalVersion("7.4.0.0 EAP")]
+[assembly: AssemblyVersion("8.0.0")]
+[assembly: AssemblyFileVersion("8.0.0")]
+[assembly: AssemblyInformationalVersion("8.0.0")]
 
 [assembly: InternalsVisibleTo("PKSim.Tests")]
 [assembly: InternalsVisibleTo("PKSim.UI.Tests")]
diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml
@@ -2,7 +2,7 @@ configuration: Debug
 image: Visual Studio 2017
 
 environment:
-  app_version: '7.4.0'
+  app_version: '8.0'
   MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
 
 version: '$(app_version).{build}'
@@ -41,7 +41,7 @@ before_build:
   - nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress 
   - nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser 
   - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
-  - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes-282
+  - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
   - nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
   - nuget restore
 
@@ -52,7 +52,7 @@ build:
 notifications:
   - provider: Slack
     incoming_webhook:      
-      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyF1h7st5qNdNezFp6T+bWXqrcZ4q/smtPcJ7LkUFHL46JDYUFlIL8FDz+ApX/vP+x0=
+      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
 
 test_script:
-  - rake cover
+  - rake cover
diff --git a/appveyor-nightly.yml b/appveyor-nightly.yml
@@ -2,7 +2,7 @@ configuration: Debug
 image: Visual Studio 2017
 
 environment:
-  app_version: '7.4.0'
+  app_version: '8.0'
 
 version: '$(app_version).{build}'
 
@@ -39,7 +39,7 @@ before_build:
   - nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress 
   - nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser 
   - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
-  - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes-282
+  - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
   - nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
   - nuget restore
   - rake "update_go_license[ApplicationStartup.cs, %GO_DIAGRAM_KEY%]"
@@ -56,7 +56,7 @@ build:
 notifications:
   - provider: Slack
     incoming_webhook:      
-      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyF1h7st5qNdNezFp6T+bWXqrcZ4q/smtPcJ7LkUFHL46JDYUFlIL8FDz+ApX/vP+x0=
+      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
 
 on_finish: 
   - ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ configuration: Debug
 image: Visual Studio 2017
 
 environment:
-  app_version: '7.4.0'
+  app_version: '8.0'
 
 version: '$(app_version).{build}'
 
@@ -41,7 +41,7 @@ before_build:
   - nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress 
   - nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser 
   - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
-  - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes-282
+  - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
   - nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
   - nuget restore
 
@@ -65,7 +65,7 @@ test:
 notifications:
   - provider: Slack
     incoming_webhook:      
-      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyF1h7st5qNdNezFp6T+bWXqrcZ4q/smtPcJ7LkUFHL46JDYUFlIL8FDz+ApX/vP+x0=
+      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
 
 install:
 - cmd: git submodule update --init --recursive

diff --git a/dimensions b/dimensions
diff --git a/rakefile.rb b/rakefile.rb
@@ -88,7 +88,7 @@
 	packages_dir =  File.join(solution_dir, 'packages')
 
 	all_users_dir = ENV['ALLUSERSPROFILE']
-	all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '7.4')
+	all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '8.0')
 
 	copy_depdencies solution_dir,  all_users_application_dir do
 		copy_dimensions_xml

diff --git a/src/Db/Diff/PKSimDB_diff.txt b/src/Db/Diff/PKSimDB_diff.txt
@@ -1,4 +1 @@
-UPDATE tab_container_parameters SET sequence=2 WHERE container_id=5015 AND container_type='GENERAL' AND container_name='PROTEIN' AND parameter_name='Relative expression in plasma';
-UPDATE tab_container_parameters SET sequence=2 WHERE container_id=5015 AND container_type='GENERAL' AND container_name='PROTEIN' AND parameter_name='Relative expression in plasma (normalized)';
-UPDATE tab_container_parameters SET sequence=3 WHERE container_id=5015 AND container_type='GENERAL' AND container_name='PROTEIN' AND parameter_name='Relative expression in vascular endothelium';
-UPDATE tab_container_parameters SET sequence=3 WHERE container_id=5015 AND container_type='GENERAL' AND container_name='PROTEIN' AND parameter_name='Relative expression in vascular endothelium (normalized)';
+UPDATE tab_container_parameters SET is_input=0 WHERE container_id=1678 AND container_type='COMPOUND' AND container_name='DRUG' AND parameter_name='Enable supersaturation';