Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.cs =================================================================== diff -u -r3143f826f08381a246a2d7936ece12241b8b1903 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.cs) (revision 3143f826f08381a246a2d7936ece12241b8b1903) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -64,17 +64,16 @@ throw new ArgumentNullException(nameof(combinedSectionAssemblies)); } - var collection = new SerializableFailureMechanismSectionCollection(idGenerator.GetNewId(Resources.SerializableFailureMechanismSectionCollection_IdPrefix), - totalAssemblyResult); + var failureMechanismSectionCollection = new SerializableFailureMechanismSectionCollection( + idGenerator.GetNewId(Resources.SerializableFailureMechanismSectionCollection_IdPrefix), + totalAssemblyResult); AggregatedSerializableCombinedFailureMechanismSectionAssembly[] aggregatedAssemblies = - combinedSectionAssemblies.Select(assembly => AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.Create(idGenerator, - totalAssemblyResult, - collection, - assembly)) + combinedSectionAssemblies.Select(assembly => AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.Create( + idGenerator, totalAssemblyResult, failureMechanismSectionCollection, assembly)) .ToArray(); - return new AggregatedSerializableCombinedFailureMechanismSectionAssemblies(collection, + return new AggregatedSerializableCombinedFailureMechanismSectionAssemblies(failureMechanismSectionCollection, aggregatedAssemblies.Select(ag => ag.FailureMechanismSection), aggregatedAssemblies.Select(ag => ag.CombinedFailureMechanismSectionAssembly)); } Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs (.../ExportableClosingStructuresFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableClosingStructuresFailureMechanismFactory.cs (.../ExportableClosingStructuresFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -66,9 +66,8 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssembly failureMechanismAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); @@ -77,8 +76,7 @@ new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -98,13 +96,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { ClosingStructuresFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssembly simpleAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssembly detailedAssembly = ClosingStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, failureMechanism, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs =================================================================== diff -u -r3143f826f08381a246a2d7936ece12241b8b1903 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision 3143f826f08381a246a2d7936ece12241b8b1903) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -30,7 +30,7 @@ namespace Ringtoets.Integration.IO.Factories { /// - /// Factory to create a collection of + /// Factory to create instances of /// public static class ExportableCombinedSectionAssemblyFactory { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableDuneErosionFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableDuneErosionFailureMechanismFactory.cs (.../ExportableDuneErosionFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableDuneErosionFailureMechanismFactory.cs (.../ExportableDuneErosionFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -58,16 +58,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -86,13 +84,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { DuneErosionFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = DuneErosionFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = DuneErosionFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs (.../ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs (.../ExportableGrassCoverErosionInwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -66,9 +66,8 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssembly failureMechanismAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); @@ -77,8 +76,7 @@ new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -98,13 +96,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { GrassCoverErosionInwardsFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssembly simpleAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssembly detailedAssembly = GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, failureMechanism, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -58,16 +58,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -86,13 +84,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { GrassCoverErosionOutwardsFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -60,15 +60,13 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -87,13 +85,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { GrassCoverSlipOffInwardsFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -60,16 +60,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -88,13 +86,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { GrassCoverSlipOffOutwardsFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs (.../ExportableHeightStructuresFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableHeightStructuresFailureMechanismFactory.cs (.../ExportableHeightStructuresFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -66,9 +66,8 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssembly failureMechanismAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); @@ -77,8 +76,7 @@ new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -98,13 +96,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { HeightStructuresFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssembly simpleAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssembly detailedAssembly = HeightStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, failureMechanism, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs (.../ExportableMacroStabilityInwardsFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityInwardsFailureMechanismFactory.cs (.../ExportableMacroStabilityInwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -67,9 +67,8 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssembly failureMechanismAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); @@ -78,8 +77,7 @@ new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -107,9 +105,9 @@ foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { MacroStabilityInwardsFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssembly simpleAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssembly detailedAssembly = MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, macroStabilityInwardsCalculationScenarios, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -68,18 +68,15 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -99,13 +96,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { MacroStabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, failureMechanism, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs (.../ExportableMicrostabilityFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs (.../ExportableMicrostabilityFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -60,16 +60,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -88,13 +86,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { MicrostabilityFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = MicrostabilityFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = MicrostabilityFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs (.../ExportablePipingFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingFailureMechanismFactory.cs (.../ExportablePipingFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -67,9 +67,8 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssembly failureMechanismAssembly = PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); @@ -78,8 +77,7 @@ new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -106,9 +104,9 @@ foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { PipingFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssembly simpleAssembly = PipingFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssembly detailedAssembly = PipingFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, pipingCalculationScenarios, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs (.../ExportablePipingStructureFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs (.../ExportablePipingStructureFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -60,16 +60,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -88,13 +86,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { PipingStructureFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = PipingStructureFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = PipingStructureFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs (.../ExportableStabilityPointStructuresFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityPointStructuresFailureMechanismFactory.cs (.../ExportableStabilityPointStructuresFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -66,9 +66,8 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssembly failureMechanismAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, assessmentSection); @@ -77,8 +76,7 @@ new ExportableFailureMechanismAssemblyResultWithProbability(failureMechanismAssemblyMethod, failureMechanismAssembly.Group, failureMechanismAssembly.Probability), - CreateExportableFailureMechanismSectionResults(failureMechanism, - assessmentSection), + CreateExportableFailureMechanismSectionResults(failureMechanism, assessmentSection), failureMechanismCode, failureMechanismGroup); } @@ -98,13 +96,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { StabilityPointStructuresFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssembly simpleAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssembly detailedAssembly = StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult, failureMechanism, Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs (.../ExportableStabilityStoneCoverFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs (.../ExportableStabilityStoneCoverFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -58,16 +58,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -86,13 +84,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { StabilityStoneCoverFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -60,16 +60,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -88,10 +86,12 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs (.../ExportableTechnicalInnovationFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs (.../ExportableTechnicalInnovationFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -60,16 +60,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -88,13 +86,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { TechnicalInnovationFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = TechnicalInnovationFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = TechnicalInnovationFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup combinedAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -60,16 +60,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -88,10 +86,12 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { WaterPressureAsphaltCoverFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs =================================================================== diff -u -rac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563 -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs (.../ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs) (revision ac2ceb52ef4ee879aa9d0f55577f3fbabbfb9563) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs (.../ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -58,16 +58,14 @@ if (!failureMechanism.IsRelevant) { - return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability(failureMechanismCode, - failureMechanismGroup, - failureMechanismAssemblyMethod); + return ExportableFailureMechanismFactory.CreateDefaultExportableFailureMechanismWithoutProbability( + failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod); } FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); return new ExportableFailureMechanism( - new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, - failureMechanismAssembly), + new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly), CreateFailureMechanismSectionResults(failureMechanism.SectionResults), failureMechanismCode, failureMechanismGroup); @@ -86,13 +84,14 @@ { IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanismSectionResults); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { WaveImpactAsphaltCoverFailureMechanismSectionResult failureMechanismSectionResult = failureMechanismSectionPair.Key; + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult); FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs =================================================================== diff -u -r7448b440911e68c1ec42907fda23a45a1a71fcef -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 7448b440911e68c1ec42907fda23a45a1a71fcef) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56) @@ -39,9 +39,8 @@ var random = new Random(21); // Call - TestDelegate call = () => new ExportableFailureMechanism(null, - random.NextEnumValue(), - random.NextEnumValue()); + TestDelegate call = () => new ExportableFailureMechanism( + null, random.NextEnumValue(), random.NextEnumValue()); // Assert var exception = Assert.Throws(call); @@ -59,9 +58,8 @@ var group = random.NextEnumValue(); // Call - var failureMechanism = new ExportableFailureMechanism(failureMechanismAssembly, - code, - group); + var failureMechanism = new ExportableFailureMechanism( + failureMechanismAssembly, code, group); // Assert Assert.AreSame(failureMechanismAssembly, failureMechanism.FailureMechanismAssembly);