Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs =================================================================== diff -u -rc0250af47e0b1c6e399e1ce269e522800ed5a857 -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision c0250af47e0b1c6e399e1ce269e522800ed5a857) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -70,7 +70,7 @@ PipingStructure = properties.PipingStructure; StabilityPointStructures = properties.StabilityPointStructures; DuneErosion = properties.DuneErosion; - SpecificFailurePaths = properties.SpecificFailurePaths; + SpecificFailureMechanisms = properties.SpecificFailureMechanisms; } /// @@ -171,9 +171,9 @@ public FailureMechanismSectionAssemblyGroup? DuneErosion { get; } /// - /// Gets the collection of assembly results for specific failure paths or null (which indicates this failure mechanism is not part of the assembly). + /// Gets the collection of assembly results for specific failure mechanisms. /// - public FailureMechanismSectionAssemblyGroup?[] SpecificFailurePaths { get; } + public FailureMechanismSectionAssemblyGroup?[] SpecificFailureMechanisms { get; } /// /// Container for properties for constructing a . @@ -200,7 +200,7 @@ PipingStructure = FailureMechanismSectionAssemblyGroup.Gr; StabilityPointStructures = FailureMechanismSectionAssemblyGroup.Gr; DuneErosion = FailureMechanismSectionAssemblyGroup.Gr; - SpecificFailurePaths = Array.Empty(); + SpecificFailureMechanisms = Array.Empty(); } /// @@ -279,9 +279,9 @@ public FailureMechanismSectionAssemblyGroup? DuneErosion { internal get; set; } /// - /// Gets or sets the collection of assembly results for specific failure paths or null (which indicates this failure mechanism is not part of the assembly). + /// Gets or sets the collection of assembly results for specific failure mechanisms or null (which indicates this failure mechanism is not part of the assembly). /// - public FailureMechanismSectionAssemblyGroup?[] SpecificFailurePaths { internal get; set; } + public FailureMechanismSectionAssemblyGroup?[] SpecificFailureMechanisms { internal get; set; } } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -92,7 +92,7 @@ PipingStructure = GetAssemblyGroup(assessmentSection.PipingStructure, failureMechanisms, failureMechanismResults), StabilityPointStructures = GetAssemblyGroup(assessmentSection.StabilityPointStructures, failureMechanisms, failureMechanismResults), DuneErosion = GetAssemblyGroup(assessmentSection.DuneErosion, failureMechanisms, failureMechanismResults), - SpecificFailurePaths = assessmentSection.SpecificFailureMechanisms.Select(sfp => GetAssemblyGroup(sfp, failureMechanisms, failureMechanismResults)).ToArray() + SpecificFailureMechanisms = assessmentSection.SpecificFailureMechanisms.Select(sfp => GetAssemblyGroup(sfp, failureMechanisms, failureMechanismResults)).ToArray() }; return constructionProperties; Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs =================================================================== diff -u -rcdbfa0ccabc8ace3422331cdfd3787807f667d50 -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision cdbfa0ccabc8ace3422331cdfd3787807f667d50) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -180,7 +180,7 @@ /// Gets the assembly result for specific failure paths. /// public string[] SpecificFailurePaths => - combinedFailureMechanismSectionAssemblyResult.SpecificFailurePaths + combinedFailureMechanismSectionAssemblyResult.SpecificFailureMechanisms .Select(GetDisplayNameForFailureMechanism).ToArray(); public IDictionary ColumnStateDefinitions { get; } @@ -228,8 +228,8 @@ ColumnStateDefinitions[pipingStructureIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.PipingStructure); ColumnStateDefinitions[stabilityPointStructuresIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); ColumnStateDefinitions[duneErosionIndex].Style = CreateCellStyleForFailureMechanism(combinedFailureMechanismSectionAssemblyResult.DuneErosion); - - FailureMechanismSectionAssemblyGroup?[] specificFailurePathAssemblyResults = combinedFailureMechanismSectionAssemblyResult.SpecificFailurePaths; + + FailureMechanismSectionAssemblyGroup?[] specificFailurePathAssemblyResults = combinedFailureMechanismSectionAssemblyResult.SpecificFailureMechanisms; int nrOfSpecificFailurePaths = specificFailurePathAssemblyResults.Length; for (var i = 0; i < nrOfSpecificFailurePaths; i++) { Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs =================================================================== diff -u -rb0f53a89fd213d9197d4a54178aca8c0bd1362ff -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision b0f53a89fd213d9197d4a54178aca8c0bd1362ff) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -109,14 +109,14 @@ for (var i = 0; i < assessmentSection.SpecificFailureMechanisms.Count; i++) { - FailureMechanismSectionAssemblyGroup? specificFailurePathAssemblyResult = assemblyResult.SpecificFailurePaths[i]; + FailureMechanismSectionAssemblyGroup? specificFailureMechanismAssemblyResult = assemblyResult.SpecificFailureMechanisms[i]; - if (specificFailurePathAssemblyResult.HasValue) + if (specificFailureMechanismAssemblyResult.HasValue) { SpecificFailureMechanism specificFailureMechanism = assessmentSection.SpecificFailureMechanisms.ElementAt(i); exportableAssemblyResults.Add(CreateExportableFailureMechanismCombinedSectionAssemblyResult( - specificFailurePathAssemblyResult.Value, ExportableFailureMechanismType.Specific, - specificFailureMechanism.Code, specificFailureMechanism.Name)); + specificFailureMechanismAssemblyResult.Value, ExportableFailureMechanismType.Specific, + specificFailureMechanism.Code)); } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -261,7 +261,7 @@ Assert.AreEqual(expectedOutput[i].PipingStructure, output[i].PipingStructure); Assert.AreEqual(expectedOutput[i].StabilityPointStructures, output[i].StabilityPointStructures); Assert.AreEqual(expectedOutput[i].DuneErosion, output[i].DuneErosion); - CollectionAssert.AreEqual(expectedOutput[i].SpecificFailurePaths, output[i].SpecificFailurePaths); + CollectionAssert.AreEqual(expectedOutput[i].SpecificFailureMechanisms, output[i].SpecificFailureMechanisms); } } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -130,10 +130,10 @@ Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.PipingStructure]), results[i].PipingStructure); Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.StabilityPointStructures]), results[i].StabilityPointStructures); Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.DuneErosion]), results[i].DuneErosion); - Assert.AreEqual(assessmentSection.SpecificFailureMechanisms.Count, results[i].SpecificFailurePaths.Length); + Assert.AreEqual(assessmentSection.SpecificFailureMechanisms.Count, results[i].SpecificFailureMechanisms.Length); foreach (SpecificFailureMechanism specificFailureMechanism in assessmentSection.SpecificFailureMechanisms) { - Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[specificFailureMechanism]), results[i].SpecificFailurePaths.Single()); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[specificFailureMechanism]), results[i].SpecificFailureMechanisms.Single()); } } } @@ -189,10 +189,10 @@ Assert.IsNull(results[i].PipingStructure); Assert.IsNull(results[i].StabilityPointStructures); Assert.IsNull(results[i].DuneErosion); - Assert.AreEqual(assessmentSection.SpecificFailureMechanisms.Count, results[i].SpecificFailurePaths.Length); - foreach (FailureMechanismSectionAssemblyGroup? specificFailurePath in results[i].SpecificFailurePaths) + Assert.AreEqual(assessmentSection.SpecificFailureMechanisms.Count, results[i].SpecificFailureMechanisms.Length); + foreach (FailureMechanismSectionAssemblyGroup? failureMechanismSectionAssemblyGroup in results[i].SpecificFailureMechanisms) { - Assert.IsNull(specificFailurePath); + Assert.IsNull(failureMechanismSectionAssemblyGroup); } } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -rc0250af47e0b1c6e399e1ce269e522800ed5a857 -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision c0250af47e0b1c6e399e1ce269e522800ed5a857) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -81,7 +81,7 @@ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.StabilityPointStructures); Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.DuneErosion); - Assert.IsEmpty(result.SpecificFailurePaths); + Assert.IsEmpty(result.SpecificFailureMechanisms); } [Test] @@ -108,7 +108,7 @@ var pipingStructureResult = random.NextEnumValue(); var stabilityPointStructuresResult = random.NextEnumValue(); var duneErosionResult = random.NextEnumValue(); - var specificFailurePathsResult = new FailureMechanismSectionAssemblyGroup?[] + var specificFailureMechanismResults = new FailureMechanismSectionAssemblyGroup?[] { random.NextEnumValue(), random.NextEnumValue(), @@ -135,7 +135,7 @@ PipingStructure = pipingStructureResult, StabilityPointStructures = stabilityPointStructuresResult, DuneErosion = duneErosionResult, - SpecificFailurePaths = specificFailurePathsResult + SpecificFailureMechanisms = specificFailureMechanismResults }); // Assert @@ -158,7 +158,7 @@ Assert.AreEqual(pipingStructureResult, result.PipingStructure); Assert.AreEqual(stabilityPointStructuresResult, result.StabilityPointStructures); Assert.AreEqual(duneErosionResult, result.DuneErosion); - CollectionAssert.AreEqual(specificFailurePathsResult, result.SpecificFailurePaths); + CollectionAssert.AreEqual(specificFailureMechanismResults, result.SpecificFailureMechanisms); } [Test] @@ -170,7 +170,7 @@ double sectionStart = random.NextDouble(); double sectionEnd = random.NextDouble(); var totalResult = random.NextEnumValue(); - var specificFailurePathResults = new FailureMechanismSectionAssemblyGroup?[] + var specificFailureMechanismResults = new FailureMechanismSectionAssemblyGroup?[] { null, null, @@ -197,7 +197,7 @@ PipingStructure = null, StabilityPointStructures = null, DuneErosion = null, - SpecificFailurePaths = specificFailurePathResults + SpecificFailureMechanisms = specificFailureMechanismResults }); // Assert @@ -220,10 +220,10 @@ Assert.IsNull(result.PipingStructure); Assert.IsNull(result.StabilityPointStructures); Assert.IsNull(result.DuneErosion); - Assert.AreEqual(specificFailurePathResults.Length, result.SpecificFailurePaths.Length); - foreach (FailureMechanismSectionAssemblyGroup? specificFailurePathResult in result.SpecificFailurePaths) + Assert.AreEqual(specificFailureMechanismResults.Length, result.SpecificFailureMechanisms.Length); + foreach (FailureMechanismSectionAssemblyGroup? specificFailureMechanismResult in result.SpecificFailureMechanisms) { - Assert.IsNull(specificFailurePathResult); + Assert.IsNull(specificFailureMechanismResult); } } } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs =================================================================== diff -u -rc0250af47e0b1c6e399e1ce269e522800ed5a857 -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision c0250af47e0b1c6e399e1ce269e522800ed5a857) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -98,7 +98,7 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, pipingStructureIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, stabilityPointStructuresIndex); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, duneErosionIndex); - for (var i = 1; i < result.SpecificFailurePaths.Length; i++) + for (var i = 1; i < result.SpecificFailureMechanisms.Length; i++) { DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, duneErosionIndex + i); } @@ -124,10 +124,10 @@ Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.PipingStructure), row.PipingStructure); Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.StabilityPointStructures), row.StabilityPointStructures); Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(result.DuneErosion), row.DuneErosion); - for (var i = 0; i < result.SpecificFailurePaths.Length; i++) + for (var i = 0; i < result.SpecificFailureMechanisms.Length; i++) { - FailureMechanismSectionAssemblyGroup? specificFailurePath = result.SpecificFailurePaths[i]; - Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(specificFailurePath), row.SpecificFailurePaths[i]); + FailureMechanismSectionAssemblyGroup? specificFailureMechanism = result.SpecificFailureMechanisms[i]; + Assert.AreEqual(GetExpectedDisplayNameForFailureMechanism(specificFailureMechanism), row.SpecificFailurePaths[i]); } } @@ -162,7 +162,7 @@ PipingStructure = assemblyGroup, StabilityPointStructures = assemblyGroup, DuneErosion = assemblyGroup, - SpecificFailurePaths = new FailureMechanismSectionAssemblyGroup?[] + SpecificFailureMechanisms = new FailureMechanismSectionAssemblyGroup?[] { assemblyGroup, assemblyGroup @@ -192,7 +192,7 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[stabilityPointStructuresIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[duneErosionIndex], expectedBackgroundColor); - for (var i = 0; i < result.SpecificFailurePaths.Length; i++) + for (var i = 0; i < result.SpecificFailureMechanisms.Length; i++) { DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[specificFailurePathStartIndex + i], expectedBackgroundColor); } @@ -226,7 +226,7 @@ PipingStructure = null, StabilityPointStructures = null, DuneErosion = null, - SpecificFailurePaths = new FailureMechanismSectionAssemblyGroup?[] + SpecificFailureMechanisms = new FailureMechanismSectionAssemblyGroup?[] { null, null @@ -257,7 +257,7 @@ DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[stabilityPointStructuresIndex], expectedBackgroundColor); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[duneErosionIndex], expectedBackgroundColor); - for (var i = 0; i < result.SpecificFailurePaths.Length; i++) + for (var i = 0; i < result.SpecificFailureMechanisms.Length; i++) { DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnWithColorState(columnStateDefinitions[specificFailurePathStartIndex + i], expectedBackgroundColor); } @@ -288,7 +288,7 @@ PipingStructure = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), StabilityPointStructures = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), DuneErosion = GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), - SpecificFailurePaths = new[] + SpecificFailureMechanisms = new[] { GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), GetFailureMechanismSectionAssemblyGroup(failureMechanismsInAssembly, random), Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -rdbda180fabc98288e55d846b150f2f959279d98a --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) @@ -128,7 +128,7 @@ PipingStructure = GetAssemblyGroup(random, hasAssemblyGroupResults), StabilityPointStructures = GetAssemblyGroup(random, hasAssemblyGroupResults), DuneErosion = GetAssemblyGroup(random, hasAssemblyGroupResults), - SpecificFailurePaths = new[] + SpecificFailureMechanisms = new[] { GetAssemblyGroup(random, hasAssemblyGroupResults), GetAssemblyGroup(random, hasAssemblyGroupResults) @@ -228,9 +228,9 @@ failureMechanismCombinedSectionResults.ElementAt(13)); AssertSubSection(expectedSection.DuneErosion, "DA", ExportableFailureMechanismType.Generic, failureMechanismCombinedSectionResults.ElementAt(14)); - AssertSubSection(expectedSection.SpecificFailurePaths[0], "Nieuw1", ExportableFailureMechanismType.Specific, + AssertSubSection(expectedSection.SpecificFailureMechanisms[0], "Nieuw1", ExportableFailureMechanismType.Specific, failureMechanismCombinedSectionResults.ElementAt(15)); - AssertSubSection(expectedSection.SpecificFailurePaths[1], "Nieuw2", ExportableFailureMechanismType.Specific, + AssertSubSection(expectedSection.SpecificFailureMechanisms[1], "Nieuw2", ExportableFailureMechanismType.Specific, failureMechanismCombinedSectionResults.ElementAt(16)); }