Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs (.../IHydraulicLocationOutputEntityReadExtensionsTest.cs) (revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs (.../IHydraulicLocationOutputEntityReadExtensionsTest.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -88,11 +88,11 @@
HydraulicBoundaryLocationOutput output = entity.Read();
// Assert
- Assert.AreEqual((RoundedDouble) double.NaN, output.Result);
- Assert.AreEqual(double.NaN, output.TargetProbability);
- Assert.AreEqual((RoundedDouble) double.NaN, output.TargetReliability);
- Assert.AreEqual(double.NaN, output.CalculatedProbability);
- Assert.AreEqual((RoundedDouble) double.NaN, output.CalculatedReliability);
+ Assert.IsNaN(output.Result);
+ Assert.IsNaN(output.TargetProbability);
+ Assert.IsNaN(output.TargetReliability);
+ Assert.IsNaN(output.CalculatedProbability);
+ Assert.IsNaN(output.CalculatedReliability);
Assert.AreEqual(convergence, output.CalculationConvergence);
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs
===================================================================
diff -u -r4550874ecf6de10bb429ddf8edb1b7542a980252 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs) (revision 4550874ecf6de10bb429ddf8edb1b7542a980252)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -27,16 +27,16 @@
using Core.Common.Utils.Attributes;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses
{
///
- /// ViewModel of with
- /// for properties panel.
+ /// ViewModel of with
+ /// for properties panel of the .
///
- [TypeConverter(typeof(ExpandableObjectConverter))]
public class GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties : GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties
{
[PropertyOrder(1)]
@@ -89,9 +89,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output == null
- ? double.NaN
- : output.TargetProbability;
+ return output == null ? double.NaN : output.TargetProbability;
}
}
@@ -105,9 +103,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output != null
- ? output.TargetReliability
- : (RoundedDouble) double.NaN;
+ return output != null ? output.TargetReliability : RoundedDouble.NaN;
}
}
@@ -121,9 +117,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output == null
- ? double.NaN
- : output.CalculatedProbability;
+ return output == null ? double.NaN : output.CalculatedProbability;
}
}
@@ -137,7 +131,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output != null ? output.CalculatedReliability : (RoundedDouble) double.NaN;
+ return output != null ? output.CalculatedReliability : RoundedDouble.NaN;
}
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -33,7 +33,8 @@
/// ViewModel of for properties panel.
///
[TypeConverter(typeof(ExpandableObjectConverter))]
- public abstract class GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties : ObjectProperties
+ public abstract class GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties :
+ ObjectProperties
{
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryDatabase_Location_Id_DisplayName")]
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs
===================================================================
diff -u -r4550874ecf6de10bb429ddf8edb1b7542a980252 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs (.../GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs) (revision 4550874ecf6de10bb429ddf8edb1b7542a980252)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs (.../GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -27,14 +27,15 @@
using Core.Common.Utils.Attributes;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses
{
///
- /// ViewModel of with
- /// for properties panel.
+ /// ViewModel of with
+ /// for properties panel of the .
///
public class GrassCoverErosionOutwardsWaveHeightLocationContextProperties : GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties
{
@@ -88,9 +89,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output == null
- ? double.NaN
- : output.TargetProbability;
+ return output == null ? double.NaN : output.TargetProbability;
}
}
@@ -104,9 +103,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output != null
- ? output.TargetReliability
- : (RoundedDouble)double.NaN;
+ return output != null ? output.TargetReliability : RoundedDouble.NaN;
}
}
@@ -120,9 +117,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output == null
- ? double.NaN
- : output.CalculatedProbability;
+ return output == null ? double.NaN : output.CalculatedProbability;
}
}
@@ -136,7 +131,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output != null ? output.CalculatedReliability : (RoundedDouble)double.NaN;
+ return output != null ? output.CalculatedReliability : RoundedDouble.NaN;
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs
===================================================================
diff -u -r4550874ecf6de10bb429ddf8edb1b7542a980252 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs (.../DesignWaterLevelLocationContextProperties.cs) (revision 4550874ecf6de10bb429ddf8edb1b7542a980252)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs (.../DesignWaterLevelLocationContextProperties.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -87,9 +87,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output == null
- ? double.NaN
- : output.TargetProbability;
+ return output == null ? double.NaN : output.TargetProbability;
}
}
@@ -103,9 +101,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output != null
- ? output.TargetReliability
- : (RoundedDouble) double.NaN;
+ return output != null ? output.TargetReliability : RoundedDouble.NaN;
}
}
@@ -119,9 +115,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output == null
- ? double.NaN
- : output.CalculatedProbability;
+ return output == null ? double.NaN : output.CalculatedProbability;
}
}
@@ -135,7 +129,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.DesignWaterLevelOutput;
- return output != null ? output.CalculatedReliability : (RoundedDouble) double.NaN;
+ return output != null ? output.CalculatedReliability : RoundedDouble.NaN;
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs
===================================================================
diff -u -r4550874ecf6de10bb429ddf8edb1b7542a980252 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs (.../WaveHeightLocationContextProperties.cs) (revision 4550874ecf6de10bb429ddf8edb1b7542a980252)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs (.../WaveHeightLocationContextProperties.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -87,9 +87,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output == null
- ? double.NaN
- : output.TargetProbability;
+ return output == null ? double.NaN : output.TargetProbability;
}
}
@@ -103,9 +101,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output != null
- ? output.TargetReliability
- : (RoundedDouble) double.NaN;
+ return output != null ? output.TargetReliability : RoundedDouble.NaN;
}
}
@@ -119,9 +115,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output == null
- ? double.NaN
- : output.CalculatedProbability;
+ return output == null ? double.NaN : output.CalculatedProbability;
}
}
@@ -135,7 +129,7 @@
get
{
HydraulicBoundaryLocationOutput output = data.HydraulicBoundaryLocation.WaveHeightOutput;
- return output != null ? output.CalculatedReliability : (RoundedDouble) double.NaN;
+ return output != null ? output.CalculatedReliability : RoundedDouble.NaN;
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f)
@@ -191,7 +191,8 @@
/// All objects affected by the operation.
/// Thrown when
/// or is null.
- public static IEnumerable ClearHydraulicBoundaryLocationOutput(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+ public static IEnumerable ClearHydraulicBoundaryLocationOutput(HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
+ GrassCoverErosionOutwardsFailureMechanism failureMechanism)
{
if (hydraulicBoundaryDatabase == null)
{
@@ -203,7 +204,8 @@
}
return RingtoetsCommonDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(failureMechanism.HydraulicBoundaryLocations)
- .Concat(RingtoetsCommonDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(hydraulicBoundaryDatabase.Locations))
+ .Concat(RingtoetsCommonDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(
+ hydraulicBoundaryDatabase.Locations))
.ToArray();
}