Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsOutputFactory.cs =================================================================== diff -u -r80c53924c7488a48f8148ba8b73260446a262883 -r6f076e4427a2f40b39eb818bf92115e2da7ad762 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsOutputFactory.cs (.../DerivedMacroStabilityInwardsOutputFactory.cs) (revision 80c53924c7488a48f8148ba8b73260446a262883) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsOutputFactory.cs (.../DerivedMacroStabilityInwardsOutputFactory.cs) (revision 6f076e4427a2f40b39eb818bf92115e2da7ad762) @@ -55,47 +55,18 @@ { throw new ArgumentNullException(nameof(assessmentSection)); } - - MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput; - double contribution = failureMechanism.Contribution / 100; - double norm = assessmentSection.FailureMechanismContribution.Norm; - + double factorOfStability = output.FactorOfStability; - double requiredProbability = CalculateRequiredProbability(probabilityAssessmentInput.A, - probabilityAssessmentInput.B, - assessmentSection.ReferenceLine.Length, - norm, - contribution); - double requiredReliability = StatisticsConverter.ProbabilityToReliability(requiredProbability); double macroStabilityInwardsReliability = CalculateEstimatedReliability(factorOfStability, failureMechanism.GeneralInput.ModelFactor); double macroStabilityInwardsProbability = StatisticsConverter.ReliabilityToProbability(macroStabilityInwardsReliability); - - double macroStabilityInwardsFactorOfSafety = macroStabilityInwardsReliability / requiredReliability; - + return new DerivedMacroStabilityInwardsOutput(factorOfStability, - requiredProbability, - requiredReliability, macroStabilityInwardsProbability, - macroStabilityInwardsReliability, - macroStabilityInwardsFactorOfSafety); + macroStabilityInwardsReliability); } /// - /// Calculates the required probability of the macro stability inwards failure mechanism for the complete assessment section. - /// - /// The constant a. - /// The constant b. - /// The length of the assessment section. - /// The norm. - /// The contribution of macro stability inwards to the total failure. - /// A value representing the required probability. - private static double CalculateRequiredProbability(double constantA, double constantB, double sectionLength, double norm, double contribution) - { - return (norm * contribution) / (1 + (constantA * sectionLength) / constantB); - } - - /// /// Calculates the estimated reliability of the macro stability inwards failure mechanism /// based on the stability factor and model factor. ///