Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/GeneralResult.cs =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rd2515239c7d6aead278d42e54d296bf42bfd3e92 --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/GeneralResult.cs (.../GeneralResult.cs) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/GeneralResult.cs (.../GeneralResult.cs) (revision d2515239c7d6aead278d42e54d296bf42bfd3e92) @@ -32,18 +32,13 @@ /// /// Creates a new instance of . /// - /// The beta value that was realized. /// The governing wind direction. /// The general alpha values. /// A collections of all - /// the combinations of wind directions, closing situations and illustration - /// points. + /// the combinations of wind directions, closing situations and illustration points. /// Thrown when , /// or is null. - public GeneralResult(double beta, - WindDirection governingWindDirection, - IEnumerable stochasts, - IEnumerable windDirectionClosingSituationIllustrationPoints) + public GeneralResult(WindDirection governingWindDirection, IEnumerable stochasts, IEnumerable windDirectionClosingSituationIllustrationPoints) { if (governingWindDirection == null) { @@ -58,18 +53,12 @@ throw new ArgumentNullException(nameof(windDirectionClosingSituationIllustrationPoints)); } - Beta = beta; GoverningWindDirection = governingWindDirection; Stochasts = stochasts; WindDirectionClosingSituationIllustrationPoints = windDirectionClosingSituationIllustrationPoints; } /// - /// Gets the general beta value. - /// - public double Beta { get; } - - /// /// Gets the governing wind direction. /// public WindDirection GoverningWindDirection { get; } Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rd2515239c7d6aead278d42e54d296bf42bfd3e92 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs (.../GeneralResultConverter.cs) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs (.../GeneralResultConverter.cs) (revision d2515239c7d6aead278d42e54d296bf42bfd3e92) @@ -56,7 +56,7 @@ IEnumerable windDirectionClosingScenarioIllustrationPoints = GetWindDirectionClosingSituationIllustrationPoint(hydraGeneralResult); - return new GeneralResult(hydraGeneralResult.Beta, windDirection, stochasts, windDirectionClosingScenarioIllustrationPoints); + return new GeneralResult(windDirection, stochasts, windDirectionClosingScenarioIllustrationPoints); } private static IEnumerable GetStochasts(HydraGeneralResult hydraGeneralResult) Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/GeneralResultTest.cs =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rd2515239c7d6aead278d42e54d296bf42bfd3e92 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision d2515239c7d6aead278d42e54d296bf42bfd3e92) @@ -35,8 +35,7 @@ public void Constructor_WindDirectionNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new GeneralResult(0, - null, + TestDelegate call = () => new GeneralResult(null, Enumerable.Empty(), Enumerable.Empty()); @@ -52,8 +51,7 @@ var windDirection = new TestWindDirection(); // Call - TestDelegate call = () => new GeneralResult(0, - windDirection, + TestDelegate call = () => new GeneralResult(windDirection, null, Enumerable.Empty()); @@ -69,8 +67,7 @@ var windDirection = new TestWindDirection(); // Call - TestDelegate call = () => new GeneralResult(0, - windDirection, + TestDelegate call = () => new GeneralResult(windDirection, Enumerable.Empty(), null); @@ -83,18 +80,15 @@ public void Constructor_ValidArguments_ExpectedProperties() { // Setup - var random = new Random(12); - double beta = random.NextDouble(); var windDirection = new TestWindDirection(); IEnumerable stochasts = Enumerable.Empty(); IEnumerable combinations = Enumerable.Empty(); // Call - var generalResult = new GeneralResult(beta, windDirection, stochasts, combinations); + var generalResult = new GeneralResult(windDirection, stochasts, combinations); // Assert - Assert.AreEqual(beta, generalResult.Beta); Assert.AreSame(windDirection, generalResult.GoverningWindDirection); Assert.AreSame(stochasts, generalResult.Stochasts); Assert.AreSame(combinations, generalResult.WindDirectionClosingSituationIllustrationPoints); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultTest.cs =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rd2515239c7d6aead278d42e54d296bf42bfd3e92 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultTest.cs (.../TestGeneralResultTest.cs) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultTest.cs (.../TestGeneralResultTest.cs) (revision d2515239c7d6aead278d42e54d296bf42bfd3e92) @@ -36,7 +36,6 @@ // Assert Assert.IsInstanceOf(generalResult); - Assert.AreEqual(0, generalResult.Beta); AssertWindDirection(new TestWindDirection(), generalResult.GoverningWindDirection); CollectionAssert.IsEmpty(generalResult.Stochasts); CollectionAssert.IsEmpty(generalResult.WindDirectionClosingSituationIllustrationPoints); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResult.cs =================================================================== diff -u -r61659778ac6e2436b9112e9ff33ccdd2e0b90afe -rd2515239c7d6aead278d42e54d296bf42bfd3e92 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResult.cs (.../TestGeneralResult.cs) (revision 61659778ac6e2436b9112e9ff33ccdd2e0b90afe) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResult.cs (.../TestGeneralResult.cs) (revision d2515239c7d6aead278d42e54d296bf42bfd3e92) @@ -33,8 +33,7 @@ /// Creates a new instance of . /// public TestGeneralResult() - : base(0, - new TestWindDirection(), + : base(new TestWindDirection(), Enumerable.Empty(), Enumerable.Empty()) {} } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -rd2515239c7d6aead278d42e54d296bf42bfd3e92 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs (.../GeneralResultConverterTest.cs) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs (.../GeneralResultConverterTest.cs) (revision d2515239c7d6aead278d42e54d296bf42bfd3e92) @@ -93,7 +93,6 @@ GeneralResult generalResult = GeneralResultConverter.CreateGeneralResult(hydraGeneralResult); // Assert - Assert.AreEqual(hydraGeneralResult.Beta, generalResult.Beta); AssertWindDirection(hydraGoverningWindDirection, generalResult.GoverningWindDirection); CollectionAssert.IsEmpty(generalResult.WindDirectionClosingSituationIllustrationPoints); CollectionAssert.IsEmpty(generalResult.Stochasts); @@ -143,8 +142,6 @@ GeneralResult generalResult = GeneralResultConverter.CreateGeneralResult(hydraGeneralResult); // Assert - Assert.AreEqual(hydraGeneralResult.Beta, generalResult.Beta); - WindDirection generalResultGoverningWindDirection = generalResult.GoverningWindDirection; AssertWindDirection(governingHydraWindDirection, generalResultGoverningWindDirection); @@ -205,8 +202,6 @@ GeneralResult generalResult = GeneralResultConverter.CreateGeneralResult(hydraGeneralResult); // Assert - Assert.AreEqual(hydraGeneralResult.Beta, generalResult.Beta); - WindDirection generalResultGoverningWindDirection = generalResult.GoverningWindDirection; AssertWindDirection(governingHydraWindDirection, generalResultGoverningWindDirection); CollectionAssert.IsEmpty(generalResult.Stochasts);