Refactoring

portyanikhin · Oct 3, 2024 · 8fcdc0e · 8fcdc0e
1 parent 21a50ba
commit 8fcdc0e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/VCRC/Fluids/IRefrigerant.cs b/src/VCRC/Fluids/IRefrigerant.cs
@@ -90,6 +90,12 @@ public interface IRefrigerant : IFluid
     /// <exception cref="ArgumentException">Invalid superheat!</exception>
     IRefrigerant Superheated(Pressure pressure, TemperatureDelta superheat);
 
+    /// <inheritdoc cref="IFluid.SpecifyPhase"/>
+    new IRefrigerant SpecifyPhase(Phases phase);
+
+    /// <inheritdoc cref="IFluid.UnspecifyPhase"/>
+    new IRefrigerant UnspecifyPhase();
+
     /// <inheritdoc cref="IFluid.WithState"/>
     new IRefrigerant WithState(
         IKeyedInput<Parameters> firstInput,

diff --git a/src/VCRC/Fluids/Refrigerant.cs b/src/VCRC/Fluids/Refrigerant.cs
@@ -32,11 +32,8 @@ public Refrigerant(FluidsList name)
             .ToUnit(TemperatureDeltaUnit.Kelvin);
 
     public bool HasGlide => Glide > 0.01.Kelvins();
-
     public bool IsSingleComponent => !IsAzeotropicBlend && !IsZeotropicBlend;
-
     public bool IsAzeotropicBlend => BlendRegex(false).IsMatch(Name.ToString());
-
     public bool IsZeotropicBlend => BlendRegex(true).IsMatch(Name.ToString());
 
     public IRefrigerant Subcooled(
@@ -64,6 +61,10 @@ public IRefrigerant Superheated(Pressure pressure, TemperatureDelta superheat) =
         : superheat.Equals(TemperatureDelta.Zero, Tolerance.Kelvins()) ? DewPointAt(pressure)
         : DewPointAt(pressure).HeatingTo(DewPointAt(pressure).Temperature + superheat);
 
+    public new IRefrigerant SpecifyPhase(Phases phase) => (Refrigerant)base.SpecifyPhase(phase);
+
+    public new IRefrigerant UnspecifyPhase() => (Refrigerant)base.UnspecifyPhase();
+
     public new IRefrigerant WithState(
         IKeyedInput<Parameters> firstInput,
         IKeyedInput<Parameters> secondInput

diff --git a/tests/VCRC.Tests/Fluids/RefrigerantTests.cs b/tests/VCRC.Tests/Fluids/RefrigerantTests.cs
@@ -256,6 +256,7 @@ public void Methods_New_ReturnsInstancesOfTheRefrigerantType()
     {
         _sut.Clone().Should().BeOfType<Refrigerant>();
         _sut.Factory().Should().BeOfType<Refrigerant>();
+        _sut.SpecifyPhase(Phases.Gas).UnspecifyPhase().Should().BeOfType<Refrigerant>();
         _sut.IsentropicCompressionTo(HighPressure).Should().BeOfType<Refrigerant>();
         _sut.CompressionTo(HighPressure, _isentropicEfficiency).Should().BeOfType<Refrigerant>();
         _sut.IsenthalpicExpansionTo(LowPressure).Should().BeOfType<Refrigerant>();