Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r3da24297596633caa89d0bf98a654078640084d9 -r29b4531378c15337787a6439d27d0f701ece0974
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 3da24297596633caa89d0bf98a654078640084d9)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs (.../MacroStabilityInwardsFailureMechanismResultView.cs) (revision 29b4531378c15337787a6439d27d0f701ece0974)
@@ -34,11 +34,11 @@
namespace Riskeer.MacroStabilityInwards.Forms.Views
{
///
- /// The view for the
+ /// The view for the
/// in the .
///
- public class MacroStabilityInwardsFailureMechanismResultView : FailureMechanismResultView
+ public class MacroStabilityInwardsFailureMechanismResultView : FailureMechanismResultView
{
private const int initialFailureMechanismResultTypeIndex = 2;
private const int initialFailureMechanismResultSectionProbabilityIndex = 3;
@@ -54,11 +54,11 @@
/// Creates a new instance of .
///
/// The collection of
- /// to show in the view.
+ /// to show in the view.
/// The failure mechanism the results belong to.
/// The assessment section the failure mechanism results belong to.
/// Thrown when any parameter is null.
- public MacroStabilityInwardsFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults,
+ public MacroStabilityInwardsFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults,
MacroStabilityInwardsFailureMechanism failureMechanism,
IAssessmentSection assessmentSection)
: base(failureMechanismSectionResults, failureMechanism, assessmentSection, MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism)
@@ -80,17 +80,17 @@
};
}
- protected override AdoptableWithProfileProbabilityFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(AdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult)
+ protected override AdoptableFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(AdoptableFailureMechanismSectionResult sectionResult)
{
MacroStabilityInwardsCalculationScenario[] calculationScenarios = FailureMechanism.Calculations
.OfType()
.ToArray();
- return new AdoptableWithProfileProbabilityFailureMechanismSectionResultRow(
+ return new AdoptableFailureMechanismSectionResultRow(
sectionResult,
CreateCalculateStrategy(sectionResult, calculationScenarios),
CreateErrorProvider(sectionResult, calculationScenarios),
() => MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection(sectionResult, FailureMechanism, AssessmentSection),
- new AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.ConstructionProperties
+ new AdoptableFailureMechanismSectionResultRow.ConstructionProperties
{
InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
InitialFailureMechanismResultSectionProbabilityIndex = initialFailureMechanismResultSectionProbabilityIndex,
@@ -145,7 +145,7 @@
}
private MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(
- AdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult,
+ AdoptableFailureMechanismSectionResult sectionResult,
IEnumerable calculationScenarios)
{
return new MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy(
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/RegistrationState/MacroStabilityInwardsFailureMechanismView.cs
===================================================================
diff -u -r59482025a9b7fc432eaf09f808006f543dec5840 -r29b4531378c15337787a6439d27d0f701ece0974
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/RegistrationState/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision 59482025a9b7fc432eaf09f808006f543dec5840)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/RegistrationState/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision 29b4531378c15337787a6439d27d0f701ece0974)
@@ -41,7 +41,7 @@
private MapPointData sectionsStartPointMapData;
private MapPointData sectionsEndPointMapData;
- private CalculatableFailureMechanismSectionResultsMapLayer assemblyResultsMapLayer;
+ private CalculatableFailureMechanismSectionResultsMapLayer assemblyResultsMapLayer;
private Observer failureMechanismObserver;
@@ -71,7 +71,7 @@
sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
- assemblyResultsMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer(
+ assemblyResultsMapLayer = new CalculatableFailureMechanismSectionResultsMapLayer(
FailureMechanism, sr => MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection(sr, FailureMechanism, AssessmentSection).AssemblyResult);
sectionsMapDataCollection.Add(sectionsMapData);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -r59482025a9b7fc432eaf09f808006f543dec5840 -r29b4531378c15337787a6439d27d0f701ece0974
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 59482025a9b7fc432eaf09f808006f543dec5840)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 29b4531378c15337787a6439d27d0f701ece0974)
@@ -645,8 +645,8 @@
// Then
MacroStabilityInwardsCalculationScenario[] calculationScenarios = failureMechanism.Calculations.OfType().ToArray();
- AdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
- AdoptableWithProfileProbabilityFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
+ AdoptableFailureMechanismSectionResult failureMechanismSectionResult1 = failureMechanism.SectionResults.First();
+ AdoptableFailureMechanismSectionResult failureMechanismSectionResult2 = failureMechanism.SectionResults.ElementAt(1);
Func, bool> intersectionFunc =
(scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r872233ac53cfe27e5de5fd5e159610b55ad2cfa2 -r29b4531378c15337787a6439d27d0f701ece0974
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 872233ac53cfe27e5de5fd5e159610b55ad2cfa2)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 29b4531378c15337787a6439d27d0f701ece0974)
@@ -82,8 +82,8 @@
using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
{
// Assert
- Assert.IsInstanceOf>(view);
Assert.IsNull(view.Data);
Assert.AreSame(failureMechanism, view.FailureMechanism);