Fixes #2638. Use file scoped namespace

Open-Systems-Pharmacology · May 26, 2023 · f93c4da · f93c4da
1 parent 346a0ac
commit f93c4da
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 89 deletions.
diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml
@@ -1,8 +1,5 @@
 configuration: Debug
-image: Visual Studio 2019
-
-environment:
-  MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
+image: Visual Studio 2022
 
 version: '{build}'
 
@@ -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

diff --git a/appveyor-nightly.yml b/appveyor-nightly.yml
@@ -1,5 +1,5 @@
 configuration: Debug
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 version: '{build}'
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 configuration: Debug
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 version: '{build}'
 

diff --git a/src/PKSim.Core/Snapshots/Mappers/DiseaseStateMapper.cs b/src/PKSim.Core/Snapshots/Mappers/DiseaseStateMapper.cs
@@ -6,107 +6,106 @@
 using PKSim.Assets;
 using PKSim.Core.Model;
 using PKSim.Core.Repositories;
-using ModelOriginData = Model.OriginData;
-using SnapshotDiseaseState = DiseaseState;
+using SnapshotDiseaseState = PKSim.Core.Snapshots.DiseaseState;
+using ModelOriginData = PKSim.Core.Model.OriginData;
 
-namespace PKSim.Core.Snapshots.Mappers
+namespace PKSim.Core.Snapshots.Mappers;
+
+public class DiseaseStateContext : SnapshotContext
 {
-   public class DiseaseStateContext : SnapshotContext
+   public ModelOriginData OriginData { get; }
+
+   public DiseaseStateContext(ModelOriginData originData, SnapshotContext baseContext) : base(baseContext)
    {
-      public ModelOriginData OriginData { get; }
+      OriginData = originData;
+   }
+}
 
-      public DiseaseStateContext(ModelOriginData originData, SnapshotContext baseContext) : base(baseContext)
-      {
-         OriginData = originData;
-      }
+public class DiseaseStateMapper : SnapshotMapperBase<ModelOriginData, SnapshotDiseaseState, DiseaseStateContext>
+{
+   private readonly IDiseaseStateRepository _diseaseStateRepository;
+   private readonly ParameterMapper _parameterMapper;
+   private readonly IDimensionRepository _dimensionRepository;
+
+   public DiseaseStateMapper(
+      IDiseaseStateRepository diseaseStateRepository,
+      ParameterMapper parameterMapper,
+      IDimensionRepository dimensionRepository
+   )
+   {
+      _diseaseStateRepository = diseaseStateRepository;
+      _parameterMapper = parameterMapper;
+      _dimensionRepository = dimensionRepository;
    }
 
-   public class DiseaseStateMapper : SnapshotMapperBase<ModelOriginData, SnapshotDiseaseState, DiseaseStateContext>
+   public override Task<SnapshotDiseaseState> MapToSnapshot(ModelOriginData originData)
    {
-      private readonly IDiseaseStateRepository _diseaseStateRepository;
-      private readonly ParameterMapper _parameterMapper;
-      private readonly IDimensionRepository _dimensionRepository;
-
-      public DiseaseStateMapper(
-         IDiseaseStateRepository diseaseStateRepository,
-         ParameterMapper parameterMapper,
-         IDimensionRepository dimensionRepository
-      )
-      {
-         _diseaseStateRepository = diseaseStateRepository;
-         _parameterMapper = parameterMapper;
-         _dimensionRepository = dimensionRepository;
-      }
+      var diseaseState = originData?.DiseaseState;
+      if (diseaseState == null || diseaseState.IsHealthy)
+         return Task.FromResult<SnapshotDiseaseState>(null);
 
-      public override Task<SnapshotDiseaseState> MapToSnapshot(ModelOriginData originData)
+      var snapshot = new SnapshotDiseaseState
       {
-         var diseaseState = originData?.DiseaseState;
-         if (diseaseState == null || diseaseState.IsHealthy)
-            return Task.FromResult<SnapshotDiseaseState>(null);
-
-         var snapshot = new SnapshotDiseaseState
-         {
-            Name = diseaseState.Name,
-         };
+         Name = diseaseState.Name,
+      };
 
-         if (originData.DiseaseStateParameters.Any())
-            snapshot.Parameters = originData.DiseaseStateParameters.Select(namedParameterFrom).ToArray();
+      if (originData.DiseaseStateParameters.Any())
+         snapshot.Parameters = originData.DiseaseStateParameters.Select(namedParameterFrom).ToArray();
 
-         return Task.FromResult(snapshot);
-      }
+      return Task.FromResult(snapshot);
+   }
 
-      public override Task<ModelOriginData> MapToModel(SnapshotDiseaseState diseaseStateSnapshot, DiseaseStateContext diseaseStateContext)
-      {
-         var originData = diseaseStateContext.OriginData;
+   public override Task<ModelOriginData> MapToModel(SnapshotDiseaseState diseaseStateSnapshot, DiseaseStateContext diseaseStateContext)
+   {
+      var originData = diseaseStateContext.OriginData;
 
-         if (diseaseStateSnapshot == null)
-            return Task.FromResult(originData);
+      if (diseaseStateSnapshot == null)
+         return Task.FromResult(originData);
 
-         var diseaseState = _diseaseStateRepository.AllFor(originData.Population).FindByName(diseaseStateSnapshot.Name);
-         if (diseaseState == null)
-            throw new PKSimException(PKSimConstants.Error.CannotFindDiseaseState(diseaseStateSnapshot.Name, originData.Population.DisplayName));
+      var diseaseState = _diseaseStateRepository.AllFor(originData.Population).FindByName(diseaseStateSnapshot.Name);
+      if (diseaseState == null)
+         throw new PKSimException(PKSimConstants.Error.CannotFindDiseaseState(diseaseStateSnapshot.Name, originData.Population.DisplayName));
 
-         originData.DiseaseState = diseaseState;
-         diseaseState.Parameters.Each(x =>
+      originData.DiseaseState = diseaseState;
+      diseaseState.Parameters.Each(x =>
+      {
+         var diseaseStateParameter = new OriginDataParameter {Name = x.Name, Value = x.Value, Unit = x.DisplayUnitName()};
+         var snapshotParameter = diseaseStateSnapshot.Parameters.FindByName(x.Name);
+         if (snapshotParameter != null)
          {
-            var diseaseStateParameter = new OriginDataParameter {Name = x.Name, Value = x.Value, Unit = x.DisplayUnitName()};
-            var snapshotParameter = diseaseStateSnapshot.Parameters.FindByName(x.Name);
-            if (snapshotParameter != null)
-            {
-               diseaseStateParameter.Value = baseParameterValueFrom(snapshotParameter, x.Value);
-               diseaseStateParameter.Unit = snapshotParameter.Unit;
-            }
+            diseaseStateParameter.Value = baseParameterValueFrom(snapshotParameter, x.Value);
+            diseaseStateParameter.Unit = snapshotParameter.Unit;
+         }
 
-            originData.AddDiseaseStateParameter(diseaseStateParameter);
-         });
+         originData.AddDiseaseStateParameter(diseaseStateParameter);
+      });
 
 
-         return Task.FromResult(originData);
-      }
+      return Task.FromResult(originData);
+   }
 
-      private Parameter namedParameterFrom(OriginDataParameter parameter)
-      {
-         return parameterFrom(parameter, _dimensionRepository.DimensionForUnit(parameter.Unit)).WithName(parameter.Name);
-      }
+   private Parameter namedParameterFrom(OriginDataParameter parameter)
+   {
+      return parameterFrom(parameter, _dimensionRepository.DimensionForUnit(parameter.Unit)).WithName(parameter.Name);
+   }
 
-      private Parameter parameterFrom(OriginDataParameter parameter, IDimension dimension)
-      {
-         if (parameter == null)
-            return null;
+   private Parameter parameterFrom(OriginDataParameter parameter, IDimension dimension)
+   {
+      if (parameter == null)
+         return null;
 
-         return _parameterMapper.ParameterFrom(parameter.Value, parameter.Unit, dimension);
-      }
+      return _parameterMapper.ParameterFrom(parameter.Value, parameter.Unit, dimension);
+   }
 
-      private double baseParameterValueFrom(Parameter snapshot, double defaultValueInBaseUnit) =>
-         baseParameterValueFrom(snapshot, _dimensionRepository.DimensionForUnit(snapshot.Unit), defaultValueInBaseUnit);
+   private double baseParameterValueFrom(Parameter snapshot, double defaultValueInBaseUnit) =>
+      baseParameterValueFrom(snapshot, _dimensionRepository.DimensionForUnit(snapshot.Unit), defaultValueInBaseUnit);
 
-      private double baseParameterValueFrom(Parameter snapshot, IDimension dimension, double defaultValueInBaseUnit)
-      {
-         if (snapshot?.Value == null)
-            return defaultValueInBaseUnit;
+   private double baseParameterValueFrom(Parameter snapshot, IDimension dimension, double defaultValueInBaseUnit)
+   {
+      if (snapshot?.Value == null)
+         return defaultValueInBaseUnit;
 
-         var unit = dimension.Unit(ModelValueFor(snapshot.Unit));
-         return dimension.UnitValueToBaseUnitValue(unit, snapshot.Value.Value);
-      }
+      var unit = dimension.Unit(ModelValueFor(snapshot.Unit));
+      return dimension.UnitValueToBaseUnitValue(unit, snapshot.Value.Value);
    }
-}
+}