Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -27,6 +27,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -38,7 +39,7 @@ /// public class ClosingStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs (.../ClosingStructuresFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs (.../ClosingStructuresFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using NUnit.Framework; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; @@ -42,7 +43,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Betrouwbaarheid sluiting kunstwerk", failureMechanism.Name); Assert.AreEqual("BSKW", failureMechanism.Code); Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs =================================================================== diff -u -r652eb0ce8abd5c03cfa37b51b2c949c6059b3510 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision 652eb0ce8abd5c03cfa37b51b2c949c6059b3510) +++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -79,7 +79,7 @@ /// or is null. /// Thrown when the failure mechanism could not be successfully assembled. public static double AssemblyFailureMechanism( - IHasSectionResults failureMechanism, + IFailurePath failureMechanism, Func performSectionAssemblyFunc, double failureMechanismN) where TSectionResult : FailureMechanismSectionResult Fisheye: Tag 4db781b1deb4cbf6cd654b561a50637f95f2a3ab refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IHasSectionResults.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Data/FailurePath/IFailurePath.cs =================================================================== diff -u -r1f5ad2cf529f57c118521f2a82deac32ec55bbd3 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Data/FailurePath/IFailurePath.cs (.../IFailurePath.cs) (revision 1f5ad2cf529f57c118521f2a82deac32ec55bbd3) +++ Riskeer/Common/src/Riskeer.Common.Data/FailurePath/IFailurePath.cs (.../IFailurePath.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -95,4 +95,17 @@ /// void ClearAllSections(); } + + /// + /// This interface describes an containing objects. + /// + /// The type of the section results. + public interface IFailurePath : IFailurePath + where T : FailureMechanismSectionResult + { + /// + /// Gets an of . + /// + IObservableEnumerable SectionResults { get; } + } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs =================================================================== diff -u -rc3bd4596fda174b0efef1220c4f3b8872f1d5e7a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs (.../AssemblyMapDataFeaturesFactory.cs) (revision c3bd4596fda174b0efef1220c4f3b8872f1d5e7a) +++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs (.../AssemblyMapDataFeaturesFactory.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Forms.Helpers; using Riskeer.Common.Forms.Properties; @@ -45,7 +46,7 @@ /// A collection of . /// Thrown when any parameter is null. public static IEnumerable CreateAssemblyGroupFeatures( - IHasSectionResults failureMechanism, + IFailurePath failureMechanism, Func performAssemblyFunc) where TSectionResult : FailureMechanismSectionResult { Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs =================================================================== diff -u -r8a38b10934f10fa56481a95212dbc9a8132bb02a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs (.../CalculatableFailureMechanismSectionResultsMapLayer.cs) (revision 8a38b10934f10fa56481a95212dbc9a8132bb02a) +++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs (.../CalculatableFailureMechanismSectionResultsMapLayer.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; namespace Riskeer.Common.Forms.MapLayers { @@ -35,7 +36,7 @@ /// The type of section result. /// The type of calculation input. public class CalculatableFailureMechanismSectionResultsMapLayer : NonCalculatableFailureMechanismSectionResultsMapLayer - where TFailureMechanism : IHasSectionResults, ICalculatableFailureMechanism + where TFailureMechanism : IFailurePath, ICalculatableFailureMechanism where TSectionResult : FailureMechanismSectionResult where TCalculationInput : class, ICalculationInput { Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs =================================================================== diff -u -r8a38b10934f10fa56481a95212dbc9a8132bb02a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs (.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs) (revision 8a38b10934f10fa56481a95212dbc9a8132bb02a) +++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs (.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -24,6 +24,7 @@ using Core.Components.Gis.Data; using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Forms.Factories; namespace Riskeer.Common.Forms.MapLayers @@ -37,7 +38,7 @@ { private readonly Func performAssemblyFunc; - private readonly IHasSectionResults failureMechanism; + private readonly IFailurePath failureMechanism; private Observer failureMechanismObserver; private RecursiveObserver, TSectionResult> sectionResultObserver; @@ -49,7 +50,7 @@ /// The used to assemble the result of a section result. /// Thrown when any parameter is null. public NonCalculatableFailureMechanismSectionResultsMapLayer( - IHasSectionResults failureMechanism, + IFailurePath failureMechanism, Func performAssemblyFunc) { if (failureMechanism == null) Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs =================================================================== diff -u -rabbb37e4aa1bceb60013db9d40a25afbf8d61595 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs (.../CalculatableFailureMechanismResultObserver.cs) (revision abbb37e4aa1bceb60013db9d40a25afbf8d61595) +++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs (.../CalculatableFailureMechanismResultObserver.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; namespace Riskeer.Common.Forms.Observers { @@ -35,7 +36,7 @@ /// The type of the calculations in the . public class CalculatableFailureMechanismResultObserver : FailureMechanismResultObserver - where TFailureMechanism : IFailureMechanism, IHasSectionResults, ICalculatableFailureMechanism + where TFailureMechanism : IFailureMechanism, IFailurePath, ICalculatableFailureMechanism where TSectionResult : FailureMechanismSectionResult where TCalculation : ICalculation { Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs =================================================================== diff -u -rabbb37e4aa1bceb60013db9d40a25afbf8d61595 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs (.../FailureMechanismResultObserver.cs) (revision abbb37e4aa1bceb60013db9d40a25afbf8d61595) +++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs (.../FailureMechanismResultObserver.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -22,6 +22,7 @@ using System; using Core.Common.Base; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; namespace Riskeer.Common.Forms.Observers { @@ -32,7 +33,7 @@ /// The type of the failure mechanism to observe. /// The type of the section results in the failure mechanism. public class FailureMechanismResultObserver : Observable, IDisposable - where TFailureMechanism : IFailureMechanism, IHasSectionResults + where TFailureMechanism : IFailureMechanism, IFailurePath where TSectionResult : FailureMechanismSectionResult { private readonly Observer failureMechanismObserver; Index: Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs =================================================================== diff -u -r35b32be33e977a44b4e8268beeda8ee0afde66b1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs (.../RiskeerUpdateInfoFactory.cs) (revision 35b32be33e977a44b4e8268beeda8ee0afde66b1) +++ Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs (.../RiskeerUpdateInfoFactory.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Util; using Core.Gui.Plugin; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.Properties; using Riskeer.Common.IO.FileImporters; @@ -53,7 +54,7 @@ public static UpdateInfo CreateFailureMechanismSectionsUpdateInfo( IFailureMechanismSectionResultUpdateStrategy sectionResultUpdateStrategy) where TSectionContext : FailureMechanismSectionsContext - where TFailureMechanism : IHasSectionResults + where TFailureMechanism : IFailurePath where TSectionResult : FailureMechanismSectionResult { if (sectionResultUpdateStrategy == null) Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -r8658d36cc32a7af5ea898721e85abe5985b52fb1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 8658d36cc32a7af5ea898721e85abe5985b52fb1) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -48,7 +48,7 @@ public abstract partial class FailureMechanismResultView : UserControl, IView where TSectionResult : FailureMechanismSectionResult where TSectionResultRow : FailureMechanismSectionResultRow - where TFailureMechanism : IHasSectionResults + where TFailureMechanism : IFailurePath { private readonly IObservableEnumerable failureMechanismSectionResults; private readonly Observer failureMechanismObserver; Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs =================================================================== diff -u -r35b32be33e977a44b4e8268beeda8ee0afde66b1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs (.../NonAdoptableFailureMechanismResultView.cs) (revision 35b32be33e977a44b4e8268beeda8ee0afde66b1) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs (.../NonAdoptableFailureMechanismResultView.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Forms.Builders; using Riskeer.Common.Forms.Providers; @@ -33,7 +34,7 @@ /// /// The type of failure mechanism. public class NonAdoptableFailureMechanismResultView : FailureMechanismResultView - where TFailureMechanism : IHasSectionResults + where TFailureMechanism : IFailurePath { private const int initialFailureMechanismResultTypeIndex = 2; private const int initialFailureMechanismResultSectionProbabilityIndex = 3; Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs =================================================================== diff -u -r35b32be33e977a44b4e8268beeda8ee0afde66b1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs) (revision 35b32be33e977a44b4e8268beeda8ee0afde66b1) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Forms.Builders; using Riskeer.Common.Forms.Providers; @@ -33,7 +34,7 @@ /// /// The type of failure mechanism. public class NonAdoptableWithProfileProbabilityFailureMechanismResultView : FailureMechanismResultView - where TFailureMechanism : IHasSectionResults + where TFailureMechanism : IFailurePath { private const int initialFailureMechanismResultTypeIndex = 2; private const int initialFailureMechanismResultProfileProbabilityIndex = 3; Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs =================================================================== diff -u -r4f0ae1246338a2d71b440f08e16986256fe2c8b6 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs (.../StructuresFailureMechanismResultView.cs) (revision 4f0ae1246338a2d71b440f08e16986256fe2c8b6) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs (.../StructuresFailureMechanismResultView.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -27,6 +27,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.Builders; using Riskeer.Common.Forms.Providers; @@ -39,7 +40,7 @@ /// The type of failure mechanism. /// The type of input. public class StructuresFailureMechanismResultView : FailureMechanismResultView - where TFailureMechanism : IHasSectionResults, ICalculatableFailureMechanism, IFailureMechanism + where TFailureMechanism : IFailurePath, ICalculatableFailureMechanism, IFailureMechanism where TStructuresInput : IStructuresCalculationInput, new() { private const int initialFailureMechanismResultTypeIndex = 2; Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs =================================================================== diff -u -r35b32be33e977a44b4e8268beeda8ee0afde66b1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs (.../FailureMechanismSectionReplaceStrategy.cs) (revision 35b32be33e977a44b4e8268beeda8ee0afde66b1) +++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs (.../FailureMechanismSectionReplaceStrategy.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -77,7 +77,7 @@ throw new UpdateDataException(e.Message, e); } - if (failurePath is IHasSectionResults hasSectionResults) + if (failurePath is IFailurePath hasSectionResults) { affectedObjects.Add(hasSectionResults.SectionResults); } Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs =================================================================== diff -u -r35b32be33e977a44b4e8268beeda8ee0afde66b1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs (.../FailureMechanismSectionUpdateStrategy.cs) (revision 35b32be33e977a44b4e8268beeda8ee0afde66b1) +++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionUpdateStrategy.cs (.../FailureMechanismSectionUpdateStrategy.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; namespace Riskeer.Common.IO.FileImporters { @@ -36,7 +37,7 @@ public class FailureMechanismSectionUpdateStrategy : IFailureMechanismSectionUpdateStrategy where T : FailureMechanismSectionResult { - private readonly IHasSectionResults failureMechanism; + private readonly IFailurePath failureMechanism; private readonly IFailureMechanismSectionResultUpdateStrategy sectionResultUpdateStrategy; /// @@ -46,7 +47,7 @@ /// The to use when updating /// the section results. /// Thrown when any parameter is null. - public FailureMechanismSectionUpdateStrategy(IHasSectionResults failureMechanism, + public FailureMechanismSectionUpdateStrategy(IFailurePath failureMechanism, IFailureMechanismSectionResultUpdateStrategy sectionResultUpdateStrategy) { if (failureMechanism == null) Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs =================================================================== diff -u -r652eb0ce8abd5c03cfa37b51b2c949c6059b3510 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision 652eb0ce8abd5c03cfa37b51b2c949c6059b3510) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -116,7 +116,7 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); mocks.ReplayAll(); // Call @@ -135,7 +135,7 @@ var random = new Random(21); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); mocks.ReplayAll(); failurePath.InAssembly = false; @@ -157,7 +157,7 @@ double expectedAssemblyResult = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) .Return(new FailurePathAssemblyResult { @@ -184,7 +184,7 @@ double failureMechanismN = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) .Return(new FailurePathAssemblyResult { @@ -231,7 +231,7 @@ double failureMechanismN = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) .Return(new FailurePathAssemblyResult { @@ -272,7 +272,7 @@ double expectedAssemblyResult = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) .Return(new FailurePathAssemblyResult { @@ -309,7 +309,7 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) .Return(new FailurePathAssemblyResult { Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs =================================================================== diff -u -rcc9cb91869b4f71b1b203e470c122b491a7bfef0 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision cc9cb91869b4f71b1b203e470c122b491a7bfef0) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -24,13 +24,14 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; namespace Riskeer.Common.Data.TestUtil { /// /// Simple failure mechanism which can be used for testing. /// - public class TestFailureMechanism : FailureMechanismBase, IHasSectionResults, + public class TestFailureMechanism : FailureMechanismBase, IFailurePath, IHasGeneralInput, ICalculatableFailureMechanism { private const string defaultName = "Test failure mechanism"; Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs =================================================================== diff -u -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs (.../NonAdoptableFailureMechanismResultViewTest.cs) (revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs (.../NonAdoptableFailureMechanismResultViewTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -32,6 +32,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Views; using Riskeer.Common.Primitives; @@ -251,7 +252,7 @@ return (DataGridView) new ControlTester("dataGridView").TheObject; } - private class TestNonAdoptableFailureMechanism : FailureMechanismBase, IHasSectionResults< NonAdoptableFailureMechanismSectionResult> + private class TestNonAdoptableFailureMechanism : FailureMechanismBase, IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs =================================================================== diff -u -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs) (revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -31,6 +31,7 @@ using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Views; using Riskeer.Common.Primitives; @@ -338,7 +339,7 @@ return failureMechanismResultView; } - private class TestNonAdoptableWithProfileProbabilityFailureMechanism : FailureMechanismBase, IHasSectionResults + private class TestNonAdoptableWithProfileProbabilityFailureMechanism : FailureMechanismBase, IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs (.../StructuresFailureMechanismResultViewTest.cs) (revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs (.../StructuresFailureMechanismResultViewTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -34,6 +34,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Views; @@ -418,7 +419,7 @@ } private class TestStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs =================================================================== diff -u -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs (.../FailureMechanismSectionUpdateStrategyTest.cs) (revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs (.../FailureMechanismSectionUpdateStrategyTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -29,6 +29,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.IO.FileImporters; @@ -59,7 +60,7 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); mocks.ReplayAll(); // Call @@ -75,7 +76,7 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); var sectionResultUpdateStrategy = mocks.Stub>(); mocks.ReplayAll(); @@ -92,7 +93,7 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); var sectionResultUpdateStrategy = mocks.Stub>(); mocks.ReplayAll(); @@ -110,7 +111,7 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); var sectionResultUpdateStrategy = mocks.Stub>(); mocks.ReplayAll(); Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.DuneErosion.Data.Properties; namespace Riskeer.DuneErosion.Data @@ -33,7 +34,7 @@ /// Model containing input and output needed to perform different levels of the /// Dune Erosion failure mechanism. /// - public class DuneErosionFailureMechanism : FailureMechanismBase, IHasSectionResults + public class DuneErosionFailureMechanism : FailureMechanismBase, IFailurePath { private readonly ObservableList sectionResults; private readonly ObservableList duneLocationCollection = new ObservableList(); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -24,6 +24,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.DuneErosion.Data.TestUtil; @@ -40,7 +41,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Duinafslag", failureMechanism.Name); Assert.AreEqual("DA", failureMechanism.Code); CollectionAssert.IsEmpty(failureMechanism.Sections); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.GrassCoverErosionInwards.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -35,7 +36,7 @@ /// public class GrassCoverErosionInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -28,6 +28,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; namespace Riskeer.GrassCoverErosionInwards.Data.Test @@ -44,7 +45,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Grasbekleding erosie kruin en binnentalud", failureMechanism.Name); Assert.AreEqual("GEKB", failureMechanism.Code); Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.GrassCoverErosionOutwards.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -34,7 +35,7 @@ /// Model containing input and output needed to perform different levels of the /// Grass Cover Erosion Outwards failure mechanism. /// - public class GrassCoverErosionOutwardsFailureMechanism : FailureMechanismBase, IHasSectionResults + public class GrassCoverErosionOutwardsFailureMechanism : FailureMechanismBase, IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs (.../GrassCoverErosionOutwardsFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs (.../GrassCoverErosionOutwardsFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; namespace Riskeer.GrassCoverErosionOutwards.Data.Test @@ -41,7 +42,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Grasbekleding erosie buitentalud", failureMechanism.Name); Assert.AreEqual("GEBU", failureMechanism.Code); Assert.IsInstanceOf(failureMechanism.GeneralInput); Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.HeightStructures.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -37,7 +38,7 @@ /// public class HeightStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; @@ -43,7 +44,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Hoogte kunstwerk", failureMechanism.Name); Assert.AreEqual("HTKW", failureMechanism.Code); Assert.IsInstanceOf(failureMechanism.GeneralInput); Index: Riskeer/Integration/src/Riskeer.Integration.Data/FailurePath/SpecificFailurePath.cs =================================================================== diff -u -r8b69b9b65ce5e95a3b1b95a03e896695a50ef261 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/FailurePath/SpecificFailurePath.cs (.../SpecificFailurePath.cs) (revision 8b69b9b65ce5e95a3b1b95a03e896695a50ef261) +++ Riskeer/Integration/src/Riskeer.Integration.Data/FailurePath/SpecificFailurePath.cs (.../SpecificFailurePath.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -32,7 +32,7 @@ /// /// This class is the implementation for a specific failure path. /// - public class SpecificFailurePath : Observable, IHasSectionResults + public class SpecificFailurePath : Observable, IFailurePath { private readonly FailureMechanismSectionCollection sectionCollection; private readonly ObservableList sectionResults; Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs (.../StandAloneFailureMechanismAssemblyFactory.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactory.cs (.../StandAloneFailureMechanismAssemblyFactory.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; namespace Riskeer.Integration.Data.StandAlone.AssemblyFactories { @@ -76,7 +77,7 @@ /// Thrown when the failure mechanism cannot be assembled. public static double AssembleFailureMechanism(TFailureMechanism failureMechanism, IAssessmentSection assessmentSection) - where TFailureMechanism : IHasGeneralInput, IHasSectionResults + where TFailureMechanism : IHasGeneralInput, IFailurePath { if (failureMechanism == null) { Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.Properties; namespace Riskeer.Integration.Data.StandAlone @@ -32,7 +33,7 @@ /// Grass Cover Slip Off Inwards failure mechanism. /// public class GrassCoverSlipOffInwardsFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IFailurePath, IHasGeneralInput { private readonly ObservableList sectionResults; Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.Properties; namespace Riskeer.Integration.Data.StandAlone @@ -32,7 +33,7 @@ /// Grass Cover Slip Off Outwards failure mechanism. /// public class GrassCoverSlipOffOutwardsFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IFailurePath, IHasGeneralInput { private readonly ObservableList sectionResults; Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.Properties; namespace Riskeer.Integration.Data.StandAlone @@ -31,7 +32,7 @@ /// Model containing input and output needed to perform different levels of the /// Microstability failure mechanism. /// - public class MicrostabilityFailureMechanism : FailureMechanismBase, IHasSectionResults, + public class MicrostabilityFailureMechanism : FailureMechanismBase, IFailurePath, IHasGeneralInput { private readonly ObservableList sectionResults; Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -33,7 +34,7 @@ /// Piping Structure failure mechanism. /// public class PipingStructureFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IFailurePath, IHasGeneralInput { private readonly ObservableList sectionResults; Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.Properties; namespace Riskeer.Integration.Data.StandAlone @@ -32,7 +33,7 @@ /// Water Pressure on Asphalt failure mechanism. /// public class WaterPressureAsphaltCoverFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IFailurePath, IHasGeneralInput { private readonly ObservableList sectionResults; Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -24,6 +24,7 @@ using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.Observers; using Riskeer.DuneErosion.Data; @@ -188,7 +189,7 @@ } private Observer CreateCalculatableFailureMechanismObserver(TFailureMechanism failureMechanism) - where TFailureMechanism : IFailureMechanism, IHasSectionResults, ICalculatableFailureMechanism + where TFailureMechanism : IFailureMechanism, IFailurePath, ICalculatableFailureMechanism where TSectionResult : FailureMechanismSectionResult where TCalculation : ICalculation { @@ -200,7 +201,7 @@ } private Observer CreateFailureMechanismObserver(TFailureMechanism failureMechanism) - where TFailureMechanism : IFailureMechanism, IHasSectionResults + where TFailureMechanism : IFailureMechanism, IFailurePath where TSectionResult : FailureMechanismSectionResult { return new Observer(NotifyObservers) Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs =================================================================== diff -u -r62ca51b8ff808cf657e915c7307946cab9f973be -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 62ca51b8ff808cf657e915c7307946cab9f973be) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -29,6 +29,7 @@ using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data.Exceptions; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.DuneErosion.Data; using Riskeer.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionOutwards.Data; @@ -318,7 +319,7 @@ } private FailureMechanismAssemblyResultRow CreateStandAloneFailureMechanismAssemblyResultRow(TFailureMechanism failureMechanism) - where TFailureMechanism : IHasGeneralInput, IHasSectionResults + where TFailureMechanism : IHasGeneralInput, IFailurePath { return new FailureMechanismAssemblyResultRow(failureMechanism, () => StandAloneFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, AssessmentSection)); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/StandAloneFailureMechanismView.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/StandAloneFailureMechanismView.cs (.../StandAloneFailureMechanismView.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/StandAloneFailureMechanismView.cs (.../StandAloneFailureMechanismView.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -28,6 +28,7 @@ using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Forms.Factories; using Riskeer.Common.Forms.MapLayers; @@ -37,7 +38,7 @@ /// This class is a view showing map data for a stand alone failure mechanism. /// public partial class StandAloneFailureMechanismView : UserControl, IMapView - where TFailureMechanism : IHasSectionResults + where TFailureMechanism : IFailurePath where TSectionResult : FailureMechanismSectionResult { private readonly Func performAssemblyFunc; Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rddd62262960650056912a38dd8f9a3840373c971 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision ddd62262960650056912a38dd8f9a3840373c971) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -1083,7 +1083,7 @@ private ViewInfo, NonAdoptableFailureMechanismResultView> CreateFailureMechanismResultViewInfo( Func getNFunc) where TContext : FailureMechanismSectionResultContext - where TFailureMechanism : class, IHasSectionResults + where TFailureMechanism : class, IFailurePath { return new RiskeerViewInfo< TContext, @@ -1102,7 +1102,7 @@ private ViewInfo, NonAdoptableWithProfileProbabilityFailureMechanismResultView> CreateFailureMechanismResultViewInfo( Func getNFunc, Func getUseLengthEffectFunc) where TContext : FailureMechanismSectionResultContext - where TFailureMechanism : class, IHasSectionResults, IHasGeneralInput + where TFailureMechanism : class, IFailurePath, IHasGeneralInput { return new RiskeerViewInfo< TContext, @@ -1412,7 +1412,7 @@ private ViewInfo> CreateFailureMechanismViewInfo< TFailureMechanismContext, TFailureMechanism, TSectionResult>(Func performAssemblyFunc) where TSectionResult : FailureMechanismSectionResult - where TFailureMechanism : FailureMechanismBase, IHasSectionResults + where TFailureMechanism : FailureMechanismBase, IFailurePath where TFailureMechanismContext : IFailurePathContext { return new RiskeerViewInfo(TView view, object dataToCloseFor) - where TFailureMechanism : class, IHasSectionResults + where TFailureMechanism : class, IFailurePath where TSectionResult : FailureMechanismSectionResult where TSectionResultRow : FailureMechanismSectionResultRow where TView : FailureMechanismResultView Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -31,6 +31,7 @@ using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.Structures; using Riskeer.Common.Service; @@ -829,7 +830,7 @@ removedObjects.AddRange(failureMechanism.Sections); changedObjects.Add(failureMechanism); - if (failureMechanism is IHasSectionResults failureMechanismWithSectionResults) + if (failureMechanism is IFailurePath failureMechanismWithSectionResults) { removedObjects.AddRange(failureMechanismWithSectionResults.SectionResults); changedObjects.Add(failureMechanismWithSectionResults.SectionResults); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs =================================================================== diff -u -rc3bd4596fda174b0efef1220c4f3b8872f1d5e7a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision c3bd4596fda174b0efef1220c4f3b8872f1d5e7a) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -32,6 +32,7 @@ using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.Assembly; using Riskeer.Integration.TestUtil; @@ -121,7 +122,7 @@ }); // Assert - IObservableEnumerable failureMechanismSectionResults = ((IHasSectionResults) failureMechanismInAssembly).SectionResults; + IObservableEnumerable failureMechanismSectionResults = ((IFailurePath) failureMechanismInAssembly).SectionResults; AssertSections(failureMechanismSectionResults, inputs.Single()); } } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/FailurePath/SpecificFailurePathTest.cs =================================================================== diff -u -r8b69b9b65ce5e95a3b1b95a03e896695a50ef261 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/FailurePath/SpecificFailurePathTest.cs (.../SpecificFailurePathTest.cs) (revision 8b69b9b65ce5e95a3b1b95a03e896695a50ef261) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/FailurePath/SpecificFailurePathTest.cs (.../SpecificFailurePathTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Integration.Data.FailurePath; namespace Riskeer.Integration.Data.Test.FailurePath @@ -41,7 +42,7 @@ // Assert Assert.IsInstanceOf(failurePath); - Assert.IsInstanceOf>(failurePath); + Assert.IsInstanceOf>(failurePath); Assert.AreEqual("Nieuw faalpad", failurePath.Name); Assert.AreEqual("NIEUW", failurePath.Code); Assert.IsNotNull(failurePath.Input); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactoryTest.cs (.../StandAloneFailureMechanismAssemblyFactoryTest.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StandAloneFailureMechanismAssemblyFactoryTest.cs (.../StandAloneFailureMechanismAssemblyFactoryTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -47,7 +47,7 @@ public class StandAloneFailureMechanismAssemblyFactoryTest { private class TestFailureMechanism : FailureMechanismBase, - IHasSectionResults, + IFailurePath, IHasGeneralInput { private readonly ObservableList sectionResults; Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; @@ -39,7 +40,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Grasbekleding afschuiven binnentalud", failureMechanism.Name); Assert.AreEqual("GABI", failureMechanism.Code); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; @@ -39,7 +40,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Grasbekleding afschuiven buitentalud", failureMechanism.Name); Assert.AreEqual("GABU", failureMechanism.Code); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; @@ -39,7 +40,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Microstabiliteit", failureMechanism.Name); Assert.AreEqual("STMI", failureMechanism.Code); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; @@ -39,7 +40,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Kunstwerken - Piping bij kunstwerk", failureMechanism.Name); Assert.AreEqual("PKW", failureMechanism.Code); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -r0476ac86d287af8644c2c3e61cda1455cb1e07c2 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision 0476ac86d287af8644c2c3e61cda1455cb1e07c2) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.StandAlone; @@ -39,7 +40,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Dijken en dammen - Wateroverdruk bij asfaltbekleding", failureMechanism.Name); Assert.AreEqual("AWO", failureMechanism.Code); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/StandAloneFailureMechanismViewTest.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/StandAloneFailureMechanismViewTest.cs (.../StandAloneFailureMechanismViewTest.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/StandAloneFailureMechanismViewTest.cs (.../StandAloneFailureMechanismViewTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -34,6 +34,7 @@ using Riskeer.Common.Data.AssemblyTool; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.TestUtil; @@ -66,7 +67,7 @@ var assessmentSection = new AssessmentSectionStub(); // Call - using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(failureMechanism, assessmentSection)) + using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(failureMechanism, assessmentSection)) { // Assert Assert.IsInstanceOf(view); @@ -92,7 +93,7 @@ mocks.ReplayAll(); // Call - void Call() => new StandAloneFailureMechanismView, FailureMechanismSectionResult>( + void Call() => new StandAloneFailureMechanismView, FailureMechanismSectionResult>( null, assessmentSection, sr => null); // Assert @@ -106,11 +107,11 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); mocks.ReplayAll(); // Call - void Call() => new StandAloneFailureMechanismView, FailureMechanismSectionResult>( + void Call() => new StandAloneFailureMechanismView, FailureMechanismSectionResult>( failureMechanism, null, sr => null); // Assert @@ -124,12 +125,12 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); // Call - void Call() => new StandAloneFailureMechanismView, FailureMechanismSectionResult>( + void Call() => new StandAloneFailureMechanismView, FailureMechanismSectionResult>( failureMechanism, assessmentSection, null); // Assert @@ -145,7 +146,7 @@ IAssessmentSection assessmentSection = new AssessmentSectionStub(); // Call - using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = + using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(new TestFailureMechanism(), assessmentSection)) { // Assert @@ -195,7 +196,7 @@ random.NextEnumValue()); // Call - using (var view = new StandAloneFailureMechanismView, FailureMechanismSectionResult>( + using (var view = new StandAloneFailureMechanismView, FailureMechanismSectionResult>( failureMechanism, assessmentSection, sr => failureMechanismSectionAssemblyResult)) { IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; @@ -235,7 +236,7 @@ ReferenceLine = referenceLine }; - using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = + using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(new TestFailureMechanism(), assessmentSection)) { IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; @@ -276,7 +277,7 @@ ReferenceLine = referenceLine }; - using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = + using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(new TestFailureMechanism(), assessmentSection)) { IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; @@ -311,7 +312,7 @@ // Setup var failureMechanism = new TestFailureMechanism(); - using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = + using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(failureMechanism, new AssessmentSectionStub())) { IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; @@ -359,7 +360,7 @@ var assessmentSection = new AssessmentSectionStub(); var failureMechanism = new TestFailureMechanism(); - using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = + using (StandAloneFailureMechanismView, FailureMechanismSectionResult> view = CreateView(failureMechanism, assessmentSection)) { IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; @@ -412,11 +413,11 @@ } } - private static StandAloneFailureMechanismView, FailureMechanismSectionResult> CreateView( - IHasSectionResults failureMechanism, + private static StandAloneFailureMechanismView, FailureMechanismSectionResult> CreateView( + IFailurePath failureMechanism, IAssessmentSection assessmentSection) { - return new StandAloneFailureMechanismView, FailureMechanismSectionResult>( + return new StandAloneFailureMechanismView, FailureMechanismSectionResult>( failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult()); } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision fc767eef0f40b1dd6130d52f6025a5a9181330e1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -29,6 +29,7 @@ using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data; using Riskeer.Integration.IO.Assembly; @@ -159,7 +160,7 @@ private static void AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType expectedFailureMechanismCode, ExportableFailureMechanismGroup expectedFailureMechanismGroup, - IHasSectionResults failureMechanism, + IFailurePath failureMechanism, ExportableFailureMechanism actualExportableFailureMechanism) { Assert.AreEqual(expectedFailureMechanismCode, actualExportableFailureMechanism.Code); @@ -231,7 +232,7 @@ private static void AssertExportableFailureMechanismWithoutProbability(ExportableFailureMechanismType expectedFailureMechanismCode, ExportableFailureMechanismGroup expectedFailureMechanismGroup, - IHasSectionResults failureMechanism, + IFailurePath failureMechanism, ExportableFailureMechanism actualExportableFailureMechanism) { Assert.AreEqual(expectedFailureMechanismCode, actualExportableFailureMechanism.Code); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r09486786d73dcf29f225c4aad4a3ac89ca44d21a -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 09486786d73dcf29f225c4aad4a3ac89ca44d21a) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -34,6 +34,7 @@ using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; @@ -1958,7 +1959,7 @@ } private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(T failureMechanism) - where T : IFailureMechanism, IHasSectionResults + where T : IFailureMechanism, IFailurePath { foreach (FailureMechanismSection section in failureMechanism.Sections) { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.MacroStabilityInwards.Data.Properties; using Riskeer.MacroStabilityInwards.Data.SoilProfile; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -34,7 +35,7 @@ /// public class MacroStabilityInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -24,6 +24,7 @@ using NUnit.Framework; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; namespace Riskeer.MacroStabilityInwards.Data.Test @@ -40,7 +41,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Macrostabiliteit binnenwaarts", failureMechanism.Name); Assert.AreEqual("STBI", failureMechanism.Code); Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -23,6 +23,7 @@ using Core.Common.Base; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Piping.Data.SoilProfile; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; using PipingDataResources = Riskeer.Piping.Data.Properties.Resources; @@ -32,7 +33,7 @@ /// /// Model for performing piping calculations. /// - public class PipingFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults + public class PipingFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IFailurePath { private readonly ObservableList sectionResults; private readonly ObservableList scenarioConfigurationsPerFailureMechanismSection; Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -24,6 +24,7 @@ using NUnit.Framework; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Piping.Data.TestUtil; @@ -41,7 +42,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Piping", failureMechanism.Name); Assert.AreEqual("STPH", failureMechanism.Code); Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.StabilityPointStructures.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -38,7 +39,7 @@ /// public class StabilityPointStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, - IHasSectionResults + IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs (.../StabilityPointStructuresFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs (.../StabilityPointStructuresFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; @@ -43,7 +44,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Sterkte en stabiliteit puntconstructies", failureMechanism.Name); Assert.AreEqual("STKWp", failureMechanism.Code); Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.StabilityStoneCover.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -34,7 +35,7 @@ /// Model containing input and output needed to perform different levels of the /// Stability of Stone Cover failure mechanism. /// - public class StabilityStoneCoverFailureMechanism : FailureMechanismBase, IHasSectionResults + public class StabilityStoneCoverFailureMechanism : FailureMechanismBase, IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; namespace Riskeer.StabilityStoneCover.Data.Test @@ -41,7 +42,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Stabiliteit steenzetting", failureMechanism.Name); Assert.AreEqual("ZST", failureMechanism.Code); Assert.IsInstanceOf(failureMechanism.GeneralInput); Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -25,6 +25,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Revetment.Data; using Riskeer.WaveImpactAsphaltCover.Data.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; @@ -35,7 +36,7 @@ /// Model containing input and output needed to perform different levels of the /// Wave Impact on Asphalt failure mechanism. /// - public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase, IHasSectionResults + public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase, IFailurePath { private readonly ObservableList sectionResults; Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -r29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517 -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision 29a5b7c9abb3d641fd9f3b3e1055ff34d7a16517) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; namespace Riskeer.WaveImpactAsphaltCover.Data.Test @@ -41,7 +42,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Golfklappen op asfaltbekleding", failureMechanism.Name); Assert.AreEqual("AGK", failureMechanism.Code); Assert.IsNotNull(failureMechanism.GeneralWaveImpactAsphaltCoverInput);