Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistribution.cs =================================================================== diff -u -r4ed7d0e47818a186806b494223fce3807eca3ab4 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision 4ed7d0e47818a186806b494223fce3807eca3ab4) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -119,10 +119,9 @@ return MemberwiseClone(); } - private bool Equals(IDistribution other) + private bool Equals(NormalDistribution other) { - return !ReferenceEquals(null, other) - && Mean.Equals(other.Mean) + return Mean.Equals(other.Mean) && StandardDeviation.Equals(other.StandardDeviation); } } Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistribution.cs =================================================================== diff -u -r4ed7d0e47818a186806b494223fce3807eca3ab4 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistribution.cs (.../VariationCoefficientLogNormalDistribution.cs) (revision 4ed7d0e47818a186806b494223fce3807eca3ab4) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistribution.cs (.../VariationCoefficientLogNormalDistribution.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -132,7 +132,7 @@ return MemberwiseClone(); } - private bool Equals(IVariationCoefficientDistribution other) + private bool Equals(VariationCoefficientLogNormalDistribution other) { return Mean.Equals(other.Mean) && CoefficientOfVariation.Equals(other.CoefficientOfVariation); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientNormalDistribution.cs =================================================================== diff -u -r4ed7d0e47818a186806b494223fce3807eca3ab4 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientNormalDistribution.cs (.../VariationCoefficientNormalDistribution.cs) (revision 4ed7d0e47818a186806b494223fce3807eca3ab4) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientNormalDistribution.cs (.../VariationCoefficientNormalDistribution.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -119,7 +119,7 @@ return MemberwiseClone(); } - private bool Equals(IVariationCoefficientDistribution other) + private bool Equals(VariationCoefficientNormalDistribution other) { return Mean.Equals(other.Mean) && CoefficientOfVariation.Equals(other.CoefficientOfVariation); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -rce24d4fc808e32e5cebe7114ab03919770240d07 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision ce24d4fc808e32e5cebe7114ab03919770240d07) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -278,8 +278,8 @@ [Test] [TestCaseSource(nameof(DistributionCombinations))] public void Equal_DifferentProperty_RetunsIsEqual(LogNormalDistribution distribution, - LogNormalDistribution otherDistribution, - bool expectedToBeEqual) + LogNormalDistribution otherDistribution, + bool expectedToBeEqual) { // Call bool isDistributionEqualToOther = distribution.Equals(otherDistribution); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -rce24d4fc808e32e5cebe7114ab03919770240d07 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision ce24d4fc808e32e5cebe7114ab03919770240d07) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -199,8 +199,8 @@ [Test] [TestCaseSource(nameof(DistributionCombinations))] public void Equal_DifferentProperty_RetunsIsEqual(NormalDistribution distribution, - NormalDistribution otherDistribution, - bool expectedToBeEqual) + NormalDistribution otherDistribution, + bool expectedToBeEqual) { // Call bool isDistributionEqualToOther = distribution.Equals(otherDistribution); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -rce24d4fc808e32e5cebe7114ab03919770240d07 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision ce24d4fc808e32e5cebe7114ab03919770240d07) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -226,8 +226,8 @@ [Test] [TestCaseSource(nameof(DistributionCombinations))] public void Equal_DifferentProperty_RetunsIsEqual(VariationCoefficientLogNormalDistribution distribution, - VariationCoefficientLogNormalDistribution otherDistribution, - bool expectedToBeEqual) + VariationCoefficientLogNormalDistribution otherDistribution, + bool expectedToBeEqual) { // Call bool isDistributionEqualToOther = distribution.Equals(otherDistribution); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs =================================================================== diff -u -rce24d4fc808e32e5cebe7114ab03919770240d07 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision ce24d4fc808e32e5cebe7114ab03919770240d07) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -208,8 +208,8 @@ [Test] [TestCaseSource(nameof(DistributionCombinations))] public void Equal_DifferentProperty_RetunsIsEqual(VariationCoefficientNormalDistribution distribution, - VariationCoefficientNormalDistribution otherDistribution, - bool expectedToBeEqual) + VariationCoefficientNormalDistribution otherDistribution, + bool expectedToBeEqual) { // Call bool isDistributionEqualToOther = distribution.Equals(otherDistribution); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r103d7f43f8b739dc0a9779df1c8a1b8535259795 -reef2f17598bbe7b051207dfac25952567d57f64c --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 103d7f43f8b739dc0a9779df1c8a1b8535259795) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision eef2f17598bbe7b051207dfac25952567d57f64c) @@ -104,7 +104,10 @@ FileFilterGenerator = CreateHeightStructureFileFilter(), CreateFileImporter = (context, filePath) => CreateHeightStructuresImporter( context, filePath, new ImportMessageProvider(), new HeightStructureReplaceDataStrategy(context.FailureMechanism)), - VerifyUpdates = context => VerifyHeightStructuresShouldUpdate(context, Resources.HeightStructuresPlugin_VerifyHeightStructuresShouldUpdate_When_importing_Calculation_with_Structure_data_output_will_be_cleared_confirm) + VerifyUpdates = context => + VerifyHeightStructuresShouldUpdate( + context, + Resources.HeightStructuresPlugin_VerifyHeightStructuresShouldUpdate_When_importing_Calculation_with_Structure_data_output_will_be_cleared_confirm) }; yield return RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo( @@ -129,7 +132,10 @@ CreateFileImporter = (context, filePath) => CreateHeightStructuresImporter( context, filePath, new UpdateMessageProvider(), new HeightStructureUpdateDataStrategy(context.FailureMechanism)), CurrentPath = context => context.WrappedData.SourcePath, - VerifyUpdates = context => VerifyHeightStructuresShouldUpdate(context, Resources.HeightStructuresPlugin_VerifyHeightStructuresShouldUpdate_When_updating_Calculation_with_Structure_data_output_will_be_cleared_confirm) + VerifyUpdates = context => + VerifyHeightStructuresShouldUpdate( + context, + Resources.HeightStructuresPlugin_VerifyHeightStructuresShouldUpdate_When_updating_Calculation_with_Structure_data_output_will_be_cleared_confirm) }; }