Expression profile in core

nuget_to_mobi.bat

@@ -0,0 +1,4 @@
+@echo off
+cls
+rake create_local_nuget[-m] 
+pause

nuget_to_pksim.bat

@@ -0,0 +1,4 @@
+@echo off
+cls
+rake create_local_nuget[-p] 
+pause

rakefile.rb

@@ -26,32 +26,88 @@
 	Coverage.cover(filter, targetProjects)
 end
 
-  task :copy_to_pksim do
-	copy_to_app '../PK-Sim/src/PKSim/bin/Debug/net472'
+task :copy_to_pksim do
+  copy_to_app '../PK-Sim/src/PKSim/bin/Debug/net472'
+end
+
+task :copy_to_mobi do
+  copy_to_app '../MoBi/src/MoBi/bin/Debug/net472'
+end
+
+task :create_local_nuget, [:arg1, :arg2] do |t, args|
+  FileUtils.rm_f Dir.glob("./nuget_repo/*.nupkg")
+  versionId = "12.0.0-" + generate_code(5)
+  puts("Your version is " + versionId.red)
+  system("dotnet", "pack", "-p:PackageVersion="+ versionId, "--configuration", "Debug", "--output", "nuget_repo", "--no-build") 
+
+  if args.to_hash.values.include? "-m"
+    update_mobi(versionId)
   end
-
-  task :copy_to_mobi do
-	copy_to_app '../MoBi/src/MoBi/bin/Debug/net472'
+  if args.to_hash.values.include? "-p"
+    update_pksim(versionId)
   end
-
-  private
-
-  def copy_to_app(app_target_relative_path)
-	app_target_path = File.join(solution_dir, app_target_relative_path)
-	source_dir = File.join(tests_dir, 'OSPSuite.Starter', 'bin', 'Debug', "net472")
-
-	copy_dependencies source_dir,  app_target_path do
-	  copy_file 'OSPSuite.*.dll'
-	  copy_file 'OSPSuite.*.pdb'
-	end
-
+
+end
+
+private
+def find_token(file, regex)
+  file_content = str = IO.read(file)
+  matches = file_content.match(regex)
+
+  if(matches.nil?)
+    return nil
   end
-
-  def solution_dir
-	File.dirname(__FILE__)
+  return matches[1]
+end
+
+def update_mobi(versionId)
+  puts("updating MoBi")
+  token = find_token("../MoBi/src/MoBi/MoBi.csproj", /<PackageReference Include="OSPSuite.Core" Version="(.*)"/)
+  if(token.nil?)
+    return
   end
-
-  def tests_dir
-	File.join(solution_dir, 'tests')
+
+  glob = Dir.glob('../MoBi/**/*.csproj')
+  glob.each do |file|
+    Utils.replace_tokens({token => versionId}, file)
   end
+
+end
+
+def update_pksim(versionId)
+  puts("updating PKSim")
+  token = find_token("../PK-Sim/src/PKSim/PKSim.csproj", /<PackageReference Include="OSPSuite.Core" Version="(.*)"/)
+  if(token.nil?)
+    return
+  end
+
+  glob = Dir.glob('../PK-Sim/**/*.csproj')
+  glob.each do |file|
+    Utils.replace_tokens({token => versionId}, file)
+  end
+end
+
+def generate_code(number)
+  charset = Array('A'..'Z') + Array('a'..'z')
+  Array.new(number) { charset.sample }.join
+end
+
+def copy_to_app(app_target_relative_path)
+  app_target_path = File.join(solution_dir, app_target_relative_path)
+  source_dir = File.join(tests_dir, 'OSPSuite.Starter', 'bin', 'Debug', "net472")
+
+  copy_dependencies source_dir,  app_target_path do
+    copy_file 'OSPSuite.*.dll'
+    copy_file 'OSPSuite.*.pdb'
+end
+
+end
+
+def solution_dir
+  File.dirname(__FILE__)
+end
+
+def tests_dir
+  File.join(solution_dir, 'tests')
+end
 

src/OSPSuite.Assets/UIConstants.cs

@@ -18,6 +18,8 @@ public static class SizeAndLocation
 
    public static class Captions
    {
+      public static readonly string Species = "Species";
+      public static readonly string Category = "Category";
       public static readonly string ConfirmationDialog = "Confirmation";
       public static readonly string Excel = "Excel®";
       public static readonly string EmptyColumn = " ";

src/OSPSuite.Core/Comparison/ExpressionProfileDiffBuilder.cs

@@ -0,0 +1,19 @@
+using OSPSuite.Core.Domain.Builder;
+
+namespace OSPSuite.Core.Comparison
+{
+   public class ExpressionProfileBuildingBlockDiffBuilder : StartValueBuildingBlockDiffBuilder<ExpressionParameter>
+   {
+      public ExpressionProfileBuildingBlockDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer) : base(objectBaseDiffBuilder, enumerableComparer)
+      { 
+      }
+   }
+
+   internal class ExpressionParameterDiffBuilder : StartValueDiffBuilder<ExpressionParameter>
+   {
+
+      public ExpressionParameterDiffBuilder(IObjectComparer objectComparer, EntityDiffBuilder entityDiffBuilder, WithValueOriginComparison<ExpressionParameter> valueOriginComparison) : base(objectComparer, entityDiffBuilder, valueOriginComparison)
+      {
+      }
+   }
+}

src/OSPSuite.Core/Domain/Builder/ExpressionParameter.cs

@@ -0,0 +1,22 @@
+using OSPSuite.Core.Domain.Services;
+
+namespace OSPSuite.Core.Domain.Builder
+{
+   public class ExpressionParameter : PathAndValueEntity, IStartValue
+   {
+      /// <summary>
+      ///    Do not use! When refactoring on promotion to core, this should be removed
+      /// </summary>
+      public double? StartValue { get; set; }
+
+      public override void UpdatePropertiesFrom(IUpdatable source, ICloneManager cloneManager)
+      {
+         base.UpdatePropertiesFrom(source, cloneManager);
+
+         if (!(source is ExpressionParameter sourceExpressionParameter))
+            return;
+
+         StartValue = sourceExpressionParameter.StartValue;
+      }
+   }
+}

src/OSPSuite.Core/Domain/Builder/ExpressionProfileBuildingBlock.cs

@@ -0,0 +1,50 @@
+using OSPSuite.Core.Domain.Services;
+
+namespace OSPSuite.Core.Domain.Builder
+{
+   public class ExpressionProfileBuildingBlock : StartValueBuildingBlock<ExpressionParameter>
+   {
+      public override string Icon => Type.IconName;
+
+      public virtual string MoleculeName { get; private set; }
+
+      public string Species { get; private set; }
+
+      public ExpressionType Type { set; get; }
+
+      public int PKSimVersion { set; get; }
+
+      public virtual string Category { get; private set; }
+
+      public override string Name
+      {
+         get => PKSimCoreConstants.ContainerName.ExpressionProfileName(MoleculeName, Species, Category);
+         set
+         {
+            if (string.Equals(Name, value))
+            {
+               return;
+            }
+
+            var (moleculeName, species, category) = PKSimCoreConstants.ContainerName.NamesFromExpressionProfileName(value);
+            if (string.IsNullOrEmpty(moleculeName))
+               return;
+
+            Species = species;
+            Category = category;
+            MoleculeName = moleculeName;
+         }
+      }
+
+      public override void UpdatePropertiesFrom(IUpdatable source, ICloneManager cloneManager)
+      {
+         base.UpdatePropertiesFrom(source, cloneManager);
+         var sourceExpressionProfile = source as ExpressionProfileBuildingBlock;
+         if (sourceExpressionProfile == null) return;
+
+         Type = sourceExpressionProfile.Type;
+         PKSimVersion = sourceExpressionProfile.PKSimVersion;
+         Name = sourceExpressionProfile.Name;
+      }
+   }
+}

src/OSPSuite.Core/Domain/Builder/ExpressionTypes.cs

@@ -0,0 +1,65 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OSPSuite.Core.Domain.Builder
+{
+
+   public enum ExpressionTypesId
+   {
+      Transport,
+      Enzyme,
+      BindingPartner
+   }
+
+   public static class TempAssets
+   {
+      public static class Captions
+      {
+         public static readonly string Species = "Species";
+         public static readonly string Category = "Category";
+
+         public static string Transporter = "Transporter";
+         public static string Protein = "Protein";
+         public static string Enzyme = "Enzyme";
+      }
+
+      public static class IconNames
+      {
+         public static string Transporter = "Transporter";
+         public static string Protein = "Protein";
+         public static string Enzyme = "Enzyme";
+      }
+   }
+
+   public static class ExpressionTypes
+   {
+      public static ExpressionType TransportProtein = new ExpressionType(TempAssets.IconNames.Transporter, TempAssets.Captions.Transporter, ExpressionTypesId.Transport);
+      public static ExpressionType MetabolizingEnzyme = new ExpressionType(TempAssets.IconNames.Enzyme, TempAssets.Captions.Enzyme, ExpressionTypesId.Enzyme);
+      public static ExpressionType ProteinBindingPartner = new ExpressionType(TempAssets.IconNames.Protein, TempAssets.Captions.Protein, ExpressionTypesId.BindingPartner);
+
+      private static List<ExpressionType> _types = new List<ExpressionType>
+      {
+         TransportProtein,
+         MetabolizingEnzyme,
+         ProteinBindingPartner
+      };
+
+      public static ExpressionType ById(ExpressionTypesId expressionTypeId)
+      {
+         return _types.First(x => Equals(x.Id, expressionTypeId));
+      }
+   }
+
+   public class ExpressionType
+   {
+      public ExpressionTypesId Id { get; }
+      public string IconName { get; }
+      public string DisplayName { get; }
+      public ExpressionType(string iconName, string displayName, ExpressionTypesId expressionTypesId)
+      {
+         Id = expressionTypesId;
+         IconName = iconName;
+         DisplayName = displayName;
+      }
+   }
+}