Index: Ringtoets.sln =================================================================== diff -u -r8d381bb0429ae7582eba663221b404f634332342 -rff012303ef231b9e823e1c59f0829030962c8115 --- Ringtoets.sln (.../Ringtoets.sln) (revision 8d381bb0429ae7582eba663221b404f634332342) +++ Ringtoets.sln (.../Ringtoets.sln) (revision ff012303ef231b9e823e1c59f0829030962c8115) @@ -691,16 +691,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.Calculation.TestUtil", "Ringtoets\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil\Ringtoets.HydraRing.Calculation.TestUtil.csproj", "{74CBA865-9338-447F-BAD9-28312446AE84}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.Calculation.TestUtil.Test", "Ringtoets\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil.Test\Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj", "{89A94832-5337-4177-97D0-92CD77A375D7}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.GrassCoverErosionInwards.Utils", "Ringtoets\GrassCoverErosionInwards\src\Ringtoets.GrassCoverErosionInwards.Utils\Ringtoets.GrassCoverErosionInwards.Utils.csproj", "{99573570-EE00-4264-8147-26A1B25DB23F}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} @@ -1898,22 +1888,6 @@ {E23513DE-B7D0-4415-BCDF-5A33CD084388}.Release|x86.Build.0 = Release|x86 {E23513DE-B7D0-4415-BCDF-5A33CD084388}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {E23513DE-B7D0-4415-BCDF-5A33CD084388}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.CreateInstaller|x86.ActiveCfg = Release|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.Debug|x86.ActiveCfg = Debug|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.Debug|x86.Build.0 = Debug|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.Release|x86.ActiveCfg = Release|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.Release|x86.Build.0 = Release|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {74CBA865-9338-447F-BAD9-28312446AE84}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.CreateInstaller|x86.ActiveCfg = Release|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.Debug|x86.ActiveCfg = Debug|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.Debug|x86.Build.0 = Debug|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.Release|x86.ActiveCfg = Release|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.Release|x86.Build.0 = Release|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {89A94832-5337-4177-97D0-92CD77A375D7}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {99573570-EE00-4264-8147-26A1B25DB23F}.CreateInstaller|x86.ActiveCfg = Release|x86 {99573570-EE00-4264-8147-26A1B25DB23F}.CreateInstaller|x86.Build.0 = Release|x86 {99573570-EE00-4264-8147-26A1B25DB23F}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 @@ -2337,8 +2311,6 @@ {175406DB-C0DA-42A7-968C-0C17CF2257B1} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {BFD6A78A-237A-413F-8DC3-8EC6E8C5809C} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} - {74CBA865-9338-447F-BAD9-28312446AE84} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} - {89A94832-5337-4177-97D0-92CD77A375D7} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {79419C3E-046C-4DC1-8C69-F14911F22C75} = {A5D1FA5A-7168-46DE-B3F0-D3FE6AC26601} {1C1E8754-CF61-4858-9CEE-3E5DE344474F} = {A5D1FA5A-7168-46DE-B3F0-D3FE6AC26601} {90DE728E-48EF-4665-AB38-3D88E41D9F4D} = {79419C3E-046C-4DC1-8C69-F14911F22C75} Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs =================================================================== diff -u -rd6042fd94b713810bdf59312d322e1dcc76dc586 -rff012303ef231b9e823e1c59f0829030962c8115 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision d6042fd94b713810bdf59312d322e1dcc76dc586) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision ff012303ef231b9e823e1c59f0829030962c8115) @@ -20,7 +20,7 @@ // All rights reserved. using System.Linq; -using MathNet.Numerics.Distributions; +using Core.Common.Utils; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; @@ -37,12 +37,12 @@ const int norm = 10000; const int sectionId = 1; const long hydraulicBoundaryLocationId = 1234; - var expectedBeta = -Normal.InvCDF(0.0, 1.0, 1.0/norm); // Call var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(sectionId, hydraulicBoundaryLocationId, norm); // Assert + double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType); Assert.AreEqual(2, assessmentLevelCalculationInput.CalculationTypeId); Assert.AreEqual(26, assessmentLevelCalculationInput.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -rff012303ef231b9e823e1c59f0829030962c8115 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision ff012303ef231b9e823e1c59f0829030962c8115) @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Linq; -using MathNet.Numerics.Distributions; +using Core.Common.Utils; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input; @@ -38,9 +38,8 @@ { // Setup var norm = 10000; - var expectedBeta = -Normal.InvCDF(0.0, 1.0, 1.0/norm); int hydraulicBoundaryLocationId = 1000; - HydraRingSection expectedHydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); + HydraRingSection hydraRingSection = new HydraRingSection(1, double.NaN, double.NaN); const double modelFactorCriticalOvertopping = 1; const double factorFnMean = 4.75; @@ -65,7 +64,7 @@ var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3); // Call - DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, expectedHydraRingSection, + DikeHeightCalculationInput dikeHeightCalculationInput = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, hydraRingSection, modelFactorCriticalOvertopping, factorFnMean, factorFnStandardDeviation, hydraRingFactorFnMean, hydraRingFactorFnStandardDeviation, hydraRingmodelFactorOvertopping, criticalOvertoppingMean, criticalOvertoppingStandardDeviation, hydraRingModelFactorFrunupMean, @@ -76,6 +75,7 @@ // Assert const int expectedCalculationTypeId = 2; const int expectedVariableId = 1; + double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.IsInstanceOf(dikeHeightCalculationInput); Assert.AreEqual(expectedCalculationTypeId, dikeHeightCalculationInput.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, dikeHeightCalculationInput.HydraulicBoundaryLocationId); @@ -87,9 +87,7 @@ CollectionAssert.AreEqual(expectedRingForelandPoints, dikeHeightCalculationInput.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, dikeHeightCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, dikeHeightCalculationInput.Beta); - - var hydraRingSection = dikeHeightCalculationInput.Section; - Assert.AreEqual(expectedHydraRingSection, hydraRingSection); + Assert.AreSame(hydraRingSection, dikeHeightCalculationInput.Section); } [Test] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -rd6042fd94b713810bdf59312d322e1dcc76dc586 -rff012303ef231b9e823e1c59f0829030962c8115 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision d6042fd94b713810bdf59312d322e1dcc76dc586) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision ff012303ef231b9e823e1c59f0829030962c8115) @@ -20,7 +20,7 @@ // All rights reserved. using System.Linq; -using MathNet.Numerics.Distributions; +using Core.Common.Utils; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; @@ -37,12 +37,12 @@ const int norm = 10000; const int sectionId = 1; const long hydraulicBoundaryLocationId = 1234; - var expectedBeta = -Normal.InvCDF(0.0, 1.0, 1.0/norm); // Call var waveHeightCalculationInput = new WaveHeightCalculationInput(sectionId, hydraulicBoundaryLocationId, norm); // Assert + double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.AreEqual(HydraRingFailureMechanismType.WaveHeight, waveHeightCalculationInput.FailureMechanismType); Assert.AreEqual(2, waveHeightCalculationInput.CalculationTypeId); Assert.AreEqual(28, waveHeightCalculationInput.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/TargetProbabilityCalculationInputTest.cs =================================================================== diff -u -rab59b0648bcae3ff70932998fbfa1a266558b8e6 -rff012303ef231b9e823e1c59f0829030962c8115 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/TargetProbabilityCalculationInputTest.cs (.../TargetProbabilityCalculationInputTest.cs) (revision ab59b0648bcae3ff70932998fbfa1a266558b8e6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/TargetProbabilityCalculationInputTest.cs (.../TargetProbabilityCalculationInputTest.cs) (revision ff012303ef231b9e823e1c59f0829030962c8115) @@ -21,7 +21,6 @@ using System; using Core.Common.Utils; -using MathNet.Numerics.Distributions; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj =================================================================== diff -u -rab59b0648bcae3ff70932998fbfa1a266558b8e6 -rff012303ef231b9e823e1c59f0829030962c8115 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision ab59b0648bcae3ff70932998fbfa1a266558b8e6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision ff012303ef231b9e823e1c59f0829030962c8115) @@ -40,10 +40,6 @@ x86 - - False - ..\..\..\..\packages\MathNet.Numerics.3.8.0\lib\net40\MathNet.Numerics.dll - ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/TestTargetProbabilityCalculationInputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ff012303ef231b9e823e1c59f0829030962c8115 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/TestTargetProbabilityCalculationInput.cs'. Fisheye: No comparison available. Pass `N' to diff?