From ee69631d3875cc0ecca09c927108e028687baf49 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 27 Feb 2020 13:55:03 +0100 Subject: [PATCH] Bug fixes in Results.Entities.XY.Equals( ), Solution updated (Code128). --- Results/Entities/Components.cs | 18 +++++++++--------- Results/Entities/TestData.cs | 4 ++-- Results/Entities/WaterMeterData.cs | 16 ++++++++-------- TBF.sln | 10 ++++++++++ 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Results/Entities/Components.cs b/Results/Entities/Components.cs index 312048540..51966bd23 100644 --- a/Results/Entities/Components.cs +++ b/Results/Entities/Components.cs @@ -60,15 +60,15 @@ namespace Results.Entities public virtual bool Equals(Components bc) { if (TestBenchId != bc.TestBenchId) return false; - if (!TestBenchName.Equals(bc.TestBenchName)) return false; - if (!Pump.Equals(bc.Pump)) return false; - if (!RegValve.Equals(bc.RegValve)) return false; - if (!Flowmeter.Equals(bc.Flowmeter)) return false; - if (!Diverter.Equals(bc.Diverter)) return false; - if (!Scale.Equals(bc.Scale)) return false; - if (!Custom1.Equals(bc.Custom1)) return false; - if (!Custom2.Equals(bc.Custom2)) return false; - if (!Custom3.Equals(bc.Custom3)) return false; + if (TestBenchName != bc.TestBenchName) return false; + if (Pump != bc.Pump) return false; + if (RegValve != bc.RegValve) return false; + if (Flowmeter != bc.Flowmeter) return false; + if (Diverter != bc.Diverter) return false; + if (Scale != bc.Scale) return false; + if (Custom1 != bc.Custom1) return false; + if (Custom2 != bc.Custom2) return false; + if (Custom3 != bc.Custom3) return false; return true; } diff --git a/Results/Entities/TestData.cs b/Results/Entities/TestData.cs index 525c8ea86..86cb48ce2 100644 --- a/Results/Entities/TestData.cs +++ b/Results/Entities/TestData.cs @@ -67,14 +67,14 @@ namespace Results.Entities /// first = two entities are equal (except of Id) public virtual bool Equals(TestData td) { - if (!Name.Equals(td.Name)) return false; + if (Name != td.Name) return false; if (Repeats != td.Repeats) return false; if (Qtg != td.Qtg) return false; if (Qfrom != td.Qfrom) return false; if (Qto != td.Qto) return false; if (TargetVolume != td.TargetVolume) return false; if (TargetTime != td.TargetTime) return false; - if (!Method.Equals(td.Method)) return false; + if (Method != td.Method) return false; if (ErrLimLo != td.ErrLimLo) return false; if (ErrLimHi != td.ErrLimHi) return false; if (ErrLimMargin != td.ErrLimMargin) return false; diff --git a/Results/Entities/WaterMeterData.cs b/Results/Entities/WaterMeterData.cs index 7a7924eae..783da73f0 100644 --- a/Results/Entities/WaterMeterData.cs +++ b/Results/Entities/WaterMeterData.cs @@ -68,8 +68,8 @@ namespace Results.Entities /// first = two entities are equal (except of Id) public virtual bool Equals(WaterMeterData wmd) { - if (!ProductName.Equals(wmd.ProductName)) return false; - if (!Producer.Equals(wmd.Producer)) return false; + if (ProductName != wmd.ProductName) return false; + if (Producer != wmd.Producer) return false; if (DN != wmd.DN) return false; if (L != wmd.L) return false; @@ -81,13 +81,13 @@ namespace Results.Entities if (Q2_Qt != wmd.Q2_Qt) return false; if (Q1_Qmin != wmd.Q1_Qmin) return false; - if (!MetrologicalClass.Equals(wmd.MetrologicalClass)) return false; - if (!TemperatureClass.Equals(wmd.TemperatureClass)) return false; - if (!PressureLossClass.Equals(wmd.PressureLossClass)) return false; - if (!MaxAdmissiblePressure.Equals(wmd.MaxAdmissiblePressure)) return false; - if (!FlowProfileSensitivityClass.Equals(wmd.FlowProfileSensitivityClass)) return false; + if (MetrologicalClass != wmd.MetrologicalClass) return false; + if (TemperatureClass != wmd.TemperatureClass) return false; + if (PressureLossClass != wmd.PressureLossClass) return false; + if (MaxAdmissiblePressure != wmd.MaxAdmissiblePressure) return false; + if (FlowProfileSensitivityClass != wmd.FlowProfileSensitivityClass) return false; - if (!ApprovalInfo.Equals(wmd.ApprovalInfo)) return false; + if (ApprovalInfo != wmd.ApprovalInfo) return false; if (Certificate != wmd.Certificate) return false; if (PulsesPerLtr != wmd.PulsesPerLtr) return false; diff --git a/TBF.sln b/TBF.sln index ce2b39fce..344e71625 100644 --- a/TBF.sln +++ b/TBF.sln @@ -243,6 +243,16 @@ Global {6F18660F-0EFB-4253-B92C-205E18D34442}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {6F18660F-0EFB-4253-B92C-205E18D34442}.Release|Mixed Platforms.Build.0 = Release|Any CPU {6F18660F-0EFB-4253-B92C-205E18D34442}.Release|x86.ActiveCfg = Release|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|x86.ActiveCfg = Debug|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Any CPU.Build.0 = Release|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE