Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -41,7 +41,6 @@ var sectionResultEntity = new StabilityStoneCoverSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), - LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA), LayerThree = result.AssessmentLayerThree.ToNaNAsNull() }; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs (.../StabilityStoneCoverSectionResultEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs (.../StabilityStoneCoverSectionResultEntityReadExtensions.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -49,7 +49,6 @@ } sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne; - sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult) entity.LayerTwoA; sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision b8df616ca911988b921b933bead5f1ef6862d076) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -44,7 +44,6 @@ var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(new TestFailureMechanismSection()) { AssessmentLayerOne = random.NextEnumValue(), - AssessmentLayerTwoA = random.NextEnumValue(), AssessmentLayerThree = random.NextRoundedDouble() }; @@ -53,7 +52,6 @@ // Assert Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerOne), result.LayerOne); - Assert.AreEqual(Convert.ToByte(sectionResult.AssessmentLayerTwoA), result.LayerTwoA); Assert.AreEqual(sectionResult.AssessmentLayerThree, result.LayerThree, sectionResult.AssessmentLayerThree.GetAccuracy()); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r1c200c32948d83b6a93a92da6a728120634e6e4f -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 1c200c32948d83b6a93a92da6a728120634e6e4f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -1842,7 +1842,6 @@ StabilityStoneCoverFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; StabilityStoneCoverFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; - Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs (.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs) (revision b8df616ca911988b921b933bead5f1ef6862d076) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs (.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -75,7 +75,6 @@ // Assert Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.AreEqual(layerTwoA, sectionResult.AssessmentLayerTwoA); Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6); } @@ -105,7 +104,6 @@ // Assert Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne); - Assert.AreEqual(layerTwoA, sectionResult.AssessmentLayerTwoA); Assert.IsNaN(sectionResult.AssessmentLayerThree); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r1c200c32948d83b6a93a92da6a728120634e6e4f -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 1c200c32948d83b6a93a92da6a728120634e6e4f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -1971,7 +1971,6 @@ foreach (StabilityStoneCoverFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState(); - sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs =================================================================== diff -u -radb804c29e5600ccf9cd6d03c394a2ac08fae381 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision adb804c29e5600ccf9cd6d03c394a2ac08fae381) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -46,7 +46,6 @@ DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = DetailedAssessmentResultType.None; DetailedAssessmentResultForLowerLimitNorm = DetailedAssessmentResultType.None; DetailedAssessmentResultForFactorizedLowerLimitNorm = DetailedAssessmentResultType.None; - AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated; AssessmentLayerThree = RoundedDouble.NaN; } @@ -86,12 +85,6 @@ public DetailedAssessmentResultType DetailedAssessmentResultForFactorizedLowerLimitNorm { get; set; } /// - /// Gets or sets the value of the detailed assessment of safety per failure mechanism section, for which - /// the result is a value of . - /// - public AssessmentLayerTwoAResult AssessmentLayerTwoA { get; set; } - - /// /// Gets or sets the value of the tailored assessment of safety. /// public RoundedDouble AssessmentLayerThree { get; set; } Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs =================================================================== diff -u -re3f913fddac4cfa598ef5439ce6b832f354d7dd8 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs (.../StabilityStoneCoverSectionResultRow.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs (.../StabilityStoneCoverSectionResultRow.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -67,12 +67,8 @@ { get { - return SectionResult.AssessmentLayerTwoA; + return AssessmentLayerTwoAResult.Successful; } - set - { - SectionResult.AssessmentLayerTwoA = value; - } } /// Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs =================================================================== diff -u -radb804c29e5600ccf9cd6d03c394a2ac08fae381 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision adb804c29e5600ccf9cd6d03c394a2ac08fae381) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -48,7 +48,6 @@ Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm); Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForLowerLimitNorm); Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedLowerLimitNorm); - Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA); Assert.IsNaN(result.AssessmentLayerThree); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs =================================================================== diff -u -re3f913fddac4cfa598ef5439ce6b832f354d7dd8 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -99,19 +99,16 @@ var result1 = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1")) { SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2")) { SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 3")) { SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = random.NextRoundedDouble() }; var sectionResults = new ObservableList @@ -138,7 +135,6 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result1.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); - Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); @@ -148,7 +144,6 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); - Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); DataGridViewTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); @@ -158,7 +153,6 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result3.SimpleAssessmentResult, cells[simpleAssessmentIndex].Value); - Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); @@ -181,7 +175,6 @@ var result = new StabilityStoneCoverFailureMechanismSectionResult(section) { SimpleAssessmentResult = simpleAssessmentResult, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = random.NextRoundedDouble() }; var sectionResults = new ObservableList Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs =================================================================== diff -u -re3f913fddac4cfa598ef5439ce6b832f354d7dd8 -rd7a86167971eb09628fea9ac02c50f9eaa80d5c5 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision d7a86167971eb09628fea9ac02c50f9eaa80d5c5) @@ -51,7 +51,6 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); - Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); Assert.AreEqual(result.AssessmentLayerThree, row.AssessmentLayerThree); TestHelper.AssertTypeConverter