Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump SharpProp from 7.2.11 to 7.3.0 #175

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Bump SharpProp from 7.2.11 to 7.3.0 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3b250a
Bump SharpProp from 7.2.11 to 7.3.0
dependabot[bot] Oct 3, 2024
21a50ba
Updated settings
portyanikhin Oct 3, 2024
8fcdc0e
Refactoring
portyanikhin Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions VCRC.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CIC/@EntryIndexedValue">
CIC
</s:String>
Expand Down Expand Up @@ -55,6 +53,9 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=transcritical/@EntryIndexedValue">
True
</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unspecify/@EntryIndexedValue">
True
</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Zeotropic/@EntryIndexedValue">
True
</s:Boolean>
Expand Down
6 changes: 6 additions & 0 deletions src/VCRC/Fluids/IRefrigerant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions src/VCRC/Fluids/Refrigerant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/VCRC/VCRC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.10.0"/>
<PackageReference Include="MathNet.Numerics" Version="5.0.0"/>
<PackageReference Include="SharpProp" Version="7.2.11"/>
<PackageReference Include="SharpProp" Version="7.3.0"/>
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions tests/VCRC.Tests/Fluids/RefrigerantTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down