Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs =================================================================== diff -u -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -231,7 +231,6 @@ GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards, useManual), GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.GrassCoverSlipOffInwards, useManual), PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.PipingStructure, useManual), - StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction, useManual), TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.TechnicalInnovation, useManual) }; } Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs =================================================================== diff -u -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -167,13 +167,6 @@ assessmentSection, StabilityPointStructuresAssemblyFunc, useManual)); } - StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; - if (failureMechanisms.Contains(strengthStabilityLengthwiseConstructionFailureMechanism)) - { - inputs.Add(CreateCombinedSections(strengthStabilityLengthwiseConstructionFailureMechanism.SectionResultsOld, - StrengthStabilityLengthwiseConstructionAssemblyFunc, useManual)); - } - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; if (failureMechanisms.Contains(duneErosionFailureMechanism)) { @@ -359,14 +352,6 @@ } } - private static Func StrengthStabilityLengthwiseConstructionAssemblyFunc - { - get - { - return StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - private static Func DuneErosionAssemblyFunc { get Fisheye: Tag 707d0f06ce42907f847737c170b38332d4304274 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 707d0f06ce42907f847737c170b38332d4304274 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/StrengthStabilityLengthwiseConstructionAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs =================================================================== diff -u -r54eca15487c522d1712570ba915e6995910d9c43 -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 54eca15487c522d1712570ba915e6995910d9c43) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -213,9 +213,6 @@ dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.StabilityPointStructures), StabilityPointStructuresDataResources.StabilityPointStructuresFailureMechanism_Code, true); - dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.StrengthStabilityLengthwiseConstruction), - IntegrationDataResources.StrengthStabilityLengthwiseConstructionFailureMechanism_Code, - true); dataGridViewControl.AddTextBoxColumn(nameof(CombinedFailureMechanismSectionAssemblyResultRow.DuneErosion), DuneErosionDataResources.DuneErosionFailureMechanism_Code, true); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs =================================================================== diff -u -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -175,7 +175,6 @@ CreateClosingStructuresFailureMechanismAssemblyResultRow(), CreatePipingStructureFailureMechanismAssemblyResultRow(), CreateStabilityPointsStructuresFailureMechanismAssemblyResultRow(), - CreateStrengthStabilityLengthWiseConstructionFailureMechanismAssemblyResultRow(), CreateDuneErosionFailureMechanismAssemblyResultRow(), CreateTechnicalInnovationFailureMechanismAssemblyResultRow() }; @@ -418,13 +417,6 @@ () => PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(pipingStructure, true)); } - private FailureMechanismAssemblyCategoryGroupResultRow CreateStrengthStabilityLengthWiseConstructionFailureMechanismAssemblyResultRow() - { - StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstruction = AssessmentSection.StrengthStabilityLengthwiseConstruction; - return new FailureMechanismAssemblyCategoryGroupResultRow(strengthStabilityLengthwiseConstruction, - () => StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(strengthStabilityLengthwiseConstruction, true)); - } - private FailureMechanismAssemblyCategoryGroupResultRow CreateTechnicalInnovationFailureMechanismAssemblyResultRow() { TechnicalInnovationFailureMechanism technicalInnovation = AssessmentSection.TechnicalInnovation; Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs =================================================================== diff -u -r54eca15487c522d1712570ba915e6995910d9c43 -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision 54eca15487c522d1712570ba915e6995910d9c43) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -50,9 +50,8 @@ private const int closingStructuresIndex = 15; private const int pipingStructureIndex = 16; private const int stabilityPointStructuresIndex = 17; - private const int strengthStabilityLengthwiseConstructionIndex = 18; - private const int duneErosionIndex = 19; - private const int technicalInnovationIndex = 20; + private const int duneErosionIndex = 18; + private const int technicalInnovationIndex = 19; private readonly CombinedFailureMechanismSectionAssemblyResult combinedFailureMechanismSectionAssemblyResult; @@ -279,17 +278,6 @@ } /// - /// Gets the assembly result for strength stability lengthwise construction. - /// - public string StrengthStabilityLengthwiseConstruction - { - get - { - return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwiseConstruction); - } - } - - /// /// Gets the assembly result for dune erosion. /// public string DuneErosion @@ -330,7 +318,6 @@ ColumnStateDefinitions.Add(closingStructuresIndex, DataGridViewColumnStateDefinitionFactory.CreateReadOnlyColumnStateDefinition()); ColumnStateDefinitions.Add(pipingStructureIndex, DataGridViewColumnStateDefinitionFactory.CreateReadOnlyColumnStateDefinition()); ColumnStateDefinitions.Add(stabilityPointStructuresIndex, DataGridViewColumnStateDefinitionFactory.CreateReadOnlyColumnStateDefinition()); - ColumnStateDefinitions.Add(strengthStabilityLengthwiseConstructionIndex, DataGridViewColumnStateDefinitionFactory.CreateReadOnlyColumnStateDefinition()); ColumnStateDefinitions.Add(duneErosionIndex, DataGridViewColumnStateDefinitionFactory.CreateReadOnlyColumnStateDefinition()); ColumnStateDefinitions.Add(technicalInnovationIndex, DataGridViewColumnStateDefinitionFactory.CreateReadOnlyColumnStateDefinition()); } @@ -352,7 +339,6 @@ ColumnStateDefinitions[closingStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); ColumnStateDefinitions[pipingStructureIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.PipingStructure); ColumnStateDefinitions[stabilityPointStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); - ColumnStateDefinitions[strengthStabilityLengthwiseConstructionIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwiseConstruction); ColumnStateDefinitions[duneErosionIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.DuneErosion); ColumnStateDefinitions[technicalInnovationIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.TechnicalInnovation); } Fisheye: Tag 707d0f06ce42907f847737c170b38332d4304274 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 707d0f06ce42907f847737c170b38332d4304274 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/StrengthStabilityLengthwiseConstructionAssemblyMapDataFeaturesFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs =================================================================== diff -u -r54eca15487c522d1712570ba915e6995910d9c43 -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 54eca15487c522d1712570ba915e6995910d9c43) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -68,10 +68,9 @@ private const int closingStructures = 15; private const int pipingStructures = 16; private const int stabilityPointStructuresColumnIndex = 17; - private const int strengthStabilityLengthwiseColumnIndex = 18; - private const int duneErosionColumnIndex = 19; - private const int technicalInnovationColumnIndex = 20; - private const int expectedColumnCount = 21; + private const int duneErosionColumnIndex = 18; + private const int technicalInnovationColumnIndex = 19; + private const int expectedColumnCount = 20; private const string assemblyResultOutdatedWarning = "Toetsoordeel is verouderd. Druk op de \"Toetsoordeel verversen\" knop om opnieuw te berekenen."; private const string assemblyResultManualWarning = "Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen."; @@ -181,7 +180,6 @@ AssertColumn(dataGridViewColumns[closingStructures], "BSKW"); AssertColumn(dataGridViewColumns[pipingStructures], "PKW"); AssertColumn(dataGridViewColumns[stabilityPointStructuresColumnIndex], "STKWp"); - AssertColumn(dataGridViewColumns[strengthStabilityLengthwiseColumnIndex], "STKWl"); AssertColumn(dataGridViewColumns[duneErosionColumnIndex], "DA"); AssertColumn(dataGridViewColumns[technicalInnovationColumnIndex], "INN"); } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -rd5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision d5f0a4f6c69e7f9095ff1b5a2b5c5d9685b9c63c) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -948,14 +948,11 @@ StabilityPointStructuresFailureMechanism stabilityPointStructures = assessmentSection.StabilityPointStructures; AssertAssemblyCells(stabilityPointStructures, assemblyOutput, rows[13].Cells); - StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstruction = assessmentSection.StrengthStabilityLengthwiseConstruction; - AssertAssemblyCells(strengthStabilityLengthwiseConstruction, assemblyCategoryGroup, rows[14].Cells); - DuneErosionFailureMechanism duneErosion = assessmentSection.DuneErosion; - AssertAssemblyCells(duneErosion, assemblyCategoryGroup, rows[15].Cells); + AssertAssemblyCells(duneErosion, assemblyCategoryGroup, rows[14].Cells); TechnicalInnovationFailureMechanism technicalInnovation = assessmentSection.TechnicalInnovation; - AssertAssemblyCells(technicalInnovation, assemblyCategoryGroup, rows[16].Cells); + AssertAssemblyCells(technicalInnovation, assemblyCategoryGroup, rows[15].Cells); } private static void AssertAssemblyCells(IFailureMechanism failureMechanism, DataGridViewCellCollection cells) Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs =================================================================== diff -u -r54eca15487c522d1712570ba915e6995910d9c43 -r707d0f06ce42907f847737c170b38332d4304274 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 54eca15487c522d1712570ba915e6995910d9c43) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 707d0f06ce42907f847737c170b38332d4304274) @@ -52,9 +52,8 @@ private const int closingStructuresIndex = 15; private const int pipingStructureIndex = 16; private const int stabilityPointStructuresIndex = 17; - private const int strengthStabilityLengthwiseIndex = 18; - private const int duneErosionIndex = 19; - private const int technicalInnovationIndex = 20; + private const int duneErosionIndex = 18; + private const int technicalInnovationIndex = 19; [Test] public void Constructor_CombinedFailureMechanismAssemblyResultNull_ThrowsArgumentNullException() @@ -96,7 +95,6 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, closingStructuresIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, pipingStructureIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, stabilityPointStructuresIndex); - DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, strengthStabilityLengthwiseIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, duneErosionIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, technicalInnovationIndex); @@ -120,7 +118,6 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(result.ClosingStructures), row.ClosingStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(result.PipingStructure), row.PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(result.StabilityPointStructures), row.StabilityPointStructures); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(result.StrengthStabilityLengthwiseConstruction), row.StrengthStabilityLengthwiseConstruction); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(result.DuneErosion), row.DuneErosion); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(result.TechnicalInnovation), row.TechnicalInnovation); } @@ -155,7 +152,6 @@ ClosingStructures = categoryGroup, PipingStructure = categoryGroup, StabilityPointStructures = categoryGroup, - StrengthStabilityLengthwiseConstruction = categoryGroup, DuneErosion = categoryGroup, TechnicalInnovation = categoryGroup }); @@ -181,7 +177,6 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[closingStructuresIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[pipingStructureIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[stabilityPointStructuresIndex], expectedBackgroundColor); - DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[strengthStabilityLengthwiseIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[duneErosionIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[technicalInnovationIndex], expectedBackgroundColor); } @@ -210,7 +205,6 @@ ClosingStructures = random.NextEnumValue(), PipingStructure = random.NextEnumValue(), StabilityPointStructures = random.NextEnumValue(), - StrengthStabilityLengthwiseConstruction = random.NextEnumValue(), DuneErosion = random.NextEnumValue(), TechnicalInnovation = random.NextEnumValue() });