Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r164e03c3a4957d7a0dd4012f146b0ca139a7a4cc -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 164e03c3a4957d7a0dd4012f146b0ca139a7a4cc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -36,7 +36,6 @@ ..\..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll True - Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -120,7 +120,7 @@ surfaceLinesImporter.Import(context, Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6.soil")); } - var calculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput, pipingFailureMechanism.SemiProbabilisticInput); + var calculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput, pipingFailureMechanism.NormProbabilityInput); pipingFailureMechanism.CalculationsGroup.Children.Add(calculation); var originalPhreaticLevelExit = calculation.InputParameters.PhreaticLevelExit; calculation.InputParameters.PhreaticLevelExit = new NormalDistribution(originalPhreaticLevelExit.Mean.NumberOfDecimalPlaces) Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rbbe2a3488b33585ad13bebdaa7439f5c5bbfe079 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bbe2a3488b33585ad13bebdaa7439f5c5bbfe079) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -71,6 +71,24 @@ } /// + /// Looks up a localized string similar to Algemeen. + /// + public static string Categories_General { + get { + return ResourceManager.GetString("Categories_General", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lengte-effect parameters. + /// + public static string Categories_LengthEffect { + get { + return ResourceManager.GetString("Categories_LengthEffect", resourceCulture); + } + } + + /// /// Looks up a localized string similar to {0} mag niet 'null' zijn.. /// public static string GrassCoverErosionInwardsContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null { @@ -108,5 +126,59 @@ "Tooltip", resourceCulture); } } + + /// + /// Looks up a localized string similar to Het label van het toetsspoor.. + /// + public static string GrassCoverErosionInwardsInput_Code_Description { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsInput_Code_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Label. + /// + public static string GrassCoverErosionInwardsInput_Code_DisplayName { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsInput_Code_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De parameter 'N' die gebruikt wordt voor het lengte effect in berekening.. + /// + public static string GrassCoverErosionInwardsInput_N_Description { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsInput_N_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to N. + /// + public static string GrassCoverErosionInwardsInput_N_DisplayName { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsInput_N_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De naam van het toetsspoor.. + /// + public static string GrassCoverErosionInwardsInput_Name_Description { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsInput_Name_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Naam. + /// + public static string GrassCoverErosionInwardsInput_Name_DisplayName { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsInput_Name_DisplayName", resourceCulture); + } + } } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx =================================================================== diff -u -rbbe2a3488b33585ad13bebdaa7439f5c5bbfe079 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision bbe2a3488b33585ad13bebdaa7439f5c5bbfe079) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -121,6 +121,12 @@ ..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Algemeen + + + Lengte-effect parameters + {0} mag niet 'null' zijn. @@ -133,4 +139,22 @@ Voeg een nieuwe grasbekleding erosie kruin en binnentalud berekening toe aan dit faalmechanisme. + + Het label van het toetsspoor. + + + Label + + + De naam van het toetsspoor. + + + Naam + + + De parameter 'N' die gebruikt wordt voor het lengte effect in berekening. + + + N + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -0,0 +1,79 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Gui.Attributes; +using Core.Common.Gui.PropertyBag; +using Core.Common.Utils.Attributes; +using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; +using Ringtoets.GrassCoverErosionInwards.Forms.Properties; + +namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses +{ + /// + /// ViewModel of for properties panel. + /// + public class GrassCoverErosionInwardsFailureMechanismContextProperties : ObjectProperties + { + #region Lengte effect parameters + + [PropertyOrder(3)] + [ResourcesCategory(typeof(Resources), "Categories_LengthEffect")] + [ResourcesDisplayName(typeof(Resources), "GrassCoverErosionInwardsInput_N_DisplayName")] + [ResourcesDescription(typeof(Resources), "GrassCoverErosionInwardsInput_N_Description")] + public int LengthEffect + { + get + { + return 2; + } + } + + #endregion + + #region General + + [PropertyOrder(1)] + [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesDisplayName(typeof(Resources), "GrassCoverErosionInwardsInput_Name_DisplayName")] + [ResourcesDescription(typeof(Resources), "GrassCoverErosionInwardsInput_Name_Description")] + public string Name + { + get + { + return data.WrappedData.Name; + } + } + + [PropertyOrder(2)] + [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesDisplayName(typeof(Resources), "GrassCoverErosionInwardsInput_Code_DisplayName")] + [ResourcesDescription(typeof(Resources), "GrassCoverErosionInwardsInput_Code_Description")] + public string Code + { + get + { + return data.WrappedData.Code; + } + } + + #endregion + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj =================================================================== diff -u -r9dd244984b5fb9349499db75d744f4e3d436549d -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision 9dd244984b5fb9349499db75d744f4e3d436549d) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -55,6 +55,7 @@ True Resources.resx + @@ -71,6 +72,16 @@ {9a2d67e6-26ac-4d17-b11a-2b4372f2f572} Core.Common.Controls + + {30E4C2AE-719E-4D70-9FA9-668A9767FBFA} + Core.Common.Gui + False + + + {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} + Core.Common.Utils + False + {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -rfc6f7d48c14e74fddc94f0535a5bf2f6c04baf67 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision fc6f7d48c14e74fddc94f0535a5bf2f6c04baf67) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -37,6 +37,7 @@ using Ringtoets.Common.Forms.TreeNodeInfos; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; +using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses; using Ringtoets.GrassCoverErosionInwards.Plugin.Properties; using Ringtoets.HydraRing.Calculation.Activities; using Ringtoets.HydraRing.Calculation.Data; @@ -55,6 +56,11 @@ /// public class GrassCoverErosionInwardsGuiPlugin : GuiPlugin { + public override IEnumerable GetPropertyInfos() + { + yield return new PropertyInfo(); + } + public override IEnumerable GetTreeNodeInfos() { yield return new DefaultFailureMechanismTreeNodeInfo( Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -0,0 +1,66 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Gui.PropertyBag; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.GrassCoverErosionInwards.Data.Properties; +using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; +using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses; + +namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.PropertyClasses +{ + [TestFixture] + public class GrassCoverErosionInwardsFailureMechanismContextPropertiesTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Setup & Call + var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(); + + // Assert + Assert.IsInstanceOf>(properties); + } + + [Test] + public void Data_SetNewFailureMechanismContextInstance_ReturnCorrectPropertyValues() + { + // Setup + var mockRepository = new MockRepository(); + var assessmentSectionMock = mockRepository.StrictMock(); + mockRepository.ReplayAll(); + + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties(); + + // Call + properties.Data = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock); + + // Assert + Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayName, properties.Name); + Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode, properties.Code); + mockRepository.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj =================================================================== diff -u -r9dd244984b5fb9349499db75d744f4e3d436549d -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj) (revision 9dd244984b5fb9349499db75d744f4e3d436549d) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -64,6 +64,7 @@ + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs =================================================================== diff -u -rd9de00d4686935c8e0e5ccb81b8b978dc2b0b2aa -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs (.../GrassCoverErosionInwardsGuiPluginTest.cs) (revision d9de00d4686935c8e0e5ccb81b8b978dc2b0b2aa) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs (.../GrassCoverErosionInwardsGuiPluginTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -28,6 +28,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; +using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses; namespace Ringtoets.GrassCoverErosionInwards.Plugin.Test { @@ -58,7 +59,12 @@ PropertyInfo[] propertyInfos = guiPlugin.GetPropertyInfos().ToArray(); // assert - Assert.AreEqual(0, propertyInfos.Length); + Assert.AreEqual(1, propertyInfos.Length); + var failureMechanismContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(GrassCoverErosionInwardsFailureMechanismContext)); + Assert.AreEqual(typeof(GrassCoverErosionInwardsFailureMechanismContextProperties), failureMechanismContextProperties.PropertyObjectType); + Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck); + Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData); + Assert.IsNull(failureMechanismContextProperties.AfterCreate); mocks.VerifyAll(); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs =================================================================== diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision b28f56d6bb3f14141bd003dd43378f8002a9e87a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -132,7 +132,7 @@ set { referenceLine = value; - PipingFailureMechanism.SemiProbabilisticInput.SectionLength = value == null ? double.NaN : Math2D.Length(value.Points); + PipingFailureMechanism.NormProbabilityInput.SectionLength = value == null ? double.NaN : Math2D.Length(value.Points); } } @@ -145,7 +145,7 @@ private set { contritbution = value; - PipingFailureMechanism.SemiProbabilisticInput.Norm = value.Norm; + PipingFailureMechanism.NormProbabilityInput.Norm = value.Norm; } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision b28f56d6bb3f14141bd003dd43378f8002a9e87a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -101,8 +101,8 @@ Assert.AreEqual(names, section.FailureMechanismContribution.Distribution.Select(d => d.Assessment)); Assert.AreEqual(Enumerable.Repeat(30000.0, 11), section.FailureMechanismContribution.Distribution.Select(d => d.Norm)); - Assert.AreEqual(30000.0, section.PipingFailureMechanism.SemiProbabilisticInput.Norm); - Assert.AreEqual(double.NaN, section.PipingFailureMechanism.SemiProbabilisticInput.SectionLength); + Assert.AreEqual(30000.0, section.PipingFailureMechanism.NormProbabilityInput.Norm); + Assert.AreEqual(double.NaN, section.PipingFailureMechanism.NormProbabilityInput.SectionLength); Assert.AreEqual(100, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution)); } @@ -253,7 +253,7 @@ assessmentSection.ReferenceLine = referenceLine; // Assert - Assert.AreEqual(Math2D.Length(referenceLine.Points), assessmentSection.PipingFailureMechanism.SemiProbabilisticInput.SectionLength); + Assert.AreEqual(Math2D.Length(referenceLine.Points), assessmentSection.PipingFailureMechanism.NormProbabilityInput.SectionLength); } [Test] @@ -266,7 +266,7 @@ assessmentSection.ReferenceLine = null; // Assert - Assert.AreEqual(double.NaN, assessmentSection.PipingFailureMechanism.SemiProbabilisticInput.SectionLength); + Assert.AreEqual(double.NaN, assessmentSection.PipingFailureMechanism.NormProbabilityInput.SectionLength); } private void AssertExpectedContributions(AssessmentSectionComposition composition, AssessmentSection assessmentSection) Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs =================================================================== diff -u -r915d8a66e5d294a18f9452775406e36a3f8fbdc0 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision 915d8a66e5d294a18f9452775406e36a3f8fbdc0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -340,7 +340,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var deletedCalculationContext = new PipingCalculationContext(viewDataCalculation, @@ -371,8 +371,8 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); - var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); @@ -404,7 +404,7 @@ mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); - var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var deletedGroup = new CalculationGroup { Children = @@ -441,9 +441,9 @@ mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); - var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); - var deletedCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var deletedCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var deletedGroup = new CalculationGroup { Children = Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs =================================================================== diff -u -r4af59f05cb6ced6464d51c8dff8cb0b8bfca8edd -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision 4af59f05cb6ced6464d51c8dff8cb0b8bfca8edd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -36,30 +36,30 @@ /// /// General piping calculation parameters that /// are the same across all piping calculations. - /// General semi-probabilistic parameters that + /// General semi-probabilistic parameters that /// are used in a semi-probabilistic piping assessment. /// When or - /// is null. - public PipingCalculation(GeneralPipingInput generalInputParameters, SemiProbabilisticPipingInput semiProbabilisticInputParameters) + /// is null. + public PipingCalculation(GeneralPipingInput generalInputParameters, NormProbabilityPipingInput normProbabilityInputParameters) { if (generalInputParameters == null) { throw new ArgumentNullException("generalInputParameters"); } - if (semiProbabilisticInputParameters == null) + if (normProbabilityInputParameters == null) { - throw new ArgumentNullException("semiProbabilisticInputParameters"); + throw new ArgumentNullException("normProbabilityInputParameters"); } Name = Resources.PipingCalculation_DefaultName; InputParameters = new PipingInput(generalInputParameters); - SemiProbabilisticParameters = semiProbabilisticInputParameters; + NormProbabilityParameters = normProbabilityInputParameters; } /// /// Gets the parameters required to perform a semi-probabilistic assessment. /// - public SemiProbabilisticPipingInput SemiProbabilisticParameters { get; private set; } + public NormProbabilityPipingInput NormProbabilityParameters { get; private set; } /// /// Gets the input parameters to perform a piping calculation with. Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -35,12 +35,12 @@ /// /// General piping calculation parameters that /// are the same across all piping calculations. - /// General semi-probabilistic parameters that + /// General semi-probabilistic parameters that /// are used in a semi-probabilistic piping assessment. /// When or - /// is null. - public PipingCalculationScenario(GeneralPipingInput generalInputParameters, SemiProbabilisticPipingInput semiProbabilisticInputParameters) - : base(generalInputParameters, semiProbabilisticInputParameters) + /// is null. + public PipingCalculationScenario(GeneralPipingInput generalInputParameters, NormProbabilityPipingInput normProbabilityInputParameters) + : base(generalInputParameters, normProbabilityInputParameters) { IsRelevant = true; Contribution = (RoundedDouble) 1.0; Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -rfec99b77571cc0cf37b60f5ca257394714fde1d7 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision fec99b77571cc0cf37b60f5ca257394714fde1d7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -41,7 +41,7 @@ public PipingFailureMechanism() : base(PipingDataResources.PipingFailureMechanism_DisplayName, PipingDataResources.PipingFailureMechanism_DisplayCode) { - SemiProbabilisticInput = new SemiProbabilisticPipingInput(); + NormProbabilityInput = new NormProbabilityPipingInput(); GeneralInput = new GeneralPipingInput(); SurfaceLines = new List(); StochasticSoilModels = new ObservableList(); @@ -60,15 +60,20 @@ { get { - return SemiProbabilisticInput.Contribution; + return NormProbabilityInput.Contribution; } set { - SemiProbabilisticInput.Contribution = value; + NormProbabilityInput.Contribution = value; } } /// + /// Gets all available piping calculation groups. + /// + public override ICalculationGroup CalculationsGroup { get; protected set; } + + /// /// Gets the available within the scope of the piping failure mechanism. /// public ICollection SurfaceLines { get; private set; } @@ -79,11 +84,6 @@ public ObservableList StochasticSoilModels { get; private set; } /// - /// Gets all available piping calculation groups. - /// - public override ICalculationGroup CalculationsGroup { get; protected set; } - - /// /// Gets the general piping calculation input parameters that apply to each piping calculation. /// public GeneralPipingInput GeneralInput { get; private set; } @@ -92,6 +92,6 @@ /// Gets the general semi-probabilistic calculation input parameters that apply to each calculation /// in a semi-probabilistic assessment. /// - public SemiProbabilisticPipingInput SemiProbabilisticInput { get; set; } + public NormProbabilityPipingInput NormProbabilityInput { get; set; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/SemiProbabilisticPipingInput.cs =================================================================== diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/SemiProbabilisticPipingInput.cs (.../SemiProbabilisticPipingInput.cs) (revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/SemiProbabilisticPipingInput.cs (.../SemiProbabilisticPipingInput.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -24,11 +24,11 @@ namespace Ringtoets.Piping.Data { - public class SemiProbabilisticPipingInput + public class NormProbabilityPipingInput { private double contribution; - public SemiProbabilisticPipingInput() + public NormProbabilityPipingInput() { A = 1.0; B = 350.0; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -r887b289acf19a81f62d78f371ab70c3f82812b95 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 887b289acf19a81f62d78f371ab70c3f82812b95) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -49,17 +49,17 @@ /// with. /// The soil models from which profiles are taken to configure with. /// General input to assign to each generated piping calculation. - /// Semi probabilistic input to assign to each generated piping calculation. + /// Semi probabilistic input to assign to each generated piping calculation. /// A structure or matching combinations of and /// profiles of intersecting . /// Throw when either: /// /// is null /// is null /// is null - /// is null + /// is null /// - public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput) + public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) { if (surfaceLines == null) { @@ -73,15 +73,15 @@ { throw new ArgumentNullException("generalInput"); } - if (semiProbabilisticInput == null) + if (normProbabilityInput == null) { - throw new ArgumentNullException("semiProbabilisticInput"); + throw new ArgumentNullException("normProbabilityInput"); } List groups = new List(); foreach (var surfaceLine in surfaceLines) { - var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, semiProbabilisticInput); + var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, normProbabilityInput); if (group.GetCalculations().Any()) { groups.Add(group); @@ -124,27 +124,27 @@ return soilModelObjectsForCalculation; } - private static ICalculationBase CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput) + private static ICalculationBase CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) { var pipingCalculationGroup = new CalculationGroup(surfaceLine.Name, true); var stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); foreach (var stochasticSoilModel in stochasticSoilModels) { foreach (var soilProfile in stochasticSoilModel.StochasticSoilProfiles) { - pipingCalculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, pipingCalculationGroup.Children, generalInput, semiProbabilisticInput)); + pipingCalculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, pipingCalculationGroup.Children, generalInput, normProbabilityInput)); } } return pipingCalculationGroup; } - private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput) + private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) { var nameBase = string.Format("{0} {1}", surfaceLine.Name, stochasticSoilProfile); var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name); - return new PipingCalculationScenario(generalInput, semiProbabilisticInput) + return new PipingCalculationScenario(generalInput, normProbabilityInput) { Name = name, InputParameters = Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs =================================================================== diff -u -rde18e9d8a0324e9345f412eb6c1ffeed4f86f2fb -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs (.../PipingFailureMechanismContextProperties.cs) (revision de18e9d8a0324e9345f412eb6c1ffeed4f86f2fb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs (.../PipingFailureMechanismContextProperties.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -171,7 +171,7 @@ { get { - return data.WrappedData.SemiProbabilisticInput.A; + return data.WrappedData.NormProbabilityInput.A; } } @@ -183,7 +183,7 @@ { get { - return data.WrappedData.SemiProbabilisticInput.B; + return data.WrappedData.NormProbabilityInput.B; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -418,8 +418,8 @@ PrefillComboBoxListItemsAtColumnLevel(); dataGridView.DataSource = pipingCalculations.OfType() - .Select(pc => new PipingCalculationRow(pc)) - .ToList(); + .Select(pc => new PipingCalculationRow(pc)) + .ToList(); UpdateStochasticSoilModelColumn(); UpdateStochasticSoilProfileColumn(); @@ -791,7 +791,7 @@ dialog.SelectedSurfaceLines, pipingFailureMechanism.StochasticSoilModels, pipingFailureMechanism.GeneralInput, - pipingFailureMechanism.SemiProbabilisticInput); + pipingFailureMechanism.NormProbabilityInput); foreach (var item in calculationsStructure) { pipingCalculationGroup.Children.Add(item); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -rbbe2a3488b33585ad13bebdaa7439f5c5bbfe079 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision bbe2a3488b33585ad13bebdaa7439f5c5bbfe079) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -412,7 +412,7 @@ private void AddCalculation(PipingFailureMechanism failureMechanism) { - var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput, failureMechanism.SemiProbabilisticInput) + var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput) { Name = NamingHelper.GetUniqueName(failureMechanism.CalculationsGroup.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name) }; @@ -619,7 +619,7 @@ PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation_ToolTip, PipingFormsResources.PipingIcon, (o, args) => { - var calculation = new PipingCalculationScenario(nodeData.PipingFailureMechanism.GeneralInput, nodeData.PipingFailureMechanism.SemiProbabilisticInput) + var calculation = new PipingCalculationScenario(nodeData.PipingFailureMechanism.GeneralInput, nodeData.PipingFailureMechanism.NormProbabilityInput) { Name = NamingHelper.GetUniqueName(group.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name) }; @@ -729,17 +729,17 @@ var view = new PipingSurfaceLineSelectionDialog(Gui.MainWindow, nodeData.AvailablePipingSurfaceLines); view.ShowDialog(); - GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.PipingFailureMechanism.GeneralInput, nodeData.PipingFailureMechanism.SemiProbabilisticInput); + GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.PipingFailureMechanism.GeneralInput, nodeData.PipingFailureMechanism.NormProbabilityInput); nodeData.NotifyObservers(); nodeData.WrappedData.AddCalculationScenariosToFailureMechanismSectionResult(nodeData.PipingFailureMechanism); nodeData.PipingFailureMechanism.NotifyObservers(); } - private void GeneratePipingCalculations(ICalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput) + private void GeneratePipingCalculations(ICalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) { - foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput, semiProbabilisticInput)) + foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput, normProbabilityInput)) { target.Children.Add(group); } @@ -819,7 +819,7 @@ { group.WrappedData.Children.Remove(nodeData.WrappedData); - foreach (var calculation in nodeData.WrappedData.GetCalculations().Cast()) + foreach (var calculation in nodeData.WrappedData.GetCalculations().Cast()) { RemoveCalculation(calculation, nodeData.PipingFailureMechanism); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs =================================================================== diff -u -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -70,34 +70,34 @@ { ValidateOutputOnCalculation(calculation); - SemiProbabilisticPipingInput semiProbabilisticParameters = calculation.SemiProbabilisticParameters; + NormProbabilityPipingInput normProbabilityParameters = calculation.NormProbabilityParameters; PipingOutput pipingOutput = calculation.Output; var calculator = new PipingSemiProbabilisticCalculationService( pipingOutput.UpliftFactorOfSafety, pipingOutput.HeaveFactorOfSafety, pipingOutput.SellmeijerFactorOfSafety, - semiProbabilisticParameters.Norm, - semiProbabilisticParameters.A, - semiProbabilisticParameters.B, - semiProbabilisticParameters.SectionLength, - semiProbabilisticParameters.Contribution/100); + normProbabilityParameters.Norm, + normProbabilityParameters.A, + normProbabilityParameters.B, + normProbabilityParameters.SectionLength, + normProbabilityParameters.Contribution/100); calculator.Calculate(); calculation.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput( calculator.upliftFactorOfSafety, calculator.upliftReliability, - 1.0 / calculator.upliftProbability, + 1.0/calculator.upliftProbability, calculator.heaveFactorOfSafety, calculator.heaveReliability, - 1.0 / calculator.heaveProbability, + 1.0/calculator.heaveProbability, calculator.sellmeijerFactorOfSafety, calculator.sellmeijerReliability, - 1.0 / calculator.sellmeijerProbability, - 1.0 / calculator.requiredProbability, + 1.0/calculator.sellmeijerProbability, + 1.0/calculator.requiredProbability, calculator.requiredReliability, - 1.0 / calculator.pipingProbability, + 1.0/calculator.pipingProbability, calculator.pipingReliability, calculator.pipingFactorOfSafety ); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs (.../PipingCalculationGroupExtensionsTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs (.../PipingCalculationGroupExtensionsTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -21,10 +21,8 @@ using System.Collections.Generic; using System.Linq; -using Core.Common.Base; using Core.Common.Base.Geometry; using NUnit.Framework; -using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Piping.Data.TestUtil; @@ -69,7 +67,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism.GeneralInput, - failureMechanism.SemiProbabilisticInput); + failureMechanism.NormProbabilityInput); foreach (var item in calculationsStructure) { @@ -99,7 +97,7 @@ // Setup var failureMechanism = GetFailureMechanismWithSections(); var stochasticSoilModel = failureMechanism.StochasticSoilModels.First(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -137,7 +135,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism.GeneralInput, - failureMechanism.SemiProbabilisticInput); + failureMechanism.NormProbabilityInput); foreach (var item in calculationsStructure) { @@ -164,7 +162,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism.GeneralInput, - failureMechanism.SemiProbabilisticInput); + failureMechanism.NormProbabilityInput); foreach (var item in calculationsStructure) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r887b289acf19a81f62d78f371ab70c3f82812b95 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 887b289acf19a81f62d78f371ab70c3f82812b95) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -35,7 +35,7 @@ public void IsSurfaceLineIntersectionWithReferenceLineInSection_IPipingCalculationItemNotPipingCalculationScenario_ReturnsFalse() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); // Call var intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -48,7 +48,7 @@ public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineNull_ReturnsFalse() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); // Call var intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -78,7 +78,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -114,7 +114,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -152,7 +152,7 @@ new Point2D(20.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -32,14 +32,14 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); // Call var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); // Assert Assert.IsInstanceOf(scenario); - Assert.AreSame(semiProbabilisticInputParameters, scenario.SemiProbabilisticParameters); + Assert.AreSame(semiProbabilisticInputParameters, scenario.NormProbabilityParameters); Assert.IsTrue(scenario.IsRelevant); Assert.AreEqual((RoundedDouble) 1.0, scenario.Contribution); Assert.IsNull(scenario.Probability); @@ -52,7 +52,7 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); @@ -70,7 +70,7 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); @@ -90,7 +90,7 @@ RoundedDouble expectedProbability = new RoundedDouble(0, 49862180); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); scenario.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0); @@ -107,7 +107,7 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); @@ -123,7 +123,7 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); scenario.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, double.NaN, 0, 0); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -r28d7428ed418504296e2c686958a4500b910cc32 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 28d7428ed418504296e2c686958a4500b910cc32) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -46,7 +46,7 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); // Call var calculation = new PipingCalculation(generalInputParameters, semiProbabilisticInputParameters); @@ -69,7 +69,7 @@ public void Constructor_GeneralPipingInputIsNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => new PipingCalculation(null, new SemiProbabilisticPipingInput()); + TestDelegate call = () => new PipingCalculation(null, new NormProbabilityPipingInput()); // Assert Assert.Throws(call); @@ -94,7 +94,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Attach(observer); @@ -110,7 +110,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Never(); mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Attach(observer); calculation.Detach(observer); @@ -131,7 +131,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Attach(observerA); calculation.Attach(observerB); @@ -152,7 +152,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Attach(observerA); calculation.Attach(observerB); @@ -168,7 +168,7 @@ // Setup var observer = mockRepository.StrictMock(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); // Call & Assert calculation.Detach(observer); @@ -178,7 +178,7 @@ public void ClearOutput_Always_SetsOutputToNull() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }; @@ -194,7 +194,7 @@ public void HasOutput_OutputNull_ReturnsFalse() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = null }; @@ -207,7 +207,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }; @@ -220,7 +220,7 @@ public void ClearHydraulicBoundaryLocation_Always_SetHydraulicBoundaryLocationToNull() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0); calculation.InputParameters.HydraulicBoundaryLocation = hydraulicBoundaryLocation; @@ -238,7 +238,7 @@ public void ClearHydraulicBoundaryLocation_Always_SetAssessmentLevelToNaN() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var assessmentLevel = new RoundedDouble(2, 7.60); calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0) { @@ -259,7 +259,7 @@ public void Input_Always_ReturnsInputParamaters() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var inputParameters = calculation.InputParameters; // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -rfec99b77571cc0cf37b60f5ca257394714fde1d7 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision fec99b77571cc0cf37b60f5ca257394714fde1d7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -161,7 +161,7 @@ public void Calculations_AddPipingCalculation_ItemIsAddedToCollection() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); @@ -176,7 +176,7 @@ public void Calculations_RemovePipingCalculation_ItemIsRemovedFromCollection() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SemiProbabilisticPipingInputTest.cs =================================================================== diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SemiProbabilisticPipingInputTest.cs (.../SemiProbabilisticPipingInputTest.cs) (revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SemiProbabilisticPipingInputTest.cs (.../SemiProbabilisticPipingInputTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -32,7 +32,7 @@ public void Constructor_DefaultPropertiesSet() { // Call - var inputParameters = new SemiProbabilisticPipingInput(); + var inputParameters = new NormProbabilityPipingInput(); // Assert Assert.AreEqual(1.0, inputParameters.A); @@ -50,7 +50,7 @@ public void Contribution_SetNewValidValue_GetNewValue(double newContributionValue) { // Setup - var inputParameters = new SemiProbabilisticPipingInput(); + var inputParameters = new NormProbabilityPipingInput(); // Call inputParameters.Contribution = newContributionValue; @@ -67,7 +67,7 @@ public void Contribution_SetNewInvalidValue_ThrowArgumentOutOfRangeException(double newContributionValue) { // Setup - var inputParameters = new SemiProbabilisticPipingInput(); + var inputParameters = new NormProbabilityPipingInput(); // Call TestDelegate call = () => inputParameters.Contribution = newContributionValue; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs =================================================================== diff -u -rc61ef8d3ee0558d0a032085a3f1b3cc4c0503b64 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision c61ef8d3ee0558d0a032085a3f1b3cc4c0503b64) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -31,7 +31,7 @@ { public static PipingCalculationScenario CreateCalculationWithInvalidData() { - return new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + return new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); } public static PipingCalculationScenario CreateCalculationWithValidInput() @@ -78,7 +78,7 @@ { DesignWaterLevel = (RoundedDouble) 1.0 }; - return new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + return new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -r915d8a66e5d294a18f9452775406e36a3f8fbdc0 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 915d8a66e5d294a18f9452775406e36a3f8fbdc0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -353,7 +353,7 @@ null, Enumerable.Empty(), new GeneralPipingInput(), - new SemiProbabilisticPipingInput()); + new NormProbabilityPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -368,7 +368,7 @@ Enumerable.Empty(), null, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()); + new NormProbabilityPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -383,7 +383,7 @@ Enumerable.Empty(), Enumerable.Empty(), null, - new SemiProbabilisticPipingInput()); + new NormProbabilityPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -402,7 +402,7 @@ // Assert var parameter = Assert.Throws(test).ParamName; - Assert.AreEqual("semiProbabilisticInput", parameter); + Assert.AreEqual("normProbabilityInput", parameter); } [Test] @@ -442,7 +442,7 @@ ringtoetsPipingSurfaceLines, Enumerable.Empty(), new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -515,7 +515,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -580,7 +580,7 @@ result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -658,7 +658,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -740,7 +740,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -849,7 +849,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert Assert.AreEqual(2, result.Count()); @@ -975,7 +975,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -1061,14 +1061,14 @@ }; GeneralPipingInput generalInput = new GeneralPipingInput(); - SemiProbabilisticPipingInput semiProbabilisticInput = new SemiProbabilisticPipingInput(); + NormProbabilityPipingInput normProbabilityInput = new NormProbabilityPipingInput(); // Call IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, generalInput, - semiProbabilisticInput).ToArray(); + normProbabilityInput).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; @@ -1079,8 +1079,8 @@ Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile1.Name), calculationInput1.Name); Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile2.Name), calculationInput2.Name); - Assert.AreSame(semiProbabilisticInput, calculationInput1.SemiProbabilisticParameters); - Assert.AreSame(semiProbabilisticInput, calculationInput2.SemiProbabilisticParameters); + Assert.AreSame(normProbabilityInput, calculationInput1.NormProbabilityParameters); + Assert.AreSame(normProbabilityInput, calculationInput2.NormProbabilityParameters); CompareGeneralInputToInput(generalInput, calculationInput1); CompareGeneralInputToInput(generalInput, calculationInput2); @@ -1157,7 +1157,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs (.../PipingCalculationContextTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs (.../PipingCalculationContextTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -27,7 +27,7 @@ { new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -59,7 +59,7 @@ { new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var mocks = new MockRepository(); var assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); @@ -83,7 +83,7 @@ { new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); mocks.ReplayAll(); @@ -115,7 +115,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); // Call @@ -145,7 +145,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); context.Attach(observer); @@ -178,7 +178,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); calculation.Attach(observer); // Attach to wrapped object Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs =================================================================== diff -u -r8c60e937f4b8009fea80f3702879e100fe03b63f -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision 8c60e937f4b8009fea80f3702879e100fe03b63f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -40,7 +40,7 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() @@ -75,7 +75,7 @@ public void ParameteredConstructor_AssessmentSectionIsNull_ThrowArgumentNullException() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() @@ -125,7 +125,7 @@ public void ParameteredConstructor_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() @@ -158,7 +158,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculation.InputParameters, calculation, @@ -184,7 +184,7 @@ var observer = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculation.InputParameters, calculation, @@ -213,7 +213,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculationItem.InputParameters, calculationItem, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs (.../PipingCalculationContextPropertiesTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs (.../PipingCalculationContextPropertiesTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -3,7 +3,6 @@ using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; @@ -31,7 +30,7 @@ { // Setup const string name = ""; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Name = name }; @@ -65,7 +64,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Attach(projectObserver); var properties = new PipingCalculationContextProperties @@ -96,7 +95,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Attach(projectObserver); var properties = new PipingCalculationContextProperties Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -rc4d2af65ad23757fb3bd11f93458839bc1787ded -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -51,8 +51,8 @@ Assert.AreEqual(failureMechanism.GeneralInput.MeanDiameter70, properties.MeanDiameter70); Assert.AreEqual(failureMechanism.GeneralInput.SellmeijerReductionFactor, properties.SellmeijerReductionFactor); - Assert.AreEqual(failureMechanism.SemiProbabilisticInput.A, properties.A); - Assert.AreEqual(failureMechanism.SemiProbabilisticInput.B, properties.B); + Assert.AreEqual(failureMechanism.NormProbabilityInput.A, properties.A); + Assert.AreEqual(failureMechanism.NormProbabilityInput.B, properties.B); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -89,7 +89,7 @@ inputParameters.StochasticSoilModel = stochasticSoilModel; inputParameters.StochasticSoilProfile = (stochasticSoilProfile); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingInputContextProperties @@ -139,7 +139,7 @@ projectObserver.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -176,7 +176,7 @@ projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -283,7 +283,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -324,7 +324,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -362,7 +362,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -405,7 +405,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -446,7 +446,7 @@ mocks.ReplayAll(); double assessmentLevel = new Random(21).NextDouble(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -493,7 +493,7 @@ projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(1); mocks.ReplayAll(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -532,7 +532,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -580,7 +580,7 @@ var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -624,7 +624,7 @@ }; var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); stochasticSoilModel.StochasticSoilProfiles.Add(testPipingSoilProfile); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -687,7 +687,7 @@ StochasticSoilModel = stochasticSoilModel1, StochasticSoilProfile = stochasticSoilProfile1 }; - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingInputContextProperties @@ -717,7 +717,7 @@ var typeDescriptorContextMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -62,7 +62,7 @@ { // Setup var testname = "testName"; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Name = testname }; @@ -105,7 +105,7 @@ public void EnsureVisibleOnCreate_Always_ReturnsTrue() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }; @@ -141,7 +141,7 @@ public void ChildNodeObjects_WithOutputData_ReturnOutputChildNode() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }; @@ -187,7 +187,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var pipingCalculationContext = new PipingCalculationContext(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), + var pipingCalculationContext = new PipingCalculationContext(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -231,7 +231,7 @@ var observerMock = mocks.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Name = "" }; @@ -272,7 +272,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(calculation, @@ -303,7 +303,7 @@ { var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }; @@ -341,7 +341,7 @@ var treeViewControlMock = mocks.StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var nodeData = new PipingCalculationContext(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), + var nodeData = new PipingCalculationContext(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -382,7 +382,7 @@ public void CanRemove_ParentIsCalculationGroupWithCalculation_ReturnTrue(bool groupNameEditable) { // Setup - var calculationToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var group = new CalculationGroup("", groupNameEditable); group.Children.Add(calculationToBeRemoved); @@ -414,7 +414,7 @@ public void CanRemove_ParentIsCalculationGroupWithoutCalculation_ReturnFalse(bool groupNameEditable) { // Setup - var calculationToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var group = new CalculationGroup("", groupNameEditable); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -448,7 +448,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeMock = new PipingCalculationContext(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), + var nodeMock = new PipingCalculationContext(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -471,11 +471,11 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput())); + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput())); group.Attach(observer); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -519,7 +519,7 @@ var pipingFailureMechanism = GetFailureMechanism(); var surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray(); - var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -529,7 +529,7 @@ var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput())); + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput())); group.Attach(observer); var assessmentSectionMock = mocks.StrictMock(); @@ -573,7 +573,7 @@ var mainWindow = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, @@ -632,7 +632,7 @@ var gui = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, @@ -734,7 +734,7 @@ var gui = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rbbe2a3488b33585ad13bebdaa7439f5c5bbfe079 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision bbe2a3488b33585ad13bebdaa7439f5c5bbfe079) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -169,7 +169,7 @@ // Setup var calculationItem = mocks.StrictMock(); - var childCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var childCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var childGroup = new CalculationGroup(); @@ -215,7 +215,7 @@ var group = new CalculationGroup(); parentGroup.Children.Add(group); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }); @@ -333,7 +333,7 @@ var gui = mocks.StrictMock(); var group = new CalculationGroup(); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }); @@ -440,7 +440,7 @@ var gui = mocks.StrictMock(); var group = new CalculationGroup(); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }); @@ -1483,7 +1483,7 @@ var pipingFailureMechanism = GetFailureMechanism(); var surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -1879,7 +1879,7 @@ switch (type) { case PipingCalculationType.Calculation: - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); if (initialName != null) { calculation.Name = initialName; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs =================================================================== diff -u -rbbe2a3488b33585ad13bebdaa7439f5c5bbfe079 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision bbe2a3488b33585ad13bebdaa7439f5c5bbfe079) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -122,7 +122,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters)); pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters)); @@ -181,7 +181,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new SemiProbabilisticPipingInput(); + var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters) { Output = new TestPipingOutput() @@ -260,7 +260,7 @@ // Setup var treeViewControl = mocks.StrictMock(); var failureMechanism = new PipingFailureMechanism(); - var pipingCalculation = new PipingCalculationScenario(failureMechanism.GeneralInput, failureMechanism.SemiProbabilisticInput) + var pipingCalculation = new PipingCalculationScenario(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput) { Output = new TestPipingOutput() }; @@ -352,7 +352,7 @@ // Setup var treeViewControl = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Output = new TestPipingOutput() }; @@ -472,7 +472,7 @@ var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Clear(); - failureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput())); + failureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput())); var assessmentSection = mocks.Stub(); var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r52fb2dd367bdca54564201857ed6e0b3cc244693 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision 52fb2dd367bdca54564201857ed6e0b3cc244693) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -57,7 +57,7 @@ var assessmentSection = mocks.StrictMock(); var pipingInputContext = new PipingInputContext( new PipingInput(new GeneralPipingInput()), - new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), + new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()), Enumerable.Empty(), Enumerable.Empty(), new PipingFailureMechanism(), @@ -81,7 +81,7 @@ var assessmentSection = mocks.StrictMock(); var pipingInputContext = new PipingInputContext( new PipingInput(new GeneralPipingInput()), - new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()), + new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()), Enumerable.Empty(), Enumerable.Empty(), new PipingFailureMechanism(), Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision 1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -198,7 +198,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision 1e4d77c17c6eac78bfd705efdff9e52b4fca2c7e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -197,7 +197,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -r52fb2dd367bdca54564201857ed6e0b3cc244693 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs (.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 52fb2dd367bdca54564201857ed6e0b3cc244693) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs (.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -5,7 +5,6 @@ using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Data; @@ -36,7 +35,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -89,7 +88,7 @@ .Repeat.AtLeastOnce(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -130,7 +129,7 @@ private class TestHydraulicBoundaryLocation : HydraulicBoundaryLocation { - public TestHydraulicBoundaryLocation() : base(0, string.Empty, 0, 0) { } + public TestHydraulicBoundaryLocation() : base(0, string.Empty, 0, 0) {} } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r52fb2dd367bdca54564201857ed6e0b3cc244693 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 52fb2dd367bdca54564201857ed6e0b3cc244693) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -51,7 +51,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -125,7 +125,7 @@ new Point3D(2, 3, 0) }); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r52fb2dd367bdca54564201857ed6e0b3cc244693 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 52fb2dd367bdca54564201857ed6e0b3cc244693) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -51,7 +51,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -128,7 +128,7 @@ new Point3D(2, 3, 0) }); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r52fb2dd367bdca54564201857ed6e0b3cc244693 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 52fb2dd367bdca54564201857ed6e0b3cc244693) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -6,7 +6,6 @@ using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; @@ -29,7 +28,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -83,10 +82,10 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); surfaceLine.SetGeometry(new[] { - new Point3D(0.0, 0.0, 0.0), + new Point3D(0.0, 0.0, 0.0), new Point3D(1.0, 0.0, 1.0) }); - var calculationItem = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationItem = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -1022,7 +1022,7 @@ { Children = { - new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Name = "Calculation 1", InputParameters = @@ -1042,7 +1042,7 @@ ExitPointL = (RoundedDouble) 4.4444 } }, - new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { Name = "Calculation 2", InputParameters = Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/FailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -red71d00e40e0171a4d8b8335bbf577206b288e6b -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/FailureMechanismResultViewIntegrationTest.cs (.../FailureMechanismResultViewIntegrationTest.cs) (revision ed71d00e40e0171a4d8b8335bbf577206b288e6b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/FailureMechanismResultViewIntegrationTest.cs (.../FailureMechanismResultViewIntegrationTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -45,14 +45,14 @@ IntegrationTestHelper.ImportSurfaceLines(assessmentSection); // Setup some calculations - var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -95,7 +95,7 @@ Assert.AreEqual(string.Empty, dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set. - var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); assessmentSection.PipingFailureMechanism.CalculationsGroup.AddCalculationScenariosToFailureMechanismSectionResult(assessmentSection.PipingFailureMechanism); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -red71d00e40e0171a4d8b8335bbf577206b288e6b -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision ed71d00e40e0171a4d8b8335bbf577206b288e6b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -43,14 +43,14 @@ IntegrationTestHelper.ImportSurfaceLines(assessmentSection); // Setup some calculations - var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()) + var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) { InputParameters = { @@ -87,7 +87,7 @@ Assert.AreEqual(2, dataGridView.Rows.Count); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set. - var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); Assert.AreEqual(2, dataGridView.Rows.Count); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -r65ea41e01d41d77df1e30bf8e850a44de46e870f -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 65ea41e01d41d77df1e30bf8e850a44de46e870f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -19,7 +19,7 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); // Call var activity = new PipingCalculationActivity(calculation); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs =================================================================== diff -u -r073f4371610f4964a1f877737184494a684f7610 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs (.../PipingCalculationScenarioServiceTest.cs) (revision 073f4371610f4964a1f877737184494a684f7610) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs (.../PipingCalculationScenarioServiceTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -54,7 +54,7 @@ public void SyncCalculationScenarioWithNewSurfaceLine_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var pipingCalculationScenario = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var pipingCalculationScenario = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call @@ -163,7 +163,7 @@ public void RemoveCalculationScenarioFromSectionResult_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); // Call TestDelegate call = () => PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, null); @@ -179,7 +179,7 @@ // Setup var failureMechanism = GetFailureMechanism(); - var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); var sectionResults = failureMechanism.SectionResults.ToArray(); var sectionResultScenariosBeforeRemove = sectionResults[0].CalculationScenarios.ToList(); @@ -210,7 +210,7 @@ // Call PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculationToRemove, failureMechanism); - + // Assert CollectionAssert.DoesNotContain(sectionResults[0].CalculationScenarios, calculationToRemove); } @@ -278,7 +278,7 @@ failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism.GeneralInput, - failureMechanism.SemiProbabilisticInput); + failureMechanism.NormProbabilityInput); foreach (var item in calculationsStructure) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r3721b5bb1ae327907884a90d1a9bd300042e0540 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 3721b5bb1ae327907884a90d1a9bd300042e0540) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -56,7 +56,7 @@ // Setup const string name = ""; - var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); calculation.Name = name; // Call @@ -174,7 +174,7 @@ private void AssertSubCalculatorInputs(PipingInput input) { - var testFactory = (TestPipingSubCalculatorFactory)PipingSubCalculatorFactory.Instance; + var testFactory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance; var heaveCalculator = testFactory.LastCreatedHeaveCalculator; var upliftCalculator = testFactory.LastCreatedUpliftCalculator; var sellmeijerCalculator = testFactory.LastCreatedSellmeijerCalculator; Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -r3721b5bb1ae327907884a90d1a9bd300042e0540 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision 3721b5bb1ae327907884a90d1a9bd300042e0540) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -18,7 +18,7 @@ public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm }; @@ -43,7 +43,7 @@ public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm }; @@ -68,7 +68,7 @@ public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm }; @@ -96,7 +96,7 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm }; @@ -120,7 +120,7 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm, SectionLength = assessmentSectionLength, @@ -151,7 +151,7 @@ double expectedResult = 1.134713444; var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm, SectionLength = assessmentSectionLength, @@ -181,7 +181,7 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingInput = new SemiProbabilisticPipingInput + var pipingInput = new NormProbabilityPipingInput { Norm = norm, SectionLength = assessmentSectionLength, @@ -204,7 +204,7 @@ { // Setup - var semiProbabilisticPipingInput = new SemiProbabilisticPipingInput + var semiProbabilisticPipingInput = new NormProbabilityPipingInput { SectionLength = 6000, Norm = 30000, @@ -229,7 +229,7 @@ { // Setup var generalInput = new GeneralPipingInput(); - var pipingCalculation = new PipingCalculation(generalInput, new SemiProbabilisticPipingInput()); + var pipingCalculation = new PipingCalculation(generalInput, new NormProbabilityPipingInput()); // Call TestDelegate test = () => PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation); @@ -238,9 +238,9 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "Cannot perform a semi-probabilistic calculation without output form the piping kernel."); } - private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput, SemiProbabilisticPipingInput semiProbabilisticPipingInput) + private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput, NormProbabilityPipingInput normProbabilityPipingInput) { - return new PipingCalculation(new GeneralPipingInput(), semiProbabilisticPipingInput) + return new PipingCalculation(new GeneralPipingInput(), normProbabilityPipingInput) { Output = pipingOutput };