Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -r6a9a423fddb189769e43cc9d69d4dd828a6f68e2 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 6a9a423fddb189769e43cc9d69d4dd828a6f68e2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -821,11 +821,8 @@ // Setup var registry = new PersistenceRegistry(); - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - // Call - TestDelegate test = () => registry.Register(null, new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput)); + TestDelegate test = () => registry.Register(null, new PipingCalculationScenario(new GeneralPipingInput())); // Assert var paramName = Assert.Throws(test).ParamName; @@ -1176,7 +1173,7 @@ { PipingCalculationEntityId = storageId }; - var model = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var model = new PipingCalculationScenario(new GeneralPipingInput()); registry.Register(entity, model); // Call @@ -1534,7 +1531,7 @@ dbContext.PipingCalculationEntities.Add(orphanedEntity); dbContext.PipingCalculationEntities.Add(persistentEntity); - var calculationGroup = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculationGroup = new PipingCalculationScenario(new GeneralPipingInput()) { StorageId = persistentEntity.PipingCalculationEntityId }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r6a9a423fddb189769e43cc9d69d4dd828a6f68e2 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision 6a9a423fddb189769e43cc9d69d4dd828a6f68e2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -44,10 +44,8 @@ public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() { // Setup - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput); - + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + // Call TestDelegate call = () => calculation.Create(null, 0); @@ -66,9 +64,7 @@ // Setup var random = new Random(randomSeed); - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { IsRelevant = isRelevant, Contribution = (RoundedDouble)contribution, @@ -171,9 +167,7 @@ var registry = new PersistenceRegistry(); SurfaceLineEntity surfaceLineEntity = surfaceLine.Create(registry); - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -204,9 +198,7 @@ var registry = new PersistenceRegistry(); - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -231,9 +223,7 @@ var registry = new PersistenceRegistry(); HydraulicLocationEntity hydraulicLocationEntity = hydraulicBoundaryLocation.Create(registry); - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -253,12 +243,8 @@ { // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "a", 1.1, 2.2); - var registry = new PersistenceRegistry(); - - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -290,9 +276,7 @@ var registry = new PersistenceRegistry(); StochasticSoilModelEntity soilModelEntity = soilModel.Create(registry); - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -324,10 +308,7 @@ soilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); var registry = new PersistenceRegistry(); - - var generalInputParameters = new GeneralPipingInput(); - var probabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = new PipingCalculationScenario(generalInputParameters, probabilityAssessmentInput) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r0e8590d1ba6edc87a2ac73240662bfcf45f20914 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 0e8590d1ba6edc87a2ac73240662bfcf45f20914) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -124,7 +124,7 @@ surfaceLinesImporter.Import(context, Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6.soil")); } - var calculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput, pipingFailureMechanism.PipingProbabilityAssessmentInput); + var calculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput); pipingFailureMechanism.CalculationsGroup.Children.Add(calculation); var originalPhreaticLevelExit = calculation.InputParameters.PhreaticLevelExit; calculation.InputParameters.PhreaticLevelExit = new NormalDistribution(originalPhreaticLevelExit.Mean.NumberOfDecimalPlaces) Index: Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs =================================================================== diff -u -r1957c54820f55f8de15e34add4577a78b2e96850 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs (.../ProbabilityAssessmentService.cs) (revision 1957c54820f55f8de15e34add4577a78b2e96850) +++ Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs (.../ProbabilityAssessmentService.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -37,7 +37,7 @@ /// to the total of the failure probability of the assessment section. /// The 'N' parameter used to factor in the 'length effect'. /// The reliability to use for the calculation. - public static ProbabilityAssessmentOutput Calculate(double norm, double contribution, double lengthEffectN, double reliability) + public static ProbabilityAssessmentOutput Calculate(int norm, double contribution, double lengthEffectN, double reliability) { var requiredProbability = RequiredProbability(contribution / 100.0, norm, lengthEffectN); var probability = ReliabilityToProbability(reliability); @@ -51,9 +51,9 @@ factorOfSafety); } - private static double RequiredProbability(double contribution, double norm, double lengthEffectN) + private static double RequiredProbability(double contribution, int norm, double lengthEffectN) { - return contribution*(1/norm)/lengthEffectN; + return contribution*(1.0/norm)/lengthEffectN; } private static double ReliabilityToProbability(double reliability) Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/ProbabilityAssessmentServiceTest.cs =================================================================== diff -u -r1957c54820f55f8de15e34add4577a78b2e96850 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/ProbabilityAssessmentServiceTest.cs (.../ProbabilityAssessmentServiceTest.cs) (revision 1957c54820f55f8de15e34add4577a78b2e96850) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/ProbabilityAssessmentServiceTest.cs (.../ProbabilityAssessmentServiceTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -69,7 +69,7 @@ public void Reliability_DifferentInputs_ReturnsExpectedValue(double reliability, double expectedResult) { // Call - var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(double.NaN, double.NaN, double.NaN, reliability); + var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(int.MinValue, double.NaN, double.NaN, reliability); // Assert Assert.AreEqual(expectedResult, probabilityAssessmentOutput.Reliability, probabilityAssessmentOutput.Reliability.GetAccuracy()); @@ -81,7 +81,7 @@ public void Probability_DifferentInputs_ReturnsExpectedValue(double reliability, double expectedResult) { // Call - var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(double.NaN, double.NaN, double.NaN, reliability); + var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(int.MinValue, double.NaN, double.NaN, reliability); // Assert Assert.AreEqual(expectedResult, probabilityAssessmentOutput.Probability, probabilityAssessmentOutput.Probability.GetAccuracy()); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs =================================================================== diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -36,28 +36,15 @@ /// /// General piping calculation parameters that /// are the same across all piping calculations. - /// General input that influences the - /// probability estimate for a piping assessment. - /// When or - /// is null. - public PipingCalculation(GeneralPipingInput generalInputParameters, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + /// When is null. + public PipingCalculation(GeneralPipingInput generalInputParameters) { - if (pipingProbabilityAssessmentInput == null) - { - throw new ArgumentNullException("pipingProbabilityAssessmentInput"); - } Name = Resources.PipingCalculation_DefaultName; InputParameters = new PipingInput(generalInputParameters); - PipingProbabilityAssessmentInput = pipingProbabilityAssessmentInput; } /// - /// Gets the piping probability assessment input. - /// - public PipingProbabilityAssessmentInput PipingProbabilityAssessmentInput { get; private set; } - - /// /// Gets the input parameters to perform a piping calculation with. /// public PipingInput InputParameters { get; private set; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs =================================================================== diff -u -r6a9a423fddb189769e43cc9d69d4dd828a6f68e2 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision 6a9a423fddb189769e43cc9d69d4dd828a6f68e2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -38,12 +38,9 @@ /// /// General piping calculation parameters that /// are the same across all piping calculations. - /// General input that influences the - /// probability estimate for a piping assessment. - /// When or - /// is null. - public PipingCalculationScenario(GeneralPipingInput generalInputParameters, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) - : base(generalInputParameters, pipingProbabilityAssessmentInput) + /// When is null. + public PipingCalculationScenario(GeneralPipingInput generalInputParameters) + : base(generalInputParameters) { IsRelevant = true; Contribution = (RoundedDouble)1.0; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -48,17 +48,15 @@ /// with. /// The soil models from which profiles are taken to configure with. /// General input to assign to each generated piping calculation. - /// Probabilistic assessment input to assign to each generated piping calculation. /// A structure of matching combinations of and /// profiles of intersecting . /// Throw when either: /// /// is null /// is null /// is null - /// is null /// - public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput) { if (surfaceLines == null) { @@ -72,15 +70,11 @@ { throw new ArgumentNullException("generalInput"); } - if (pipingProbabilityAssessmentInput == null) - { - throw new ArgumentNullException("pipingProbabilityAssessmentInput"); - } List groups = new List(); foreach (var surfaceLine in surfaceLines) { - var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, pipingProbabilityAssessmentInput); + var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput); if (group.GetCalculations().Any()) { groups.Add(group); @@ -123,27 +117,27 @@ return soilModelObjectsForCalculation; } - private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput) { var calculationGroup = new CalculationGroup(surfaceLine.Name, true); var stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); foreach (var stochasticSoilModel in stochasticSoilModels) { foreach (var soilProfile in stochasticSoilModel.StochasticSoilProfiles) { - calculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput, pipingProbabilityAssessmentInput)); + calculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput)); } } return calculationGroup; } - private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput) { var nameBase = string.Format("{0} {1}", surfaceLine.Name, stochasticSoilProfile); var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name); - return new PipingCalculationScenario(generalInput, pipingProbabilityAssessmentInput) + return new PipingCalculationScenario(generalInput) { Name = name, InputParameters = Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -rda577499419a07035258244851712e75048f3e2f -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision da577499419a07035258244851712e75048f3e2f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -367,16 +367,15 @@ var lineSegments = Math2D.ConvertLinePointsToLineSegments(failureMechanismSection.Points); var pipingCalculations = calculationGroup - .GetCalculations().OfType() + .GetCalculations() + .OfType() .Where(pc => pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments)); updatingDataSource = true; PrefillComboBoxListItemsAtColumnLevel(); - var dataSource = pipingCalculations.OfType() - .Select(pc => new PipingCalculationRow(pc)) - .ToList(); + var dataSource = pipingCalculations.Select(pc => new PipingCalculationRow(pc)).ToList(); dataGridViewControl.SetDataSource(dataSource); UpdateStochasticSoilModelColumn(); @@ -519,8 +518,7 @@ var calculationsStructure = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( dialog.SelectedSurfaceLines, pipingFailureMechanism.StochasticSoilModels, - pipingFailureMechanism.GeneralInput, - pipingFailureMechanism.PipingProbabilityAssessmentInput); + pipingFailureMechanism.GeneralInput); foreach (var item in calculationsStructure) { calculationGroup.Children.Add(item); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -390,6 +390,7 @@ ActivityProgressDialogRunner.Run(Gui.MainWindow, GetAllPipingCalculations(failureMechanismContext.WrappedData) .Select(calc => new PipingCalculationActivity(calc, + failureMechanismContext.WrappedData.PipingProbabilityAssessmentInput, failureMechanismContext.Parent.FailureMechanismContribution.Norm, failureMechanismContext.WrappedData.Contribution)) .ToList()); @@ -510,6 +511,7 @@ { ActivityProgressDialogRunner.Run(Gui.MainWindow, new PipingCalculationActivity(calculation, + context.FailureMechanism.PipingProbabilityAssessmentInput, context.AssessmentSection.FailureMechanismContribution.Norm, context.FailureMechanism.Contribution)); } @@ -596,7 +598,7 @@ private static void AddCalculationScenario(PipingCalculationGroupContext nodeData) { - var calculation = new PipingCalculationScenario(nodeData.FailureMechanism.GeneralInput, nodeData.FailureMechanism.PipingProbabilityAssessmentInput) + var calculation = new PipingCalculationScenario(nodeData.FailureMechanism.GeneralInput) { Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name) }; @@ -629,17 +631,17 @@ var view = new PipingSurfaceLineSelectionDialog(Gui.MainWindow, nodeData.AvailablePipingSurfaceLines); view.ShowDialog(); - GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput, nodeData.FailureMechanism.PipingProbabilityAssessmentInput); + GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput); nodeData.NotifyObservers(); nodeData.WrappedData.AddCalculationScenariosToFailureMechanismSectionResult(nodeData.FailureMechanism); nodeData.FailureMechanism.NotifyObservers(); } - private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput) { - foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput, pipingProbabilityAssessmentInput)) + foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput)) { target.Children.Add(group); } @@ -667,6 +669,7 @@ group.GetCalculations() .OfType() .Select(pc => new PipingCalculationActivity(pc, + context.FailureMechanism.PipingProbabilityAssessmentInput, context.AssessmentSection.FailureMechanismContribution.Norm, context.FailureMechanism.Contribution)) .ToList()); Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -32,17 +32,21 @@ private readonly int norm; private readonly double contribution; private readonly PipingCalculation calculation; + private readonly PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput; /// /// Initializes a new instance of the class. /// /// The piping data used for the calculation. + /// General input that influences the probability estimate for a piping + /// assessment. /// The return period to assess for. - /// The contribution of piping as a percentage (0-100) to the total of the failure probability of the - /// assessment section. - public PipingCalculationActivity(PipingCalculation calculation, int norm, double contribution) + /// The contribution of piping as a percentage (0-100) to the total of the failure probability + /// of the assessment section. + public PipingCalculationActivity(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, int norm, double contribution) { this.calculation = calculation; + this.pipingProbabilityAssessmentInput = pipingProbabilityAssessmentInput; this.norm = norm; this.contribution = contribution; } @@ -67,7 +71,7 @@ calculation.ClearOutput(); PipingCalculationService.Calculate(calculation); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, contribution); + PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution); } protected override void OnCancel() Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -65,15 +65,16 @@ /// /// The calculation which is used as input for the semi-probabilistic assessment. If the semi- /// probabilistic calculation is successful, is set. + /// General input that influences the probability estimate for a piping + /// assessment. /// The return period to assess for. - /// The contribution of piping as a percentage (0-100) to the total of the failure probability of the - /// assessment section. + /// The contribution of piping as a percentage (0-100) to the total of the failure probability + /// of the assessment section. /// Thrown when calculation has no output from a piping calculation. - public static void Calculate(PipingCalculation calculation, int norm, double contribution) + public static void Calculate(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, int norm, double contribution) { ValidateOutputOnCalculation(calculation); - PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput = calculation.PipingProbabilityAssessmentInput; PipingOutput pipingOutput = calculation.Output; var calculator = new PipingSemiProbabilisticCalculationService( Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs =================================================================== diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs (.../PipingCalculationGroupExtensionsTest.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs (.../PipingCalculationGroupExtensionsTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -66,8 +66,7 @@ var calculationsStructure = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, - failureMechanism.GeneralInput, - failureMechanism.PipingProbabilityAssessmentInput); + failureMechanism.GeneralInput); foreach (var item in calculationsStructure) { @@ -97,7 +96,7 @@ // Setup var failureMechanism = GetFailureMechanismWithSections(); var stochasticSoilModel = failureMechanism.StochasticSoilModels.First(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculation(new GeneralPipingInput()) { InputParameters = { @@ -134,8 +133,7 @@ var calculationsStructure = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, - failureMechanism.GeneralInput, - failureMechanism.PipingProbabilityAssessmentInput); + failureMechanism.GeneralInput); foreach (var item in calculationsStructure) { @@ -161,8 +159,7 @@ var calculationsStructure = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, - failureMechanism.GeneralInput, - failureMechanism.PipingProbabilityAssessmentInput); + failureMechanism.GeneralInput); foreach (var item in calculationsStructure) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -35,7 +35,7 @@ public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineNull_ReturnsFalse() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); // Call var intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -65,7 +65,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -101,7 +101,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -139,7 +139,7 @@ new Point2D(20.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -r6a9a423fddb189769e43cc9d69d4dd828a6f68e2 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 6a9a423fddb189769e43cc9d69d4dd828a6f68e2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -37,16 +37,14 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); // Call - PipingCalculationScenario scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); + PipingCalculationScenario scenario = new PipingCalculationScenario(generalInputParameters); // Assert Assert.IsInstanceOf(scenario); Assert.IsInstanceOf(scenario); Assert.IsInstanceOf(scenario); - Assert.AreSame(pipingProbabilityAssessmentInput, scenario.PipingProbabilityAssessmentInput); Assert.IsTrue(scenario.IsRelevant); Assert.AreEqual((RoundedDouble) 1.0, scenario.Contribution); Assert.AreEqual(CalculationScenarioStatus.NotCalculated, scenario.Status); @@ -58,11 +56,8 @@ public void IsRelevant_Always_ReturnsSetValue(bool isRelevant) { // Setup - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + var scenario = new PipingCalculationScenario(new GeneralPipingInput()); - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); - // Call scenario.IsRelevant = isRelevant; @@ -76,11 +71,7 @@ public void Contribution_Always_ReturnsSetValue(double newValue) { // Setup - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); - + var scenario = new PipingCalculationScenario(new GeneralPipingInput()); var roundedDouble = (RoundedDouble) newValue; // Call @@ -96,10 +87,7 @@ // Setup RoundedDouble expectedProbability = new RoundedDouble(0, 49862180); - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) + var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput(), SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) @@ -116,11 +104,8 @@ public void Probability_ScenarioStatusNotDOne_ThrowsInvalidOperationException() { // Setup - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + var scenario = new PipingCalculationScenario(new GeneralPipingInput()); - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); - // Call RoundedDouble probability; TestDelegate call = () => probability = scenario.Probability; @@ -133,11 +118,8 @@ public void CalculationScenarioStatus_OutputNull_ReturnsStatusNotCalculated() { // Setup - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + var scenario = new PipingCalculationScenario(new GeneralPipingInput()); - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); - // Call CalculationScenarioStatus status = scenario.Status; @@ -149,10 +131,7 @@ public void CalculationScenarioStatus_ScenarioInvalid_ReturnsStatusFailed() { // Setup - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) + var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput(), SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, double.NaN, 0, 0) @@ -171,10 +150,7 @@ // Setup RoundedDouble expectedProbability = new RoundedDouble(0, 49862180); - var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - - var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) + var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput(), SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -45,10 +45,9 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); // Call - var calculation = new PipingCalculation(generalInputParameters, pipingProbabilityAssessmentInput); + var calculation = new PipingCalculation(generalInputParameters); // Assert Assert.IsInstanceOf(calculation); @@ -67,23 +66,13 @@ public void Constructor_GeneralPipingInputIsNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => new PipingCalculation(null, new PipingProbabilityAssessmentInput()); + TestDelegate call = () => new PipingCalculation(null); // Assert Assert.Throws(call); } [Test] - public void Constructor_PipingProbabilisticAssessmentInputIsNull_ThrowArgumentNullException() - { - // Call - TestDelegate call = () => new PipingCalculation(new GeneralPipingInput(), null); - - // Assert - Assert.Throws(call); - } - - [Test] public void Notify_SingleListenerAttached_ListenerIsNotified() { // Setup @@ -92,7 +81,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); calculation.Attach(observer); @@ -108,7 +97,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Never(); mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); calculation.Attach(observer); calculation.Detach(observer); @@ -129,7 +118,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); calculation.Attach(observerA); calculation.Attach(observerB); @@ -150,7 +139,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); calculation.Attach(observerA); calculation.Attach(observerB); @@ -165,9 +154,8 @@ { // Setup var observer = mockRepository.StrictMock(); + var calculation = new PipingCalculation(new GeneralPipingInput()); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); - // Call & Assert calculation.Detach(observer); } @@ -176,7 +164,7 @@ public void ClearOutput_Always_SetsOutputToNull() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculation(new GeneralPipingInput()) { Output = new TestPipingOutput() }; @@ -192,7 +180,7 @@ public void HasOutput_OutputNull_ReturnsFalse() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculation(new GeneralPipingInput()) { Output = null }; @@ -205,7 +193,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculation(new GeneralPipingInput()) { Output = new TestPipingOutput() }; @@ -218,7 +206,7 @@ public void ClearHydraulicBoundaryLocation_Always_SetHydraulicBoundaryLocationToNull() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0); calculation.InputParameters.HydraulicBoundaryLocation = hydraulicBoundaryLocation; @@ -236,7 +224,7 @@ public void ClearHydraulicBoundaryLocation_Always_SetAssessmentLevelToNaN() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); var assessmentLevel = new RoundedDouble(2, 7.60); calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0) { @@ -257,7 +245,7 @@ public void GetObservableInput_Always_ReturnsInputParameters() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); var inputParameters = calculation.InputParameters; // Call @@ -272,7 +260,7 @@ { // Setup var output = new PipingOutput(2.0, 3.0, 1.4, 50.3, 16.3, 58.2); - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculation(new GeneralPipingInput()) { Output = output }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -161,8 +161,7 @@ public void Calculations_AddPipingCalculation_ItemIsAddedToCollection() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); - + var calculation = new PipingCalculation(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); // Call @@ -176,9 +175,9 @@ public void Calculations_RemovePipingCalculation_ItemIsRemovedFromCollection() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); - + var calculation = new PipingCalculation(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); + failureMechanism.CalculationsGroup.Children.Add(calculation); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -31,7 +31,7 @@ { public static PipingCalculationScenario CreateCalculationWithInvalidData() { - return new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + return new PipingCalculationScenario(new GeneralPipingInput()); } public static PipingCalculationScenario CreateCalculationWithValidInput() @@ -78,7 +78,7 @@ { DesignWaterLevel = (RoundedDouble) 1.0 }; - return new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + return new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -352,8 +352,7 @@ TestDelegate test = () => PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( null, Enumerable.Empty(), - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()); + new GeneralPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -367,8 +366,7 @@ TestDelegate test = () => PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( Enumerable.Empty(), null, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()); + new GeneralPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -382,30 +380,14 @@ TestDelegate test = () => PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( Enumerable.Empty(), Enumerable.Empty(), - null, - new PipingProbabilityAssessmentInput()); + null); // Assert var parameter = Assert.Throws(test).ParamName; Assert.AreEqual("generalInput", parameter); } [Test] - public void GenerateCalculationItemsStructure_WithoutSemiProbabilisticInput_ThrowsArgumentNullException() - { - // Call - TestDelegate test = () => PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( - Enumerable.Empty(), - Enumerable.Empty(), - new GeneralPipingInput(), - null); - - // Assert - var parameter = Assert.Throws(test).ParamName; - Assert.AreEqual("pipingProbabilityAssessmentInput", parameter); - } - - [Test] public void GenerateCalculationItemsStructure_WithSurfaceLinesWithEmptySoilModels_LogFourWarnings() { // Setup @@ -441,8 +423,7 @@ result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( ringtoetsPipingSurfaceLines, Enumerable.Empty(), - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); }; // Assert @@ -514,8 +495,7 @@ IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -578,9 +558,9 @@ Action call = () => { result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( - surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + surfaceLines, + availableSoilModels, + new GeneralPipingInput()).ToArray(); }; // Assert @@ -657,8 +637,7 @@ result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); }; // Assert @@ -739,8 +718,7 @@ IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -848,8 +826,7 @@ IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); // Assert Assert.AreEqual(2, result.Count()); @@ -974,8 +951,7 @@ result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); }; // Assert @@ -1061,14 +1037,12 @@ }; GeneralPipingInput generalInput = new GeneralPipingInput(); - PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); // Call IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - generalInput, - pipingProbabilityAssessmentInput).ToArray(); + generalInput).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; @@ -1079,9 +1053,6 @@ 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(pipingProbabilityAssessmentInput, calculationInput1.PipingProbabilityAssessmentInput); - Assert.AreSame(pipingProbabilityAssessmentInput, calculationInput2.PipingProbabilityAssessmentInput); - CompareGeneralInputToInput(generalInput, calculationInput1); CompareGeneralInputToInput(generalInput, calculationInput2); } @@ -1155,8 +1126,7 @@ IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, - new GeneralPipingInput(), - new PipingProbabilityAssessmentInput()).ToArray(); + new GeneralPipingInput()).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs (.../PipingCalculationScenarioContextTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs (.../PipingCalculationScenarioContextTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -25,7 +25,7 @@ { new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -66,7 +66,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var context = new PipingCalculationScenarioContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); // Call @@ -96,7 +96,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var context = new PipingCalculationScenarioContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); context.Attach(observer); @@ -129,7 +129,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var context = new PipingCalculationScenarioContext(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 -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -40,7 +40,7 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() @@ -109,7 +109,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculation.InputParameters, calculation, @@ -135,7 +135,7 @@ var observer = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculation.InputParameters, calculation, @@ -164,7 +164,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculationItem.InputParameters, calculationItem, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -89,7 +89,7 @@ inputParameters.StochasticSoilModel = stochasticSoilModel; inputParameters.StochasticSoilProfile = (stochasticSoilProfile); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingInputContextProperties @@ -139,7 +139,7 @@ projectObserver.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingProbabilityAssessmentInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -283,7 +283,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingProbabilityAssessmentInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -580,7 +580,7 @@ var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); 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 PipingProbabilityAssessmentInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -687,7 +687,7 @@ StochasticSoilModel = stochasticSoilModel1, StochasticSoilProfile = stochasticSoilProfile1 }; - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingInputContextProperties @@ -717,7 +717,7 @@ var typeDescriptorContextMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -106,7 +106,7 @@ // Setup var calculationItem = mocks.StrictMock(); - var childCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var childCalculation = new PipingCalculationScenario(new GeneralPipingInput()); var childGroup = new CalculationGroup(); @@ -150,7 +150,7 @@ var group = new CalculationGroup(); var parentGroup = new CalculationGroup(); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput() }); @@ -268,7 +268,7 @@ var gui = mocks.StrictMock(); var group = new CalculationGroup(); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput() }); @@ -603,7 +603,7 @@ pipingFailureMechanismMock, assessmentSectionMock); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()) { Name = "Nieuwe berekening" }; @@ -1198,7 +1198,7 @@ var pipingFailureMechanism = GetFailureMechanism(); var surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -93,7 +93,7 @@ public void ChildNodeObjects_WithOutputData_ReturnOutputChildNode() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }; @@ -139,7 +139,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var pipingCalculationContext = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), + var pipingCalculationContext = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -172,7 +172,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationScenarioContext(calculation, @@ -204,7 +204,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput() }; @@ -239,7 +239,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationScenarioContext(calculation, @@ -272,7 +272,7 @@ var treeViewControlMock = mocks.StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var nodeData = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), + var nodeData = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -316,11 +316,11 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput()); var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())); + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput())); group.Attach(observer); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -364,7 +364,7 @@ var pipingFailureMechanism = GetFailureMechanism(); var surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray(); - var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -374,7 +374,7 @@ var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())); + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput())); group.Attach(observer); var assessmentSectionMock = mocks.StrictMock(); @@ -418,7 +418,7 @@ var mainWindow = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, @@ -479,7 +479,7 @@ var gui = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, @@ -583,7 +583,7 @@ var gui = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -124,9 +124,8 @@ var pipingFailureMechanism = new PipingFailureMechanism(); var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters)); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters)); var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); @@ -185,9 +184,8 @@ IsRelevant = false }; var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters)); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters)); var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); @@ -211,12 +209,11 @@ var treeViewControl = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var generalInputParameters = new GeneralPipingInput(); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) + var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters) { Output = new TestPipingOutput() }; - var pipingCalculation2 = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) + var pipingCalculation2 = new PipingCalculationScenario(generalInputParameters) { Output = new TestPipingOutput() }; @@ -286,7 +283,7 @@ // Setup var treeViewControl = mocks.StrictMock(); var failureMechanism = new PipingFailureMechanism(); - var pipingCalculation = new PipingCalculationScenario(failureMechanism.GeneralInput, failureMechanism.PipingProbabilityAssessmentInput) + var pipingCalculation = new PipingCalculationScenario(failureMechanism.GeneralInput) { Output = new TestPipingOutput() }; @@ -380,7 +377,7 @@ // Setup var treeViewControl = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput() }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -57,7 +57,7 @@ var assessmentSection = mocks.StrictMock(); var pipingInputContext = new PipingInputContext( new PipingInput(new GeneralPipingInput()), - new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), + new PipingCalculationScenario(new GeneralPipingInput()), Enumerable.Empty(), Enumerable.Empty(), new PipingFailureMechanism(), @@ -81,7 +81,7 @@ var assessmentSection = mocks.StrictMock(); var pipingInputContext = new PipingInputContext( new PipingInput(new GeneralPipingInput()), - new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), + new PipingCalculationScenario(new GeneralPipingInput()), Enumerable.Empty(), Enumerable.Empty(), new PipingFailureMechanism(), Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs (.../LogNormalDistributionDesignVariableTypeConverterTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs (.../LogNormalDistributionDesignVariableTypeConverterTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -197,7 +197,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -193,7 +193,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs (.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs (.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -56,7 +56,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -109,7 +109,7 @@ .Repeat.AtLeastOnce(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -51,7 +51,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -125,7 +125,7 @@ new Point3D(2, 3, 0) }); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -51,7 +51,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -128,7 +128,7 @@ new Point3D(2, 3, 0) }); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -49,7 +49,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -106,7 +106,7 @@ new Point3D(0.0, 0.0, 0.0), new Point3D(1.0, 0.0, 1.0) }); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -1019,7 +1019,7 @@ { Children = { - new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + new PipingCalculationScenario(new GeneralPipingInput()) { Name = "Calculation 1", InputParameters = @@ -1039,7 +1039,7 @@ ExitPointL = (RoundedDouble) 4.4444 } }, - new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + new PipingCalculationScenario(new GeneralPipingInput()) { Name = "Calculation 2", InputParameters = Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -64,14 +64,14 @@ IntegrationTestHelper.ImportSurfaceLines(assessmentSection); // Setup some calculations - var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -108,7 +108,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 PipingProbabilityAssessmentInput()); + var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); Assert.AreEqual(2, dataGridView.Rows.Count); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -66,14 +66,14 @@ IntegrationTestHelper.ImportSurfaceLines(assessmentSection); // Setup some calculations - var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) + var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { @@ -117,7 +117,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 PipingProbabilityAssessmentInput()); + var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); assessmentSection.PipingFailureMechanism.CalculationsGroup.AddCalculationScenariosToFailureMechanismSectionResult(assessmentSection.PipingFailureMechanism); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -19,10 +19,10 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); // Call - var activity = new PipingCalculationActivity(calculation, int.MinValue, double.NaN); + var activity = new PipingCalculationActivity(calculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); // Assert Assert.IsInstanceOf(activity); @@ -40,7 +40,7 @@ var invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData(); invalidPipingCalculation.Output = originalOutput; - var activity = new PipingCalculationActivity(invalidPipingCalculation, int.MinValue, double.NaN); + var activity = new PipingCalculationActivity(invalidPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); // Call Action call = () => activity.Run(); @@ -66,7 +66,7 @@ var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); validPipingCalculation.Output = null; - var activity = new PipingCalculationActivity(validPipingCalculation, int.MinValue, double.NaN); + var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); activity.Run(); // Call @@ -99,7 +99,7 @@ validPipingCalculation.Output = null; validPipingCalculation.Attach(observerMock); - var activity = new PipingCalculationActivity(validPipingCalculation, int.MinValue, double.NaN); + var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); activity.Run(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs =================================================================== diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs (.../PipingCalculationScenarioServiceTest.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs (.../PipingCalculationScenarioServiceTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -54,7 +54,7 @@ public void SyncCalculationScenarioWithNewSurfaceLine_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var pipingCalculationScenario = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var pipingCalculationScenario = new PipingCalculationScenario(new GeneralPipingInput()); var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call @@ -163,7 +163,7 @@ public void RemoveCalculationScenarioFromSectionResult_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); // Call TestDelegate call = () => PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, null); @@ -179,7 +179,7 @@ // Setup var failureMechanism = GetFailureMechanism(); - var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput()); var sectionResults = failureMechanism.SectionResults.ToArray(); var sectionResultScenariosBeforeRemove = sectionResults[0].CalculationScenarios.ToArray(); @@ -277,8 +277,7 @@ var calculationsStructure = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, - failureMechanism.GeneralInput, - failureMechanism.PipingProbabilityAssessmentInput); + failureMechanism.GeneralInput); foreach (var item in calculationsStructure) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -57,7 +57,7 @@ // Setup const string name = ""; - var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); + var calculation = new PipingCalculation(new GeneralPipingInput()); calculation.Name = name; // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -rfcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision fcc734ebbc1e5c6c02ae2dae2a184fdcb9aa4d1b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) @@ -18,11 +18,10 @@ public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); var calculatorResult = new PipingOutput(double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN); - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, double.NaN); + PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.UpliftProbability; @@ -39,11 +38,10 @@ public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, factorOfSafety, double.NaN, double.NaN); - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, double.NaN); + PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.HeaveProbability; @@ -60,11 +58,10 @@ public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, factorOfSafety); - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, double.NaN); + PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.SellmeijerProbability; @@ -84,10 +81,9 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, double.NaN); + PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.PipingReliability; @@ -108,9 +104,9 @@ { SectionLength = assessmentSectionLength, }; - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, contribution); + PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.RequiredReliability; @@ -136,9 +132,9 @@ { SectionLength = assessmentSectionLength, }; - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, contribution); + PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.PipingFactorOfSafety; @@ -163,9 +159,9 @@ { SectionLength = assessmentSectionLength, }; - var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); + var calculation = AsPipingCalculation(calculatorResult); - PipingSemiProbabilisticCalculationService.Calculate(calculation, norm, contribution); + PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution); // Call RoundedDouble result = calculation.SemiProbabilisticOutput.PipingFactorOfSafety; @@ -183,13 +179,13 @@ SectionLength = 6000 }; var pipingOutput = new PipingOutput(double.NaN, 1.2, double.NaN, 0.6, double.NaN, 0.9); - var pipingCalculation = new PipingCalculation(new GeneralPipingInput(), pipingProbabilityAssessmentInput) + var pipingCalculation = new PipingCalculation(new GeneralPipingInput()) { Output = pipingOutput }; // Call - PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation, 30000, 24); + PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation, pipingProbabilityAssessmentInput, 30000, 24); // Assert RoundedDouble result = pipingCalculation.SemiProbabilisticOutput.PipingFactorOfSafety; @@ -201,18 +197,18 @@ { // Setup var generalInput = new GeneralPipingInput(); - var pipingCalculation = new PipingCalculation(generalInput, new PipingProbabilityAssessmentInput()); + var pipingCalculation = new PipingCalculation(generalInput); // Call - TestDelegate test = () => PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation, int.MinValue, double.NaN); + TestDelegate test = () => PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "Cannot perform a semi-probabilistic calculation without output from the piping kernel."); } - private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) + private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput) { - return new PipingCalculation(new GeneralPipingInput(), pipingProbabilityAssessmentInput) + return new PipingCalculation(new GeneralPipingInput()) { Output = pipingOutput };