Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -35,7 +35,6 @@ using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.HeightStructures.Data; using Riskeer.Integration.Data.Properties; -using Riskeer.Integration.Data.StandAlone.AssemblyFactories; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Piping.Data; using Riskeer.StabilityPointStructures.Data; @@ -225,15 +224,7 @@ StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.StabilityStoneCover, useManual), WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.WaveImpactAsphaltCover, useManual), GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.GrassCoverErosionOutwards, useManual), - DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.DuneErosion, useManual), - MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.MacroStabilityOutwards, assessmentSection, useManual), - MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.Microstability, useManual), - WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.WaterPressureAsphaltCover, useManual), - 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) + DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(assessmentSection.DuneErosion, useManual) }; } } Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -29,9 +29,6 @@ using Riskeer.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.HeightStructures.Data; -using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.AssemblyFactories; -using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Piping.Data; using Riskeer.StabilityPointStructures.Data; @@ -90,20 +87,6 @@ assessmentSection, MacroStabilityInwardsAssemblyFunc, useManual)); } - MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards; - if (failureMechanisms.Contains(macroStabilityOutwardsFailureMechanism)) - { - inputs.Add(CreateCombinedSections(macroStabilityOutwardsFailureMechanism.SectionResults, - assessmentSection, MacroStabilityOutwardsAssemblyFunc, useManual)); - } - - MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability; - if (failureMechanisms.Contains(microstabilityFailureMechanism)) - { - inputs.Add(CreateCombinedSections(microstabilityFailureMechanism.SectionResults, - MicrostabilityAssemblyFunc, useManual)); - } - StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; if (failureMechanisms.Contains(stabilityStoneCoverFailureMechanism)) { @@ -118,34 +101,13 @@ WaveImpactAsphaltCoverAssemblyFunc, useManual)); } - WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCoverFailureMechanism = assessmentSection.WaterPressureAsphaltCover; - if (failureMechanisms.Contains(waterPressureAsphaltCoverFailureMechanism)) - { - inputs.Add(CreateCombinedSections(waterPressureAsphaltCoverFailureMechanism.SectionResults, - WaterPressureAsphaltCoverAssemblyFunc, useManual)); - } - GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; if (failureMechanisms.Contains(grassCoverErosionOutwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(grassCoverErosionOutwardsFailureMechanism.SectionResults, GrassCoverErosionOutwardsAssemblyFunc, useManual)); } - GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwardsFailureMechanism = assessmentSection.GrassCoverSlipOffOutwards; - if (failureMechanisms.Contains(grassCoverSlipOffOutwardsFailureMechanism)) - { - inputs.Add(CreateCombinedSections(grassCoverSlipOffOutwardsFailureMechanism.SectionResults, - GrassCoverSlipOffOutwardsAssemblyFunc, useManual)); - } - - GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwardsFailureMechanism = assessmentSection.GrassCoverSlipOffInwards; - if (failureMechanisms.Contains(grassCoverSlipOffInwardsFailureMechanism)) - { - inputs.Add(CreateCombinedSections(grassCoverSlipOffInwardsFailureMechanism.SectionResults, - GrassCoverSlipOffInwardsAssemblyFunc, useManual)); - } - HeightStructuresFailureMechanism heightStructuresFailureMechanism = assessmentSection.HeightStructures; if (failureMechanisms.Contains(heightStructuresFailureMechanism)) { @@ -160,41 +122,20 @@ assessmentSection, ClosingStructuresAssemblyFunc, useManual)); } - PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure; - if (failureMechanisms.Contains(pipingStructureFailureMechanism)) - { - inputs.Add(CreateCombinedSections(pipingStructureFailureMechanism.SectionResults, - PipingStructureAssemblyFunc, useManual)); - } - StabilityPointStructuresFailureMechanism stabilityPointStructuresFailureMechanism = assessmentSection.StabilityPointStructures; if (failureMechanisms.Contains(stabilityPointStructuresFailureMechanism)) { inputs.Add(CreateCombinedSections(stabilityPointStructuresFailureMechanism.SectionResults, assessmentSection, StabilityPointStructuresAssemblyFunc, useManual)); } - StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; - if (failureMechanisms.Contains(strengthStabilityLengthwiseConstructionFailureMechanism)) - { - inputs.Add(CreateCombinedSections(strengthStabilityLengthwiseConstructionFailureMechanism.SectionResults, - StrengthStabilityLengthwiseConstructionAssemblyFunc, useManual)); - } - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; if (failureMechanisms.Contains(duneErosionFailureMechanism)) { inputs.Add(CreateCombinedSections(duneErosionFailureMechanism.SectionResults, DuneErosionAssemblyFunc, useManual)); } - TechnicalInnovationFailureMechanism technicalInnovationFailureMechanism = assessmentSection.TechnicalInnovation; - if (failureMechanisms.Contains(technicalInnovationFailureMechanism)) - { - inputs.Add(CreateCombinedSections(technicalInnovationFailureMechanism.SectionResults, - TechnicalInnovationAssemblyFunc, useManual)); - } - return inputs; } @@ -275,23 +216,6 @@ } } - private static Func MacroStabilityOutwardsAssemblyFunc - { - get - { - return (sectionResult, assessmentSection, useManual) => MacroStabilityOutwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( - sectionResult, assessmentSection.MacroStabilityOutwards, assessmentSection, useManual); - } - } - - private static Func MicrostabilityAssemblyFunc - { - get - { - return MicrostabilityFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - private static Func StabilityStoneCoverAssemblyFunc { get @@ -308,14 +232,6 @@ } } - private static Func WaterPressureAsphaltCoverAssemblyFunc - { - get - { - return WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - private static Func GrassCoverErosionOutwardsAssemblyFunc { get @@ -324,22 +240,6 @@ } } - private static Func GrassCoverSlipOffOutwardsAssemblyFunc - { - get - { - return GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - - private static Func GrassCoverSlipOffInwardsAssemblyFunc - { - get - { - return GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - private static Func HeightStructuresAssemblyFunc { get @@ -357,15 +257,7 @@ sectionResult, assessmentSection.ClosingStructures, assessmentSection, useManual); } } - - private static Func PipingStructureAssemblyFunc - { - get - { - return PipingStructureFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - + private static Func StabilityPointStructuresAssemblyFunc { get @@ -375,14 +267,6 @@ } } - private static Func StrengthStabilityLengthwiseConstructionAssemblyFunc - { - get - { - return StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - private static Func DuneErosionAssemblyFunc { get @@ -391,14 +275,6 @@ } } - private static Func TechnicalInnovationAssemblyFunc - { - get - { - return TechnicalInnovationFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup; - } - } - #endregion } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -53,21 +53,13 @@ MergePiping = properties.MergePiping; MergeGrassCoverErosionInwards = properties.MergeGrassCoverErosionInwards; MergeMacroStabilityInwards = properties.MergeMacroStabilityInwards; - MergeMacroStabilityOutwards = properties.MergeMacroStabilityOutwards; - MergeMicrostability = properties.MergeMicrostability; MergeStabilityStoneCover = properties.MergeStabilityStoneCover; MergeWaveImpactAsphaltCover = properties.MergeWaveImpactAsphaltCover; - MergeWaterPressureAsphaltCover = properties.MergeWaterPressureAsphaltCover; MergeGrassCoverErosionOutwards = properties.MergeGrassCoverErosionOutwards; - MergeGrassCoverSlipOffOutwards = properties.MergeGrassCoverSlipOffOutwards; - MergeGrassCoverSlipOffInwards = properties.MergeGrassCoverSlipOffInwards; MergeHeightStructures = properties.MergeHeightStructures; MergeClosingStructures = properties.MergeClosingStructures; - MergePipingStructure = properties.MergePipingStructure; MergeStabilityPointStructures = properties.MergeStabilityPointStructures; - MergeStrengthStabilityLengthwiseConstruction = properties.MergeStrengthStabilityLengthwiseConstruction; MergeDuneErosion = properties.MergeDuneErosion; - MergeTechnicalInnovation = properties.MergeTechnicalInnovation; } /// @@ -91,16 +83,6 @@ public bool MergeMacroStabilityInwards { get; } /// - /// Gets the indicator whether macro stability outwards should be merged. - /// - public bool MergeMacroStabilityOutwards { get; } - - /// - /// Gets the indicator whether microstability should be merged. - /// - public bool MergeMicrostability { get; } - - /// /// Gets the indicator whether stability stone cover should be merged. /// public bool MergeStabilityStoneCover { get; } @@ -111,26 +93,11 @@ public bool MergeWaveImpactAsphaltCover { get; } /// - /// Gets the indicator whether water pressure asphalt cover should be merged. - /// - public bool MergeWaterPressureAsphaltCover { get; } - - /// /// Gets the indicator whether grass cover erosion outwards should be merged. /// public bool MergeGrassCoverErosionOutwards { get; } /// - /// Gets the indicator whether grass cover slip off outwards should be merged. - /// - public bool MergeGrassCoverSlipOffOutwards { get; } - - /// - /// Gets the indicator whether grass cover slip off inwards should be merged. - /// - public bool MergeGrassCoverSlipOffInwards { get; } - - /// /// Gets the indicator whether height structures should be merged. /// public bool MergeHeightStructures { get; } @@ -141,31 +108,16 @@ public bool MergeClosingStructures { get; } /// - /// Gets the indicator whether piping structure should be merged. - /// - public bool MergePipingStructure { get; } - - /// /// Gets the indicator whether stability point structures should be merged. /// public bool MergeStabilityPointStructures { get; } /// - /// Gets the indicator whether strength stability lengthwise construction should be merged. - /// - public bool MergeStrengthStabilityLengthwiseConstruction { get; } - - /// /// Gets the indicator whether dune erosion should be merged. /// public bool MergeDuneErosion { get; } /// - /// Gets the indicator whether technical innovation should be merged. - /// - public bool MergeTechnicalInnovation { get; } - - /// /// Container for properties for constructing an . /// public class ConstructionProperties @@ -186,16 +138,6 @@ public bool MergeMacroStabilityInwards { internal get; set; } /// - /// Gets or sets the indicator whether macro stability outwards should be merged. - /// - public bool MergeMacroStabilityOutwards { internal get; set; } - - /// - /// Gets or sets the indicator whether microstability should be merged. - /// - public bool MergeMicrostability { internal get; set; } - - /// /// Gets or sets the indicator whether stability stone cover should be merged. /// public bool MergeStabilityStoneCover { internal get; set; } @@ -206,26 +148,11 @@ public bool MergeWaveImpactAsphaltCover { internal get; set; } /// - /// Gets or sets the indicator whether water pressure asphalt cover should be merged. - /// - public bool MergeWaterPressureAsphaltCover { internal get; set; } - - /// /// Gets or sets the indicator whether grass cover erosion outwards should be merged. /// public bool MergeGrassCoverErosionOutwards { internal get; set; } /// - /// Gets or sets the indicator whether grass cover slip off outwards should be merged. - /// - public bool MergeGrassCoverSlipOffOutwards { internal get; set; } - - /// - /// Gets or sets the indicator whether grass cover slip off inwards should be merged. - /// - public bool MergeGrassCoverSlipOffInwards { internal get; set; } - - /// /// Gets or sets the indicator whether height structures should be merged. /// public bool MergeHeightStructures { internal get; set; } @@ -236,29 +163,14 @@ public bool MergeClosingStructures { internal get; set; } /// - /// Gets or sets the indicator whether piping structure should be merged. - /// - public bool MergePipingStructure { internal get; set; } - - /// /// Gets or sets the indicator whether stability point structures should be merged. /// public bool MergeStabilityPointStructures { internal get; set; } /// - /// Gets or sets the indicator whether strength stability lengthwise construction should be merged. - /// - public bool MergeStrengthStabilityLengthwiseConstruction { internal get; set; } - - /// /// Gets or sets the indicator whether dune erosion should be merged. /// public bool MergeDuneErosion { internal get; set; } - - /// - /// Gets or sets the indicator whether technical innovation should be merged. - /// - public bool MergeTechnicalInnovation { internal get; set; } } } } \ No newline at end of file Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 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 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/Input/MacroStabilityOutwardsProbabilityAssessmentInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/TechnicalInnovationFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/SectionResults/WaterPressureAsphaltCoverFailureMechanismSectionResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/TechnicalInnovationFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/MacroStabilityOutwardsAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/MicrostabilityAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/PipingStructureAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 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? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/TechnicalInnovationAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/WaterPressureAsphaltCoverAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -32,7 +32,6 @@ using Riskeer.HeightStructures.Data; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; -using Riskeer.Integration.Data.StandAlone; using Riskeer.Integration.Forms.Properties; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Piping.Data; @@ -87,21 +86,13 @@ MergePiping = FailureMechanismIsSelectedToMerge(), MergeGrassCoverErosionInwards = FailureMechanismIsSelectedToMerge(), MergeMacroStabilityInwards = FailureMechanismIsSelectedToMerge(), - MergeMacroStabilityOutwards = FailureMechanismIsSelectedToMerge(), - MergeMicrostability = FailureMechanismIsSelectedToMerge(), MergeStabilityStoneCover = FailureMechanismIsSelectedToMerge(), MergeWaveImpactAsphaltCover = FailureMechanismIsSelectedToMerge(), - MergeWaterPressureAsphaltCover = FailureMechanismIsSelectedToMerge(), MergeGrassCoverErosionOutwards = FailureMechanismIsSelectedToMerge(), - MergeGrassCoverSlipOffOutwards = FailureMechanismIsSelectedToMerge(), - MergeGrassCoverSlipOffInwards = FailureMechanismIsSelectedToMerge(), MergeHeightStructures = FailureMechanismIsSelectedToMerge(), MergeClosingStructures = FailureMechanismIsSelectedToMerge(), - MergePipingStructure = FailureMechanismIsSelectedToMerge(), MergeStabilityPointStructures = FailureMechanismIsSelectedToMerge(), - MergeStrengthStabilityLengthwiseConstruction = FailureMechanismIsSelectedToMerge(), - MergeDuneErosion = FailureMechanismIsSelectedToMerge(), - MergeTechnicalInnovation = FailureMechanismIsSelectedToMerge() + MergeDuneErosion = FailureMechanismIsSelectedToMerge() }; return new AssessmentSectionMergeData((AssessmentSection) assessmentSectionComboBox.SelectedItem, Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -31,8 +31,6 @@ using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.HeightStructures.Data; using Riskeer.Integration.Data; -using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Piping.Data; using Riskeer.Piping.Data.SemiProbabilistic; @@ -60,14 +58,6 @@ private readonly Observer stabilityPointStructuresObserver; private readonly Observer stabilityStoneCoverObserver; private readonly Observer waveImpactAsphaltCoverObserver; - private readonly Observer grassCoverSlipOffInwardsObserver; - private readonly Observer grassCoverSlipOffOutwardsObserver; - private readonly Observer macroStabilityOutwardsObserver; - private readonly Observer microstabilityObserver; - private readonly Observer pipingStructureObserver; - private readonly Observer strengthStabilityLengthwiseConstructionObserver; - private readonly Observer technicalInnovationObserver; - private readonly Observer waterPressureAsphaltCoverObserver; /// /// Creates a new instance of . @@ -124,30 +114,6 @@ waveImpactAsphaltCoverObserver = CreateFailureMechanismObserver(assessmentSection.WaveImpactAsphaltCover); - - grassCoverSlipOffInwardsObserver = CreateFailureMechanismObserver(assessmentSection.GrassCoverSlipOffInwards); - - grassCoverSlipOffOutwardsObserver = CreateFailureMechanismObserver(assessmentSection.GrassCoverSlipOffOutwards); - - macroStabilityOutwardsObserver = CreateFailureMechanismObserver(assessmentSection.MacroStabilityOutwards); - - microstabilityObserver = CreateFailureMechanismObserver(assessmentSection.Microstability); - - pipingStructureObserver = CreateFailureMechanismObserver(assessmentSection.PipingStructure); - - strengthStabilityLengthwiseConstructionObserver = CreateFailureMechanismObserver(assessmentSection.StrengthStabilityLengthwiseConstruction); - - technicalInnovationObserver = CreateFailureMechanismObserver(assessmentSection.TechnicalInnovation); - - waterPressureAsphaltCoverObserver = CreateFailureMechanismObserver(assessmentSection.WaterPressureAsphaltCover); } public void Dispose() @@ -175,14 +141,6 @@ stabilityPointStructuresObserver.Dispose(); stabilityStoneCoverObserver.Dispose(); waveImpactAsphaltCoverObserver.Dispose(); - grassCoverSlipOffInwardsObserver.Dispose(); - grassCoverSlipOffOutwardsObserver.Dispose(); - macroStabilityOutwardsObserver.Dispose(); - microstabilityObserver.Dispose(); - pipingStructureObserver.Dispose(); - strengthStabilityLengthwiseConstructionObserver.Dispose(); - technicalInnovationObserver.Dispose(); - waterPressureAsphaltCoverObserver.Dispose(); } private void ResubscribeFailureMechanismObservers(AssessmentSection assessmentSection) @@ -197,14 +155,6 @@ stabilityPointStructuresObserver.Observable = assessmentSection.StabilityPointStructures; stabilityStoneCoverObserver.Observable = assessmentSection.StabilityStoneCover; waveImpactAsphaltCoverObserver.Observable = assessmentSection.WaveImpactAsphaltCover; - grassCoverSlipOffInwardsObserver.Observable = assessmentSection.GrassCoverSlipOffInwards; - grassCoverSlipOffOutwardsObserver.Observable = assessmentSection.GrassCoverSlipOffOutwards; - macroStabilityOutwardsObserver.Observable = assessmentSection.MacroStabilityOutwards; - microstabilityObserver.Observable = assessmentSection.Microstability; - pipingStructureObserver.Observable = assessmentSection.PipingStructure; - strengthStabilityLengthwiseConstructionObserver.Observable = assessmentSection.StrengthStabilityLengthwiseConstruction; - technicalInnovationObserver.Observable = assessmentSection.TechnicalInnovation; - waterPressureAsphaltCoverObserver.Observable = assessmentSection.WaterPressureAsphaltCover; } private Observer CreateCalculatableFailureMechanismObserver(TFailureMechanism failureMechanism) Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/MacroStabilityOutwardsAssemblyCategoriesContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/GrassCoverSlipOffInwardsFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/GrassCoverSlipOffInwardsFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/MacroStabilityOutwardsFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/MacroStabilityOutwardsFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/MicrostabilityFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/MicrostabilityFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/PipingStructureFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/PipingStructureFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/TechnicalInnovationFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/TechnicalInnovationFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/WaterPressureAsphaltCoverFailureMechanismContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/StandAlone/WaterPressureAsphaltCoverFailureMechanismSectionsContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailureMechanismProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailureMechanismProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -34,8 +34,6 @@ using Riskeer.HeightStructures.Data; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Assembly; -using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.AssemblyFactories; using Riskeer.Integration.Forms.Observers; using Riskeer.Integration.Forms.Properties; using Riskeer.MacroStabilityInwards.Data; @@ -164,21 +162,13 @@ CreatePipingFailureMechanismAssemblyResultRow(), CreateGrassCoverErosionInwardsFailureMechanismAssemblyResultRow(), CreateMacroStabilityInwardsFailureMechanismAssemblyResultRow(), - CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow(), - CreateMicrostabilityFailureMechanismAssemblyResultRow(), CreateStabilityStoneCoverFailureMechanismAssemblyResultRow(), CreateWaveImpactFailureMechanismAssemblyResultRow(), - CreateWaterPressureAsphaltCoverFailureMechanismAssemblyResultRow(), CreateGrassCoverErosionOutwardsFailureMechanismAssemblyResultRow(), - CreateGrassCoverSlipOffOutwardsFailureMechanismAssemblyResultRow(), - CreateGrassCoverSlipOffInwardsFailureMechanismAssemblyResultRow(), CreateHeightStructuresFailureMechanismAssemblyResultRow(), CreateClosingStructuresFailureMechanismAssemblyResultRow(), - CreatePipingStructureFailureMechanismAssemblyResultRow(), CreateStabilityPointsStructuresFailureMechanismAssemblyResultRow(), - CreateStrengthStabilityLengthWiseConstructionFailureMechanismAssemblyResultRow(), - CreateDuneErosionFailureMechanismAssemblyResultRow(), - CreateTechnicalInnovationFailureMechanismAssemblyResultRow() + CreateDuneErosionFailureMechanismAssemblyResultRow() }; dataGridViewControl.SetDataSource(assemblyResultRows); @@ -382,68 +372,6 @@ #endregion - #region Group 4 - - private FailureMechanismAssemblyResultRowBase CreateMacroStabilityOutwardsFailureMechanismAssemblyResultRow() - { - MacroStabilityOutwardsFailureMechanism macroStabilityOutwards = AssessmentSection.MacroStabilityOutwards; - return new FailureMechanismAssemblyCategoryGroupResultRow(macroStabilityOutwards, - () => MacroStabilityOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(macroStabilityOutwards, - AssessmentSection, - true)); - } - - private FailureMechanismAssemblyCategoryGroupResultRow CreateMicrostabilityFailureMechanismAssemblyResultRow() - { - MicrostabilityFailureMechanism microstability = AssessmentSection.Microstability; - return new FailureMechanismAssemblyCategoryGroupResultRow(microstability, - () => MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(microstability, true)); - } - - private FailureMechanismAssemblyCategoryGroupResultRow CreateWaterPressureAsphaltCoverFailureMechanismAssemblyResultRow() - { - WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCover = AssessmentSection.WaterPressureAsphaltCover; - return new FailureMechanismAssemblyCategoryGroupResultRow(waterPressureAsphaltCover, - () => WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(waterPressureAsphaltCover, true)); - } - - private FailureMechanismAssemblyCategoryGroupResultRow CreateGrassCoverSlipOffOutwardsFailureMechanismAssemblyResultRow() - { - GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwards = AssessmentSection.GrassCoverSlipOffOutwards; - return new FailureMechanismAssemblyCategoryGroupResultRow(grassCoverSlipOffOutwards, - () => GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(grassCoverSlipOffOutwards, true)); - } - - private FailureMechanismAssemblyCategoryGroupResultRow CreateGrassCoverSlipOffInwardsFailureMechanismAssemblyResultRow() - { - GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwards = AssessmentSection.GrassCoverSlipOffInwards; - return new FailureMechanismAssemblyCategoryGroupResultRow(grassCoverSlipOffInwards, - () => GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(grassCoverSlipOffInwards, true)); - } - - private FailureMechanismAssemblyCategoryGroupResultRow CreatePipingStructureFailureMechanismAssemblyResultRow() - { - PipingStructureFailureMechanism pipingStructure = AssessmentSection.PipingStructure; - return new FailureMechanismAssemblyCategoryGroupResultRow(pipingStructure, - () => 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; - return new FailureMechanismAssemblyCategoryGroupResultRow(technicalInnovation, - () => TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(technicalInnovation, true)); - } - #endregion - - #endregion } } \ No newline at end of file Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffInwardsSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/GrassCoverSlipOffOutwardsSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/MicrostabilitySectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/PipingStructureSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/TechnicalInnovationSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultRows/WaterPressureAsphaltCoverSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -143,15 +143,7 @@ ExportableStabilityStoneCoverFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.StabilityStoneCover, assessmentSection), ExportableWaveImpactAsphaltCoverFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.WaveImpactAsphaltCover, assessmentSection), ExportableGrassCoverErosionOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.GrassCoverErosionOutwards, assessmentSection), - ExportableDuneErosionFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.DuneErosion, assessmentSection), - ExportableMacroStabilityOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.MacroStabilityOutwards, assessmentSection), - ExportableMicrostabilityFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.Microstability, assessmentSection), - ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards, assessmentSection), - ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.GrassCoverSlipOffInwards, assessmentSection), - ExportablePipingStructureFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.PipingStructure, assessmentSection), - ExportableWaterPressureAsphaltCoverFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.WaterPressureAsphaltCover, assessmentSection), - ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction, assessmentSection), - ExportableTechnicalInnovationFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.TechnicalInnovation, assessmentSection) + ExportableDuneErosionFailureMechanismFactory.CreateExportableFailureMechanism(assessmentSection.DuneErosion, assessmentSection) }; } Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableMicrostabilityFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportablePipingStructureFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableTechnicalInnovationFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -29,19 +29,11 @@ using Riskeer.Storage.Core.Create.DuneErosion; using Riskeer.Storage.Core.Create.GrassCoverErosionInwards; using Riskeer.Storage.Core.Create.GrassCoverErosionOutwards; -using Riskeer.Storage.Core.Create.GrassCoverSlipOffInwards; -using Riskeer.Storage.Core.Create.GrassCoverSlipOffOutwards; using Riskeer.Storage.Core.Create.HeightStructures; using Riskeer.Storage.Core.Create.MacroStabilityInwards; -using Riskeer.Storage.Core.Create.MacroStabilityOutwards; -using Riskeer.Storage.Core.Create.Microstability; using Riskeer.Storage.Core.Create.Piping; -using Riskeer.Storage.Core.Create.PipingStructure; using Riskeer.Storage.Core.Create.StabilityPointStructures; using Riskeer.Storage.Core.Create.StabilityStoneCover; -using Riskeer.Storage.Core.Create.StrengthStabilityLengthwise; -using Riskeer.Storage.Core.Create.TechnicalInnovation; -using Riskeer.Storage.Core.Create.WaterPressureAsphaltCover; using Riskeer.Storage.Core.Create.WaveImpactAsphaltCover; using Riskeer.Storage.Core.DbContext; using Riskeer.Storage.Core.Serializers; @@ -90,18 +82,11 @@ entity.FailureMechanismEntities.Add(section.Piping.Create(registry)); entity.FailureMechanismEntities.Add(section.GrassCoverErosionInwards.Create(registry)); entity.FailureMechanismEntities.Add(section.HeightStructures.Create(registry)); - entity.FailureMechanismEntities.Add(section.StrengthStabilityLengthwiseConstruction.Create(registry)); - entity.FailureMechanismEntities.Add(section.TechnicalInnovation.Create(registry)); entity.FailureMechanismEntities.Add(section.WaterPressureAsphaltCover.Create(registry)); entity.FailureMechanismEntities.Add(section.ClosingStructures.Create(registry)); entity.FailureMechanismEntities.Add(section.MacroStabilityInwards.Create(registry)); - entity.FailureMechanismEntities.Add(section.MacroStabilityOutwards.Create(registry)); entity.FailureMechanismEntities.Add(section.WaveImpactAsphaltCover.Create(registry)); entity.FailureMechanismEntities.Add(section.GrassCoverErosionOutwards.Create(registry)); - entity.FailureMechanismEntities.Add(section.GrassCoverSlipOffInwards.Create(registry)); - entity.FailureMechanismEntities.Add(section.GrassCoverSlipOffOutwards.Create(registry)); - entity.FailureMechanismEntities.Add(section.Microstability.Create(registry)); - entity.FailureMechanismEntities.Add(section.PipingStructure.Create(registry)); entity.FailureMechanismEntities.Add(section.StabilityStoneCover.Create(registry)); entity.FailureMechanismEntities.Add(section.DuneErosion.Create(registry)); entity.FailureMechanismEntities.Add(section.StabilityPointStructures.Create(registry)); Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -75,18 +75,10 @@ entity.ReadPipingFailureMechanism(assessmentSection, collector); entity.ReadGrassCoverErosionInwardsFailureMechanism(assessmentSection, collector); entity.ReadHeightStructuresFailureMechanism(assessmentSection, collector); - entity.ReadStrengthStabilityLengthwiseConstructionFailureMechanism(assessmentSection, collector); - entity.ReadTechnicalInnovationFailureMechanism(assessmentSection, collector); - entity.ReadWaterPressureAsphaltCoverFailureMechanism(assessmentSection, collector); entity.ReadClosingStructuresFailureMechanism(assessmentSection, collector); entity.ReadMacroStabilityInwardsFailureMechanism(assessmentSection, collector); - entity.ReadMacroStabilityOutwardsFailureMechanism(assessmentSection, collector); entity.ReadWaveImpactAsphaltCoverFailureMechanism(assessmentSection, collector); entity.ReadGrassCoverErosionOutwardsFailureMechanism(assessmentSection, collector); - entity.ReadGrassCoverSlipOffInwardsFailureMechanism(assessmentSection, collector); - entity.ReadGrassCoverSlipOffOutwardsFailureMechanism(assessmentSection, collector); - entity.ReadMicrostabilityFailureMechanism(assessmentSection, collector); - entity.ReadPipingStructureFailureMechanism(assessmentSection, collector); entity.ReadDuneErosionFailureMechanism(assessmentSection, collector); entity.ReadStabilityStoneCoverFailureMechanism(assessmentSection, collector); entity.ReadStabilityPointStructuresFailureMechanism(assessmentSection, collector); @@ -167,24 +159,6 @@ heightStructuresFailureMechanismEntity?.ReadAsHeightStructuresFailureMechanism(assessmentSection.HeightStructures, collector); } - private static void ReadStrengthStabilityLengthwiseConstructionFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity strengthStabilityLengthwiseConstructionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StrengthAndStabilityParallelConstruction); - strengthStabilityLengthwiseConstructionFailureMechanismEntity?.ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction, collector); - } - - private static void ReadTechnicalInnovationFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity technicalInnovationFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.TechnicalInnovations); - technicalInnovationFailureMechanismEntity?.ReadAsTechnicalInnovationFailureMechanism(assessmentSection.TechnicalInnovation, collector); - } - - private static void ReadWaterPressureAsphaltCoverFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity waterPressureAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaterOverpressureAsphaltRevetment); - waterPressureAsphaltCoverFailureMechanismEntity?.ReadAsWaterPressureAsphaltCoverFailureMechanism(assessmentSection.WaterPressureAsphaltCover, collector); - } - private static void ReadClosingStructuresFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { FailureMechanismEntity closingStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.ReliabilityClosingOfStructure); @@ -197,12 +171,6 @@ macroStabilityInwardsFailureMechanismEntity?.ReadAsMacroStabilityInwardsFailureMechanism(assessmentSection.MacroStabilityInwards, collector); } - private static void ReadMacroStabilityOutwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity macroStabilityOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.MacroStabilityOutwards); - macroStabilityOutwardsFailureMechanismEntity?.ReadAsMacroStabilityOutwardsFailureMechanism(assessmentSection.MacroStabilityOutwards, collector); - } - private static void ReadWaveImpactAsphaltCoverFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { FailureMechanismEntity waveImpactAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaveImpactOnAsphaltRevetment); @@ -215,30 +183,6 @@ grassCoverErosionOutwardsFailureMechanismEntity?.ReadAsGrassCoverErosionOutwardsFailureMechanism(assessmentSection.GrassCoverErosionOutwards, collector); } - private static void ReadGrassCoverSlipOffInwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity grassCoverSlipOffInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentSlidingInwards); - grassCoverSlipOffInwardsFailureMechanismEntity?.ReadAsGrassCoverSlipOffInwardsFailureMechanism(assessmentSection.GrassCoverSlipOffInwards, collector); - } - - private static void ReadGrassCoverSlipOffOutwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity grassCoverSlipOffOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentSlidingOutwards); - grassCoverSlipOffOutwardsFailureMechanismEntity?.ReadAsGrassCoverSlipOffOutwardsFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards, collector); - } - - private static void ReadMicrostabilityFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity microstabilityFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.Microstability); - microstabilityFailureMechanismEntity?.ReadAsMicrostabilityFailureMechanism(assessmentSection.Microstability, collector); - } - - private static void ReadPipingStructureFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) - { - FailureMechanismEntity pipingStructureFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.PipingAtStructure); - pipingStructureFailureMechanismEntity?.ReadAsPipingStructureFailureMechanism(assessmentSection.PipingStructure, collector); - } - private static void ReadDuneErosionFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { FailureMechanismEntity duneErosionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.DuneErosion); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -r149a6ea30952146f3ef7e513cedc5372f9e88495 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 149a6ea30952146f3ef7e513cedc5372f9e88495) @@ -21,7 +21,6 @@ using System; using System.Linq; -using Core.Common.Base.Data; using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data; using Riskeer.Common.Data.Calculation; @@ -31,8 +30,6 @@ using Riskeer.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.HeightStructures.Data; -using Riskeer.Integration.Data.StandAlone; -using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Piping.Data; using Riskeer.StabilityPointStructures.Data; @@ -44,9 +41,7 @@ using Riskeer.Storage.Core.Read.GrassCoverErosionOutwards; using Riskeer.Storage.Core.Read.HeightStructures; using Riskeer.Storage.Core.Read.MacroStabilityInwards; -using Riskeer.Storage.Core.Read.MacroStabilityOutwards; using Riskeer.Storage.Core.Read.Piping; -using Riskeer.Storage.Core.Read.PipingStructure; using Riskeer.Storage.Core.Read.StabilityPointStructures; using Riskeer.Storage.Core.Read.StabilityStoneCover; using Riskeer.Storage.Core.Read.WaveImpactAsphaltCover; @@ -329,99 +324,6 @@ #endregion - #region Strength Stability Lengthwise Construction - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(this FailureMechanismEntity entity, - StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadStrengthStabilityLengthwiseConstructionMechanismSectionResults(failureMechanism, collector); - } - - private static void ReadStrengthStabilityLengthwiseConstructionMechanismSectionResults(this FailureMechanismEntity entity, - StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (StrengthStabilityLengthwiseConstructionSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StrengthStabilityLengthwiseConstructionSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - - #region Technical Innovation - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsTechnicalInnovationFailureMechanism(this FailureMechanismEntity entity, - TechnicalInnovationFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadTechnicalInnovationMechanismSectionResults(failureMechanism, collector); - } - - private static void ReadTechnicalInnovationMechanismSectionResults(this FailureMechanismEntity entity, - TechnicalInnovationFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (TechnicalInnovationSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.TechnicalInnovationSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - TechnicalInnovationFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - - #region Water Pressure Asphalt - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsWaterPressureAsphaltCoverFailureMechanism(this FailureMechanismEntity entity, - WaterPressureAsphaltCoverFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadWaterPressureAsphaltCoverMechanismSectionResults(failureMechanism, collector); - } - - private static void ReadWaterPressureAsphaltCoverMechanismSectionResults(this FailureMechanismEntity entity, - WaterPressureAsphaltCoverFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (WaterPressureAsphaltCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaterPressureAsphaltCoverSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - WaterPressureAsphaltCoverFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - #region Closing Structures /// @@ -581,55 +483,6 @@ #endregion - #region MacroStability Outwards - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - /// Thrown when any input parameter is null. - internal static void ReadAsMacroStabilityOutwardsFailureMechanism(this FailureMechanismEntity entity, - MacroStabilityOutwardsFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - if (entity == null) - { - throw new ArgumentNullException(nameof(entity)); - } - - if (failureMechanism == null) - { - throw new ArgumentNullException(nameof(failureMechanism)); - } - - if (collector == null) - { - throw new ArgumentNullException(nameof(collector)); - } - - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadMacroStabilityOutwardsMechanismSectionResults(failureMechanism, collector); - MacroStabilityOutwardsFailureMechanismMetaEntity metaEntity = entity.MacroStabilityOutwardsFailureMechanismMetaEntities.Single(); - metaEntity.ReadProbabilityAssessmentInput(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput); - } - - private static void ReadMacroStabilityOutwardsMechanismSectionResults(this FailureMechanismEntity entity, - MacroStabilityOutwardsFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (MacroStabilityOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacroStabilityOutwardsSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - MacroStabilityOutwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - #region Wave Impact Asphalt Cover /// @@ -771,148 +624,6 @@ #endregion - #region Grass Cover Slip Off Inwards - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsGrassCoverSlipOffInwardsFailureMechanism(this FailureMechanismEntity entity, - GrassCoverSlipOffInwardsFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadGrassCoverSlipOffInwardsMechanismSectionResults(failureMechanism, collector); - } - - private static void ReadGrassCoverSlipOffInwardsMechanismSectionResults(this FailureMechanismEntity entity, - GrassCoverSlipOffInwardsFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (GrassCoverSlipOffInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffInwardsSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - GrassCoverSlipOffInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - - #region Grass Cover Slip Off Outwards - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsGrassCoverSlipOffOutwardsFailureMechanism(this FailureMechanismEntity entity, - GrassCoverSlipOffOutwardsFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadGrassCoverSlipOffOutwardsMechanismSectionResults(failureMechanism, collector); - } - - private static void ReadGrassCoverSlipOffOutwardsMechanismSectionResults(this FailureMechanismEntity entity, - GrassCoverSlipOffOutwardsFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (GrassCoverSlipOffOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffOutwardsSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - GrassCoverSlipOffOutwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - - #region Microstability - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - internal static void ReadAsMicrostabilityFailureMechanism(this FailureMechanismEntity entity, - MicrostabilityFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadMicrostabilityMechanismSectionResults(failureMechanism, collector); - } - - private static void ReadMicrostabilityMechanismSectionResults(this FailureMechanismEntity entity, - MicrostabilityFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (MicrostabilitySectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MicrostabilitySectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - MicrostabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - - #region Piping Structure - - /// - /// Read the and use the information to update a . - /// - /// The to create for. - /// The target of the read operation. - /// The object keeping track of read operations. - /// Thrown when any input parameter is null. - internal static void ReadAsPipingStructureFailureMechanism(this FailureMechanismEntity entity, - PipingStructureFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - if (entity == null) - { - throw new ArgumentNullException(nameof(entity)); - } - - if (failureMechanism == null) - { - throw new ArgumentNullException(nameof(failureMechanism)); - } - - if (collector == null) - { - throw new ArgumentNullException(nameof(collector)); - } - - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - entity.ReadPipingStructureMechanismSectionResults(failureMechanism, collector); - - failureMechanism.N = (RoundedDouble) entity.PipingStructureFailureMechanismMetaEntities.Single().N; - } - - private static void ReadPipingStructureMechanismSectionResults(this FailureMechanismEntity entity, - PipingStructureFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - foreach (PipingStructureSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingStructureSectionResultEntities)) - { - FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - PipingStructureFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); - - sectionResultEntity.Read(result); - } - } - - #endregion - #region Dune Erosion /// Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/MicrostabilitySectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 149a6ea30952146f3ef7e513cedc5372f9e88495 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff?