Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs (.../IHydraulicBoundaryLocationCalculationGuiService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs (.../IHydraulicBoundaryLocationCalculationGuiService.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -35,7 +35,7 @@
///
/// Performs the calculation for all .
///
- /// The HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The objects to calculate
/// the for.
/// The norm to use during the calculation.
@@ -51,7 +51,7 @@
///
/// Performs the calculation for all .
///
- /// The HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The objects to calculate
/// the for.
/// The norm to use during the calculation.
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -42,7 +42,7 @@
/// Creates a new instance of .
///
/// The to perform the calculation for.
- /// The HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The norm to use during the calculation.
/// The provider of the messages to use during the calculation.
/// Thrown when or
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -42,7 +42,7 @@
/// Creates a new instance of .
///
/// The to perform the calculation for.
- /// The HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The norm to use during the calculation.
/// The provider of the messages to use during the calculation.
/// Thrown when
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -56,7 +56,7 @@
/// The objects to perform the calculation for.
/// The
/// that holds information about the contribution and the general inputs used in the calculation.
- /// The HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The norm to use during the calculation.
/// Thrown when any parameter is null.
public void Calculate(IEnumerable locations,
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs (.../DuneErosionBoundaryCalculationActivity.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs (.../DuneErosionBoundaryCalculationActivity.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -43,7 +43,7 @@
/// The to perform the calculation for.
/// The that holds information about the contribution and
/// the general inputs used in the calculation.
- /// The HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The norm to use during the calculation.
/// Thrown when any parameter is null.
public DuneErosionBoundaryCalculationActivity(DuneLocation duneLocation,
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -78,7 +78,7 @@
{
Contribution = 10
};
- var mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(1.0/200);
+ double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(1.0/200);
var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -127,7 +127,7 @@
return;
}
- var mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
+ double mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
bool successfulCalculation = CalculationGuiService.CalculateDesignWaterLevels(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
locations,
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -119,7 +119,7 @@
return;
}
- var mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
+ double mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
bool successFullCalculation = CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
locations,
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -504,7 +504,7 @@
IAssessmentSection assessmentSection = nodeData.AssessmentSection;
GrassCoverErosionOutwardsFailureMechanism failureMechanism = nodeData.FailureMechanism;
- var mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(
assessmentSection.HydraulicBoundaryDatabase.FilePath,
@@ -560,7 +560,7 @@
return;
}
- var mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(
assessmentSection.HydraulicBoundaryDatabase.FilePath,
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -21,6 +21,7 @@
using System;
using System.Linq;
+using Core.Common.Base.Data;
using Core.Common.IO.Exceptions;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Service;
@@ -111,10 +112,10 @@
CalculationServiceHelper.LogCalculationBeginTime(calculationName);
- var a = failureMechanism.GeneralInput.GeneralWaveConditionsInput.A;
- var b = failureMechanism.GeneralInput.GeneralWaveConditionsInput.B;
- var c = failureMechanism.GeneralInput.GeneralWaveConditionsInput.C;
- var mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ RoundedDouble a = failureMechanism.GeneralInput.GeneralWaveConditionsInput.A;
+ RoundedDouble b = failureMechanism.GeneralInput.GeneralWaveConditionsInput.B;
+ RoundedDouble c = failureMechanism.GeneralInput.GeneralWaveConditionsInput.C;
+ double mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count();
try
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r74e4e0c7b938a3c3080ff6b4a09eb01a961fed6a -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 74e4e0c7b938a3c3080ff6b4a09eb01a961fed6a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -407,7 +407,7 @@
Assert.AreEqual(testDataPath, testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory);
Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
- var expectedProbability = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
+ double expectedProbability = failureMechanism.GetMechanismSpecificNorm(assessmentSection);
Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(expectedProbability), designWaterLevelCalculationInput.Beta);
}
}
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r3b6dd3cc6948e3870c372c7299bda5fbd5d969a3
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 3b6dd3cc6948e3870c372c7299bda5fbd5d969a3)
@@ -74,7 +74,7 @@
///
/// The input of the calculation.
/// The name of the calculation.
- /// The directory of the HLCD file that should be used for performing the calculation.
+ /// The hydraulic boundary database file that should be used for performing the calculation.
/// The name of the design water level property.
/// True if has no validation errors; False otherwise.
/// Thrown when