Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/RegistrationState/PipingFailureMechanismProperties.cs =================================================================== diff -u -rad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1 -raa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/RegistrationState/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision ad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/RegistrationState/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision aa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce) @@ -35,8 +35,7 @@ private const int namePropertyIndex = 1; private const int codePropertyIndex = 2; private const int inAssemblyPropertyIndex = 3; - private const int aPropertyIndex = 4; - private const int bPropertyIndex = 5; + private const int bPropertyIndex = 4; /// /// Creates a new instance of . @@ -66,39 +65,9 @@ #endregion - [DynamicVisibleValidationMethod] - public bool DynamicVisibleValidationMethod(string propertyName) - { - return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); - } - - private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) - { - return nameof(A).Equals(propertyName) - || nameof(B).Equals(propertyName); - } - #region Length effect parameters [DynamicVisible] - [PropertyOrder(aPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_Description))] - public double A - { - get - { - return data.ProbabilityAssessmentInput.A; - } - set - { - data.ProbabilityAssessmentInput.A = value; - data.NotifyObservers(); - } - } - - [DynamicVisible] [PropertyOrder(bPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_DisplayName))] @@ -107,10 +76,21 @@ { get { - return data.ProbabilityAssessmentInput.B; + return data.GeneralInput.B; } } #endregion + + [DynamicVisibleValidationMethod] + public bool DynamicVisibleValidationMethod(string propertyName) + { + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); + } + + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + { + return nameof(B).Equals(propertyName); + } } } \ No newline at end of file Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/SemiProbabilisticPipingScenarioRow.cs =================================================================== diff -u -r7cf3c3b2d42388c323988589e4dca3073482a8d3 -raa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/SemiProbabilisticPipingScenarioRow.cs (.../SemiProbabilisticPipingScenarioRow.cs) (revision 7cf3c3b2d42388c323988589e4dca3073482a8d3) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/SemiProbabilisticPipingScenarioRow.cs (.../SemiProbabilisticPipingScenarioRow.cs) (revision aa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce) @@ -84,7 +84,7 @@ if (derivedOutput != null) { return Math.Min(1.0, derivedOutput.PipingProbability * sectionConfiguration.GetN( - failureMechanism.ProbabilityAssessmentInput.B)); + failureMechanism.GeneralInput.B)); } return double.NaN; Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/RegistrationState/PipingFailureMechanismPropertiesTest.cs =================================================================== diff -u -rad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1 -raa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/RegistrationState/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision ad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/RegistrationState/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision aa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce) @@ -21,12 +21,9 @@ using System; using System.ComponentModel; -using Core.Common.Base; using Core.Common.TestUtil; using Core.Gui.TestUtil; using NUnit.Framework; -using Rhino.Mocks; -using Riskeer.Common.Data.Probability; using Riskeer.Piping.Data; using Riskeer.Piping.Forms.PropertyClasses; using Riskeer.Piping.Forms.PropertyClasses.RegistrationState; @@ -39,8 +36,7 @@ private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; private const int inAssemblyPropertyIndex = 2; - private const int aPropertyIndex = 3; - private const int bPropertyIndex = 4; + private const int bPropertyIndex = 3; [Test] public void Constructor_ExpectedValues() @@ -61,9 +57,7 @@ Assert.AreEqual(failureMechanism.Code, properties.Code); Assert.AreEqual(failureMechanism.InAssembly, properties.InAssembly); - ProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.ProbabilityAssessmentInput; - Assert.AreEqual(probabilityAssessmentInput.A, properties.A); - Assert.AreEqual(probabilityAssessmentInput.B, properties.B); + Assert.AreEqual(failureMechanism.GeneralInput.B, properties.B); } [Test] @@ -77,7 +71,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(5, dynamicProperties.Count); + Assert.AreEqual(4, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string lengthEffectCategory = "Lengte-effect"; @@ -103,12 +97,6 @@ "Geeft aan of dit faalmechanisme wordt meegenomen in de assemblage.", true); - PropertyDescriptor aProperty = dynamicProperties[aPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(aProperty, - lengthEffectCategory, - "a [-]", - "De parameter 'a' die gebruikt wordt voor het lengte-effect in berekening van de maximaal toelaatbare faalkans."); - PropertyDescriptor bProperty = dynamicProperties[bPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(bProperty, lengthEffectCategory, @@ -158,62 +146,6 @@ } [Test] - [SetCulture("nl-NL")] - [TestCase(-1)] - [TestCase(-0.1)] - [TestCase(1.1)] - [TestCase(8)] - public void A_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double value) - { - // Setup - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - mocks.ReplayAll(); - - var failureMechanism = new PipingFailureMechanism(); - failureMechanism.Attach(observer); - - var properties = new PipingFailureMechanismProperties(failureMechanism); - - // Call - void Call() => properties.A = value; - - // Assert - const string expectedMessage = "De waarde voor 'a' moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - - mocks.VerifyAll(); - } - - [Test] - [TestCase(0)] - [TestCase(0.1)] - [TestCase(1)] - [TestCase(0.0000001)] - [TestCase(0.9999999)] - public void A_SetValidValue_SetsValueAndUpdatesObservers(double value) - { - // Setup - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - mocks.ReplayAll(); - - var failureMechanism = new PipingFailureMechanism(); - failureMechanism.Attach(observer); - - var properties = new PipingFailureMechanismProperties(failureMechanism); - - // Call - properties.A = value; - - // Assert - Assert.AreEqual(value, failureMechanism.ProbabilityAssessmentInput.A); - - mocks.VerifyAll(); - } - - [Test] [TestCase(true)] [TestCase(false)] public void DynamicVisibleValidationMethod_DependingOnInAssembly_ReturnExpectedVisibility(bool inAssembly) @@ -231,7 +163,6 @@ Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.InAssembly))); - Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.A))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.B))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/SemiProbabilisticPipingScenarioRowTest.cs =================================================================== diff -u -rcf1e2da1638bc150ef79a330bc881267987364ca -raa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/SemiProbabilisticPipingScenarioRowTest.cs (.../SemiProbabilisticPipingScenarioRowTest.cs) (revision cf1e2da1638bc150ef79a330bc881267987364ca) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/SemiProbabilisticPipingScenarioRowTest.cs (.../SemiProbabilisticPipingScenarioRowTest.cs) (revision aa22998fa4c1ba4aec6b3fb89ac85fbc4fce30ce) @@ -157,7 +157,7 @@ Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); Assert.AreEqual(expectedDerivedOutput.SellmeijerProbability, row.FailureProbabilitySellmeijer); Assert.AreEqual(Math.Min(1.0, expectedDerivedOutput.PipingProbability * sectionConfiguration.GetN( - failureMechanism.ProbabilityAssessmentInput.B)), + failureMechanism.GeneralInput.B)), row.SectionFailureProbability); mocks.VerifyAll(); } @@ -220,7 +220,7 @@ Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); Assert.AreEqual(expectedDerivedOutput.SellmeijerProbability, row.FailureProbabilitySellmeijer); Assert.AreEqual(expectedDerivedOutput.PipingProbability * sectionConfiguration.GetN( - failureMechanism.ProbabilityAssessmentInput.B), + failureMechanism.GeneralInput.B), row.SectionFailureProbability); mocks.VerifyAll(); } @@ -251,7 +251,7 @@ Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); Assert.AreEqual(expectedDerivedOutput.SellmeijerProbability, row.FailureProbabilitySellmeijer); Assert.AreEqual(expectedDerivedOutput.PipingProbability * sectionConfiguration.GetN( - failureMechanism.ProbabilityAssessmentInput.B), + failureMechanism.GeneralInput.B), row.SectionFailureProbability); // When @@ -293,7 +293,7 @@ Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); Assert.AreEqual(expectedDerivedOutput.SellmeijerProbability, row.FailureProbabilitySellmeijer); Assert.AreEqual(expectedDerivedOutput.PipingProbability * sectionConfiguration.GetN( - failureMechanism.ProbabilityAssessmentInput.B), + failureMechanism.GeneralInput.B), row.SectionFailureProbability); var random = new Random(11); @@ -309,7 +309,7 @@ Assert.AreEqual(newExpectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); Assert.AreEqual(newExpectedDerivedOutput.SellmeijerProbability, row.FailureProbabilitySellmeijer); Assert.AreEqual(newExpectedDerivedOutput.PipingProbability * sectionConfiguration.GetN( - failureMechanism.ProbabilityAssessmentInput.B), + failureMechanism.GeneralInput.B), row.SectionFailureProbability); mocks.VerifyAll(); }