Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroup.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroup.cs (.../FailureMechanismSectionAssemblyGroup.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroup.cs (.../FailureMechanismSectionAssemblyGroup.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -86,8 +86,8 @@
///
/// Represents group GR.
///
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_Gr_DisplayName))]
- Gr = 10,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroup_NoResult_DisplayName))]
+ NoResult = 10,
///
/// Represents group Not Relevant.
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2022. All rights reserved.
+// Copyright (C) Stichting Deltares 2022. All rights reserved.
//
// This file is part of Riskeer.
//
@@ -136,15 +136,6 @@
}
///
- /// Looks up a localized string similar to .
- ///
- internal static string FailureMechanismSectionAssemblyGroup_Gr_DisplayName {
- get {
- return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_Gr_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to +I.
///
internal static string FailureMechanismSectionAssemblyGroup_I_DisplayName {
@@ -199,6 +190,15 @@
}
///
+ /// Looks up a localized string similar to .
+ ///
+ internal static string FailureMechanismSectionAssemblyGroup_NoResult_DisplayName {
+ get {
+ return ResourceManager.GetString("FailureMechanismSectionAssemblyGroup_NoResult_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to NDo.
///
internal static string FailureMechanismSectionAssemblyGroup_NotDominant_DisplayName {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx
===================================================================
diff -u -re0e4a5e7fcca8955597e55bbb4c624cd54d0c1dd -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision e0e4a5e7fcca8955597e55bbb4c624cd54d0c1dd)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx (.../Resources.resx) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -159,7 +159,7 @@
Do
-
+
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs (.../FailureMechanismSectionAssemblyGroupConverter.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs (.../FailureMechanismSectionAssemblyGroupConverter.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -71,7 +71,7 @@
case EInterpretationCategory.Dominant:
return FailureMechanismSectionAssemblyGroup.Dominant;
case EInterpretationCategory.NoResult:
- return FailureMechanismSectionAssemblyGroup.Gr;
+ return FailureMechanismSectionAssemblyGroup.NoResult;
case EInterpretationCategory.NotRelevant:
return FailureMechanismSectionAssemblyGroup.NotRelevant;
default:
@@ -117,7 +117,7 @@
return EInterpretationCategory.IIIMin;
case FailureMechanismSectionAssemblyGroup.Dominant:
return EInterpretationCategory.Dominant;
- case FailureMechanismSectionAssemblyGroup.Gr:
+ case FailureMechanismSectionAssemblyGroup.NoResult:
return EInterpretationCategory.NoResult;
case FailureMechanismSectionAssemblyGroup.NotRelevant:
return EInterpretationCategory.NotRelevant;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupTest.cs (.../FailureMechanismSectionAssemblyGroupTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupTest.cs (.../FailureMechanismSectionAssemblyGroupTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -59,7 +59,7 @@
FailureMechanismSectionAssemblyGroup.Dominant, 9
},
{
- FailureMechanismSectionAssemblyGroup.Gr, 10
+ FailureMechanismSectionAssemblyGroup.NoResult, 10
},
{
FailureMechanismSectionAssemblyGroup.NotRelevant, 11
@@ -97,7 +97,7 @@
FailureMechanismSectionAssemblyGroup.Dominant, "Do"
},
{
- FailureMechanismSectionAssemblyGroup.Gr, ""
+ FailureMechanismSectionAssemblyGroup.NoResult, ""
},
{
FailureMechanismSectionAssemblyGroup.NotRelevant, "NR"
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyGroupConverterTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyGroupConverterTest.cs (.../FailureMechanismSectionAssemblyGroupConverterTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyGroupConverterTest.cs (.../FailureMechanismSectionAssemblyGroupConverterTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -55,7 +55,7 @@
[TestCase(EInterpretationCategory.IIMin, FailureMechanismSectionAssemblyGroup.IIMin)]
[TestCase(EInterpretationCategory.IIIMin, FailureMechanismSectionAssemblyGroup.IIIMin)]
[TestCase(EInterpretationCategory.Dominant, FailureMechanismSectionAssemblyGroup.Dominant)]
- [TestCase(EInterpretationCategory.NoResult, FailureMechanismSectionAssemblyGroup.Gr)]
+ [TestCase(EInterpretationCategory.NoResult, FailureMechanismSectionAssemblyGroup.NoResult)]
[TestCase(EInterpretationCategory.NotRelevant, FailureMechanismSectionAssemblyGroup.NotRelevant)]
public void ConvertTo_ValidInterpretationCategory_ReturnsExpectedValue(EInterpretationCategory interpretationCategory, FailureMechanismSectionAssemblyGroup expectedAssemblyGroup)
{
@@ -90,7 +90,7 @@
[TestCase(FailureMechanismSectionAssemblyGroup.IIMin, EInterpretationCategory.IIMin)]
[TestCase(FailureMechanismSectionAssemblyGroup.IIIMin, EInterpretationCategory.IIIMin)]
[TestCase(FailureMechanismSectionAssemblyGroup.Dominant, EInterpretationCategory.Dominant)]
- [TestCase(FailureMechanismSectionAssemblyGroup.Gr, EInterpretationCategory.NoResult)]
+ [TestCase(FailureMechanismSectionAssemblyGroup.NoResult, EInterpretationCategory.NoResult)]
[TestCase(FailureMechanismSectionAssemblyGroup.NotRelevant, EInterpretationCategory.NotRelevant)]
public void ConvertFrom_ValidAssemblyGroup_ReturnsExpectedValue(FailureMechanismSectionAssemblyGroup assemblyGroup, EInterpretationCategory expectedInterpretationCategory)
{
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/FailureMechanismSectionAssemblyGroupBoundariesAssert.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/FailureMechanismSectionAssemblyGroupBoundariesAssert.cs (.../FailureMechanismSectionAssemblyGroupBoundariesAssert.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/FailureMechanismSectionAssemblyGroupBoundariesAssert.cs (.../FailureMechanismSectionAssemblyGroupBoundariesAssert.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -81,7 +81,7 @@
case EInterpretationCategory.Dominant:
return FailureMechanismSectionAssemblyGroup.Dominant;
case EInterpretationCategory.NoResult:
- return FailureMechanismSectionAssemblyGroup.Gr;
+ return FailureMechanismSectionAssemblyGroup.NoResult;
case EInterpretationCategory.NotRelevant:
return FailureMechanismSectionAssemblyGroup.NotRelevant;
default:
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/DefaultFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/DefaultFailureMechanismSectionAssemblyResult.cs (.../DefaultFailureMechanismSectionAssemblyResult.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/DefaultFailureMechanismSectionAssemblyResult.cs (.../DefaultFailureMechanismSectionAssemblyResult.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -31,6 +31,6 @@
///
/// Creates a new instance of .
///
- public DefaultFailureMechanismSectionAssemblyResult() : base(double.NaN, double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.Gr) {}
+ public DefaultFailureMechanismSectionAssemblyResult() : base(double.NaN, double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.NoResult) {}
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs (.../MapThemeFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs (.../MapThemeFactory.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -54,7 +54,7 @@
CreateAssemblyGroupTheme(Color.FromArgb(255, 255, 90, 172), FailureMechanismSectionAssemblyGroup.Dominant),
CreateAssemblyGroupTheme(Color.FromArgb(255, 192, 192, 192), FailureMechanismSectionAssemblyGroup.NotDominant),
CreateAssemblyGroupTheme(Color.FromArgb(255, 38, 245, 245), FailureMechanismSectionAssemblyGroup.NotRelevant),
- CreateAssemblyGroupTheme(Color.FromArgb(0, 0, 0, 0), FailureMechanismSectionAssemblyGroup.Gr)
+ CreateAssemblyGroupTheme(Color.FromArgb(0, 0, 0, 0), FailureMechanismSectionAssemblyGroup.NoResult)
});
}
Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionAssemblyGroupColorHelper.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionAssemblyGroupColorHelper.cs (.../FailureMechanismSectionAssemblyGroupColorHelper.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionAssemblyGroupColorHelper.cs (.../FailureMechanismSectionAssemblyGroupColorHelper.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -69,7 +69,7 @@
return Color.FromArgb(178, 34, 34);
case FailureMechanismSectionAssemblyGroup.Dominant:
return Color.FromArgb(255, 90, 172);
- case FailureMechanismSectionAssemblyGroup.Gr:
+ case FailureMechanismSectionAssemblyGroup.NoResult:
return Color.FromArgb(255, 255, 255);
case FailureMechanismSectionAssemblyGroup.NotRelevant:
return Color.FromArgb(38, 245, 245);
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/DefaultFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/DefaultFailureMechanismSectionAssemblyResultTest.cs (.../DefaultFailureMechanismSectionAssemblyResultTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/DefaultFailureMechanismSectionAssemblyResultTest.cs (.../DefaultFailureMechanismSectionAssemblyResultTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -40,7 +40,7 @@
Assert.IsNaN(result.ProfileProbability);
Assert.IsNaN(result.SectionProbability);
Assert.IsNaN(result.N);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.FailureMechanismSectionAssemblyGroup);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.FailureMechanismSectionAssemblyGroup);
}
}
}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -588,7 +588,7 @@
public TestRow(FailureMechanismSectionResult sectionResult) : base(sectionResult)
{
ColumnStateDefinitions.Add(0, new DataGridViewColumnStateDefinition());
- AssemblyResult = new FailureMechanismSectionAssemblyResult(0, 0, 0, FailureMechanismSectionAssemblyGroup.Gr);
+ AssemblyResult = new FailureMechanismSectionAssemblyResult(0, 0, 0, FailureMechanismSectionAssemblyGroup.NoResult);
}
public string TestString
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/FailureMechanismSectionAssemblyGroupColorTestHelper.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/FailureMechanismSectionAssemblyGroupColorTestHelper.cs (.../FailureMechanismSectionAssemblyGroupColorTestHelper.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/FailureMechanismSectionAssemblyGroupColorTestHelper.cs (.../FailureMechanismSectionAssemblyGroupColorTestHelper.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -48,7 +48,7 @@
yield return new TestCaseData(FailureMechanismSectionAssemblyGroup.IIMin, Color.FromArgb(255, 0, 0));
yield return new TestCaseData(FailureMechanismSectionAssemblyGroup.IIIMin, Color.FromArgb(178, 34, 34));
yield return new TestCaseData(FailureMechanismSectionAssemblyGroup.Dominant, Color.FromArgb(255, 90, 172));
- yield return new TestCaseData(FailureMechanismSectionAssemblyGroup.Gr, Color.FromArgb(255, 255, 255));
+ yield return new TestCaseData(FailureMechanismSectionAssemblyGroup.NoResult, Color.FromArgb(255, 255, 255));
yield return new TestCaseData(FailureMechanismSectionAssemblyGroup.NotRelevant, Color.FromArgb(38, 245, 245));
}
}
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs
===================================================================
diff -u -r3e75fc50ffdf533afc5985680446e00f32c38f8a -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision 3e75fc50ffdf533afc5985680446e00f32c38f8a)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -206,21 +206,21 @@
///
public ConstructionProperties()
{
- Piping = FailureMechanismSectionAssemblyGroup.Gr;
- GrassCoverErosionInwards = FailureMechanismSectionAssemblyGroup.Gr;
- MacroStabilityInwards = FailureMechanismSectionAssemblyGroup.Gr;
- Microstability = FailureMechanismSectionAssemblyGroup.Gr;
- StabilityStoneCover = FailureMechanismSectionAssemblyGroup.Gr;
- WaveImpactAsphaltCover = FailureMechanismSectionAssemblyGroup.Gr;
- WaterPressureAsphaltCover = FailureMechanismSectionAssemblyGroup.Gr;
- GrassCoverErosionOutwards = FailureMechanismSectionAssemblyGroup.Gr;
- GrassCoverSlipOffOutwards = FailureMechanismSectionAssemblyGroup.Gr;
- GrassCoverSlipOffInwards = FailureMechanismSectionAssemblyGroup.Gr;
- HeightStructures = FailureMechanismSectionAssemblyGroup.Gr;
- ClosingStructures = FailureMechanismSectionAssemblyGroup.Gr;
- PipingStructure = FailureMechanismSectionAssemblyGroup.Gr;
- StabilityPointStructures = FailureMechanismSectionAssemblyGroup.Gr;
- DuneErosion = FailureMechanismSectionAssemblyGroup.Gr;
+ Piping = FailureMechanismSectionAssemblyGroup.NoResult;
+ GrassCoverErosionInwards = FailureMechanismSectionAssemblyGroup.NoResult;
+ MacroStabilityInwards = FailureMechanismSectionAssemblyGroup.NoResult;
+ Microstability = FailureMechanismSectionAssemblyGroup.NoResult;
+ StabilityStoneCover = FailureMechanismSectionAssemblyGroup.NoResult;
+ WaveImpactAsphaltCover = FailureMechanismSectionAssemblyGroup.NoResult;
+ WaterPressureAsphaltCover = FailureMechanismSectionAssemblyGroup.NoResult;
+ GrassCoverErosionOutwards = FailureMechanismSectionAssemblyGroup.NoResult;
+ GrassCoverSlipOffOutwards = FailureMechanismSectionAssemblyGroup.NoResult;
+ GrassCoverSlipOffInwards = FailureMechanismSectionAssemblyGroup.NoResult;
+ HeightStructures = FailureMechanismSectionAssemblyGroup.NoResult;
+ ClosingStructures = FailureMechanismSectionAssemblyGroup.NoResult;
+ PipingStructure = FailureMechanismSectionAssemblyGroup.NoResult;
+ StabilityPointStructures = FailureMechanismSectionAssemblyGroup.NoResult;
+ DuneErosion = FailureMechanismSectionAssemblyGroup.NoResult;
SpecificFailureMechanisms = Array.Empty();
}
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreator.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -50,7 +50,7 @@
}
ExportableFailureMechanismSubSectionAssemblyResult sectionResultSectionAssemblyResult = sectionResult.SectionAssemblyResult;
- if (sectionResultSectionAssemblyResult.AssemblyGroup == FailureMechanismSectionAssemblyGroup.Gr
+ if (sectionResultSectionAssemblyResult.AssemblyGroup == FailureMechanismSectionAssemblyGroup.NoResult
|| sectionResultSectionAssemblyResult.AssemblyGroup == FailureMechanismSectionAssemblyGroup.Dominant)
{
throw new AssemblyCreatorException("The assembly result is invalid and cannot be created.");
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs
===================================================================
diff -u -r97d6412d08fb4eb0c60d6073db3c6cbd8ba69105 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableFailureMechanismSectionAssemblyResultCreator.cs) (revision 97d6412d08fb4eb0c60d6073db3c6cbd8ba69105)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableFailureMechanismSectionAssemblyResultCreator.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -60,7 +60,7 @@
private static void ValidateAssemblyResult(ExportableFailureMechanismSectionAssemblyResult sectionResult)
{
- if (sectionResult.AssemblyGroup == FailureMechanismSectionAssemblyGroup.Gr
+ if (sectionResult.AssemblyGroup == FailureMechanismSectionAssemblyGroup.NoResult
|| sectionResult.AssemblyGroup == FailureMechanismSectionAssemblyGroup.Dominant)
{
throw new AssemblyCreatorException(@"The assembly result is invalid and cannot be created.");
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -157,24 +157,24 @@
int expectedNrOfSpecificSectionResults = assessmentSection.SpecificFailureMechanisms.Count;
Assert.AreEqual(expectedNrOfGeneralSectionResults + expectedNrOfSpecificSectionResults, inputs.Count());
- AssertSectionsWithResult(assessmentSection.Piping.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(0));
- AssertSectionsWithResult(assessmentSection.GrassCoverErosionInwards.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(1));
- AssertSectionsWithResult(assessmentSection.MacroStabilityInwards.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(2));
- AssertSectionsWithResult(assessmentSection.Microstability.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(3));
- AssertSectionsWithResult(assessmentSection.StabilityStoneCover.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(4));
- AssertSectionsWithResult(assessmentSection.WaveImpactAsphaltCover.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(5));
- AssertSectionsWithResult(assessmentSection.WaterPressureAsphaltCover.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(6));
- AssertSectionsWithResult(assessmentSection.GrassCoverErosionOutwards.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(7));
- AssertSectionsWithResult(assessmentSection.GrassCoverSlipOffOutwards.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(8));
- AssertSectionsWithResult(assessmentSection.GrassCoverSlipOffInwards.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(9));
- AssertSectionsWithResult(assessmentSection.HeightStructures.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(10));
- AssertSectionsWithResult(assessmentSection.ClosingStructures.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(11));
- AssertSectionsWithResult(assessmentSection.PipingStructure.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(12));
- AssertSectionsWithResult(assessmentSection.StabilityPointStructures.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(13));
- AssertSectionsWithResult(assessmentSection.DuneErosion.SectionResults, FailureMechanismSectionAssemblyGroup.Gr, inputs.ElementAt(14));
+ AssertSectionsWithResult(assessmentSection.Piping.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(0));
+ AssertSectionsWithResult(assessmentSection.GrassCoverErosionInwards.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(1));
+ AssertSectionsWithResult(assessmentSection.MacroStabilityInwards.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(2));
+ AssertSectionsWithResult(assessmentSection.Microstability.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(3));
+ AssertSectionsWithResult(assessmentSection.StabilityStoneCover.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(4));
+ AssertSectionsWithResult(assessmentSection.WaveImpactAsphaltCover.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(5));
+ AssertSectionsWithResult(assessmentSection.WaterPressureAsphaltCover.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(6));
+ AssertSectionsWithResult(assessmentSection.GrassCoverErosionOutwards.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(7));
+ AssertSectionsWithResult(assessmentSection.GrassCoverSlipOffOutwards.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(8));
+ AssertSectionsWithResult(assessmentSection.GrassCoverSlipOffInwards.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(9));
+ AssertSectionsWithResult(assessmentSection.HeightStructures.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(10));
+ AssertSectionsWithResult(assessmentSection.ClosingStructures.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(11));
+ AssertSectionsWithResult(assessmentSection.PipingStructure.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(12));
+ AssertSectionsWithResult(assessmentSection.StabilityPointStructures.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(13));
+ AssertSectionsWithResult(assessmentSection.DuneErosion.SectionResults, FailureMechanismSectionAssemblyGroup.NoResult, inputs.ElementAt(14));
for (var i = 0; i < expectedNrOfSpecificSectionResults; i++)
{
- AssertSectionsWithResult(assessmentSection.SpecificFailureMechanisms[i].SectionResults, FailureMechanismSectionAssemblyGroup.Gr,
+ AssertSectionsWithResult(assessmentSection.SpecificFailureMechanisms[i].SectionResults, FailureMechanismSectionAssemblyGroup.NoResult,
inputs.ElementAt(expectedNrOfGeneralSectionResults + i));
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs
===================================================================
diff -u -r3e75fc50ffdf533afc5985680446e00f32c38f8a -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision 3e75fc50ffdf533afc5985680446e00f32c38f8a)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -68,21 +68,21 @@
Assert.AreEqual(sectionStart, result.SectionStart);
Assert.AreEqual(sectionEnd, result.SectionEnd);
Assert.AreEqual(totalResult, result.TotalResult);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.Piping);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.GrassCoverErosionInwards);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.MacroStabilityInwards);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.Microstability);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.StabilityStoneCover);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.WaveImpactAsphaltCover);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.WaterPressureAsphaltCover);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.GrassCoverErosionOutwards);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.GrassCoverSlipOffOutwards);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.GrassCoverSlipOffInwards);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.HeightStructures);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.ClosingStructures);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.PipingStructure);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.StabilityPointStructures);
- Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Gr, result.DuneErosion);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.Piping);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.GrassCoverErosionInwards);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.MacroStabilityInwards);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.Microstability);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.StabilityStoneCover);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.WaveImpactAsphaltCover);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.WaterPressureAsphaltCover);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.GrassCoverErosionOutwards);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.GrassCoverSlipOffOutwards);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.GrassCoverSlipOffInwards);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.HeightStructures);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.ClosingStructures);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.PipingStructure);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.StabilityPointStructures);
+ Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NoResult, result.DuneErosion);
Assert.IsEmpty(result.SpecificFailureMechanisms);
Assert.AreEqual(result.CommonSectionAssemblyMethod, commonSectionAssemblyMethod);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs
===================================================================
diff -u -r3e75fc50ffdf533afc5985680446e00f32c38f8a -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 3e75fc50ffdf533afc5985680446e00f32c38f8a)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -202,7 +202,7 @@
// Setup
var random = new Random(21);
- var result = new CombinedFailureMechanismSectionAssemblyResult(random.NextDouble(), random.NextDouble(), FailureMechanismSectionAssemblyGroup.Gr,
+ var result = new CombinedFailureMechanismSectionAssemblyResult(random.NextDouble(), random.NextDouble(), FailureMechanismSectionAssemblyGroup.NoResult,
random.NextEnumValue(), random.NextEnumValue(),
random.NextEnumValue(),
new CombinedFailureMechanismSectionAssemblyResult.ConstructionProperties
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs (.../SerializableCombinedFailureMechanismSectionAssemblyResultCreatorTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -45,7 +45,7 @@
}
[Test]
- [TestCase(FailureMechanismSectionAssemblyGroup.Gr)]
+ [TestCase(FailureMechanismSectionAssemblyGroup.NoResult)]
[TestCase(FailureMechanismSectionAssemblyGroup.Dominant)]
public void Create_SectionResultWithInvalidAssemblyGroup_ThrowsAssemblyCreatorException(FailureMechanismSectionAssemblyGroup assemblyGroup)
{
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyGroupCreatorTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyGroupCreatorTest.cs (.../SerializableFailureMechanismSectionAssemblyGroupCreatorTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyGroupCreatorTest.cs (.../SerializableFailureMechanismSectionAssemblyGroupCreatorTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -47,7 +47,7 @@
}
[Test]
- [TestCase(FailureMechanismSectionAssemblyGroup.Gr)]
+ [TestCase(FailureMechanismSectionAssemblyGroup.NoResult)]
[TestCase(FailureMechanismSectionAssemblyGroup.Dominant)]
public void Create_NotSupportedFailureMechanismSectionAssemblyGroup_ThrowsNotSupportedException(
FailureMechanismSectionAssemblyGroup assemblyGroup)
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs
===================================================================
diff -u -r97d6412d08fb4eb0c60d6073db3c6cbd8ba69105 -rfa6b386609815ae4b5c860d8e697e0d86777bd56
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs (.../SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs) (revision 97d6412d08fb4eb0c60d6073db3c6cbd8ba69105)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs (.../SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs) (revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
@@ -47,7 +47,7 @@
[Test]
[TestCase(FailureMechanismSectionAssemblyGroup.Dominant)]
- [TestCase(FailureMechanismSectionAssemblyGroup.Gr)]
+ [TestCase(FailureMechanismSectionAssemblyGroup.NoResult)]
public void Create_SectionResultHasInvalidAssemblyGroup_ThrowsAssemblyCreatorException(FailureMechanismSectionAssemblyGroup assemblyGroup)
{
// Setup