Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionComposition.cs
===================================================================
diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionComposition.cs (.../AssessmentSectionComposition.cs) (revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionComposition.cs (.../AssessmentSectionComposition.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -29,16 +29,16 @@
///
/// The assessment section consists only out of 'dike' elements.
///
- Dike = 0,
+ Dike,
///
/// The assessment section consists only out of 'dune' elements.
///
- Dune = 1,
+ Dune,
///
/// The assessment section consists out of a combination of 'dike' and 'dune' elements.
///
- DikeAndDune = 2
+ DikeAndDune
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/AssessmentLayerTwoAResult.cs
===================================================================
diff -u -r4a12b47ea94488f0716d7c61c6cefba235d7db48 -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/AssessmentLayerTwoAResult.cs (.../AssessmentLayerTwoAResult.cs) (revision 4a12b47ea94488f0716d7c61c6cefba235d7db48)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/AssessmentLayerTwoAResult.cs (.../AssessmentLayerTwoAResult.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -33,7 +33,7 @@
/// No assessment for the failure mechanism section has been performed.
///
[ResourcesDisplayName(typeof(Resources), "AssessmentLayerTwoAResult_NotCalculated")]
- NotCalculated = 1,
+ NotCalculated,
///
/// An assessment for the failure mechanism section was performed and the outcome is
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -rcf913a00f5768780ab2f8bd8d5145069581a8068 -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision cf913a00f5768780ab2f8bd8d5145069581a8068)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -69,7 +69,7 @@
OvertoppingCalculationInput input = CreateInput(calculation, failureMechanismSection, generalInput);
return CalculationServiceHelper.PerformCalculation(calculation.Name,
- () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, input),
+ () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All, input),
Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_grass_cover_erosion_inwards_0_calculation);
}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -68,7 +68,7 @@
{
var input = CreateInput(calculation, failureMechanismSection, generalInput);
return CalculationServiceHelper.PerformCalculation(calculation.Name,
- () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, input),
+ () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All, input),
Resources.HeightStructuresCalculationService_Calculate_Error_in_height_structures_0_calculation);
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs
===================================================================
diff -u -ra402883a94b7028014ba24227e4151176ccdbd6b -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs (.../HydraRingDeviationType.cs) (revision a402883a94b7028014ba24227e4151176ccdbd6b)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs (.../HydraRingDeviationType.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -29,7 +29,7 @@
///
public enum HydraRingDeviationType
{
- Standard = 1,
- Variation = 0
+ Variation = 0,
+ Standard = 1
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs
===================================================================
diff -u -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs (.../HydraRingTimeIntegrationSchemeType.cs) (revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs (.../HydraRingTimeIntegrationSchemeType.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -30,18 +30,18 @@
public enum HydraRingTimeIntegrationSchemeType
{
///
- /// Ferry Borges Castanheta time integration scheme.
+ /// Ferry Borges Castanheta (FBC) time integration scheme.
///
- FBC = 1,
+ FerryBorgesCastanheta = 1,
///
- /// Arbitrary Point in Time time integration scheme.
+ /// Arbitrary Point in Time (APT) time integration scheme.
///
- APT = 2,
+ ArbitraryPointInTime = 2,
///
- /// Numerical Time Integration time integration scheme.
+ /// Numerical Time Integration time (NTI) integration scheme.
///
- NTI = 3
+ NumericalTimeIntegration = 3
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs
===================================================================
diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs (.../HydraRingUncertaintiesType.cs) (revision dd33f3b9d039c570742b8233da23326538c848cf)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs (.../HydraRingUncertaintiesType.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -29,9 +29,24 @@
///
public enum HydraRingUncertaintiesType
{
- None = 0, // "No uncertainties"
- All = 1, // "All uncertainties"
- Model = 2, // "Only model uncertainties"
- Statistic = 3 // "Only statistical uncertainties"
+ ///
+ /// No uncertainties.
+ ///
+ None = 0,
+
+ ///
+ /// All uncertainties.
+ ///
+ All = 1,
+
+ ///
+ /// Only model uncertainties.
+ ///
+ Model = 2,
+
+ ///
+ /// Only statistical uncertainties.
+ ///
+ Statistic = 3
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingTimeIntegrationSchemeTypeTest.cs
===================================================================
diff -u -r759de5bbd411b0140aa72d2887a026f3e4b3eb97 -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingTimeIntegrationSchemeTypeTest.cs (.../HydraRingTimeIntegrationSchemeTypeTest.cs) (revision 759de5bbd411b0140aa72d2887a026f3e4b3eb97)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingTimeIntegrationSchemeTypeTest.cs (.../HydraRingTimeIntegrationSchemeTypeTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -37,9 +37,9 @@
[Test]
public void ConvertToInteger_ForAllValues_ReturnsExpectedInteger()
{
- Assert.AreEqual(1, (int) HydraRingTimeIntegrationSchemeType.FBC);
- Assert.AreEqual(2, (int) HydraRingTimeIntegrationSchemeType.APT);
- Assert.AreEqual(3, (int) HydraRingTimeIntegrationSchemeType.NTI);
+ Assert.AreEqual(1, (int) HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta);
+ Assert.AreEqual(2, (int) HydraRingTimeIntegrationSchemeType.ArbitraryPointInTime);
+ Assert.AreEqual(3, (int) HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -37,7 +37,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithAssessmentLevelCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
hydraRingConfigurationService.AddHydraRingCalculationInput(new AssessmentLevelCalculationInput(1, 700004, 10000));
@@ -104,7 +104,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithOvertoppingCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
const int hydraulicBoundaryLocationId = 700004;
var hydraRingSection = new HydraRingSection(1, "700004", 2.2, 3.3);
@@ -215,7 +215,7 @@
public void GenerateDataBaseCreationScript_HydraRingConfigurationWithStructuresOvertoppingCalculationCalculation_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All);
const int hydraulicBoundaryLocationId = 700004;
var hydraRingSection = new HydraRingSection(1, "700004", 2.2, 3.3);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -ra402883a94b7028014ba24227e4151176ccdbd6b -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision a402883a94b7028014ba24227e4151176ccdbd6b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -36,19 +36,19 @@
public void Constructor_ExpectedValues()
{
// Call
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NTI, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
// Assert
Assert.AreEqual("34-1", hydraRingConfigurationService.RingId);
- Assert.AreEqual(HydraRingTimeIntegrationSchemeType.NTI, hydraRingConfigurationService.TimeIntegrationSchemeType);
+ Assert.AreEqual(HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, hydraRingConfigurationService.TimeIntegrationSchemeType);
Assert.AreEqual(HydraRingUncertaintiesType.Model, hydraRingConfigurationService.UncertaintiesType);
}
[Test]
public void AddHydraRingCalculationInput_DuplicateSectionId_ThrowsArgumentException()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NTI, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
var calculationInput1 = new HydraRingCalculationInputImplementation(1, 2);
var calculationInput2 = new HydraRingCalculationInputImplementation(1, 3);
@@ -65,7 +65,7 @@
public void GenerateDataBaseCreationScript_SingleHydraRingCalculationInputAddedToConfiguration_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NTI, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004));
@@ -145,7 +145,7 @@
public void GenerateDataBaseCreationScript_MultipleHydraRingCalculationInputsAddedToConfiguration_ReturnsExpectedCreationScript()
{
// Setup
- var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NTI, HydraRingUncertaintiesType.Model);
+ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingTimeIntegrationSchemeType.NumericalTimeIntegration, HydraRingUncertaintiesType.Model);
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004));
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(2, 700005));
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -81,7 +81,7 @@
var input = CreateInput(assessmentSection, hydraulicBoundaryLocation);
return CalculationServiceHelper.PerformCalculation(hydraulicBoundaryLocation.Id.ToString(),
- () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, input),
+ () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FerryBorgesCastanheta, HydraRingUncertaintiesType.All, input),
Resources.DesignWaterLevelCalculationService_Calculate_Error_in_design_water_level_0_calculation);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/DuneErosionFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -58,7 +58,7 @@
Assert.IsInstanceOf(result);
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -59,7 +59,7 @@
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
Assert.IsFalse(result.AssessmentLayerOne);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -59,7 +59,7 @@
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
Assert.IsFalse(result.AssessmentLayerOne);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -59,7 +59,7 @@
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
Assert.IsFalse(result.AssessmentLayerOne);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs (.../MicrostabilityFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs (.../MicrostabilityFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -59,7 +59,7 @@
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
Assert.IsFalse(result.AssessmentLayerOne);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultTest.cs (.../PipingStructureFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/PipingStructureFailureMechanismSectionResultTest.cs (.../PipingStructureFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -59,7 +59,7 @@
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
Assert.IsFalse(result.AssessmentLayerOne);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StabilityStoneCoverFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rc482712c0ff06d5654836fc8d9af535641d63ffb -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision c482712c0ff06d5654836fc8d9af535641d63ffb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -58,7 +58,7 @@
Assert.IsInstanceOf(result);
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
- Assert.AreEqual((AssessmentLayerTwoAResult)0, result.AssessmentLayerTwoA);
+ Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.AreEqual(0, result.AssessmentLayerThree.Value);
Assert.AreEqual(0, result.StorageId);
}
Fisheye: Tag e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationResult.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj
===================================================================
diff -u -re568165b751acf8d72cdf0d128f76d7792dadb56 -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj (.../Ringtoets.Piping.Service.csproj) (revision e568165b751acf8d72cdf0d128f76d7792dadb56)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj (.../Ringtoets.Piping.Service.csproj) (revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
@@ -55,7 +55,6 @@
Properties\GlobalAssembly.cs
-