Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r56f49fd6924c36df10f9b41247ce9a1f5ea0c790 -r3ef29576f648d550db4fd66d986da3c2f0522b2d
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 56f49fd6924c36df10f9b41247ce9a1f5ea0c790)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3ef29576f648d550db4fd66d986da3c2f0522b2d)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerDistributionHelper.cs
===================================================================
diff -u -rec201316303aa676976655dcdfd9285dcc3ec4f1 -r3ef29576f648d550db4fd66d986da3c2f0522b2d
--- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerDistributionHelper.cs (.../SoilLayerDistributionHelper.cs) (revision ec201316303aa676976655dcdfd9285dcc3ec4f1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerDistributionHelper.cs (.../SoilLayerDistributionHelper.cs) (revision 3ef29576f648d550db4fd66d986da3c2f0522b2d)
@@ -42,7 +42,7 @@
/// Thrown when
/// is null.
/// Thrown when the parameter is not a
- /// log normal distribution with a zero shifty.
+ /// log normal distribution with a zero shift.
public static void ValidateIsNonShiftedLogNormal(long? distributionType, double shift, string parameterName)
{
if (parameterName == null)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerIsAquiferConverter.cs
===================================================================
diff -u -rec201316303aa676976655dcdfd9285dcc3ec4f1 -r3ef29576f648d550db4fd66d986da3c2f0522b2d
--- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerIsAquiferConverter.cs (.../SoilLayerIsAquiferConverter.cs) (revision ec201316303aa676976655dcdfd9285dcc3ec4f1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerIsAquiferConverter.cs (.../SoilLayerIsAquiferConverter.cs) (revision 3ef29576f648d550db4fd66d986da3c2f0522b2d)
@@ -42,13 +42,11 @@
{
if (isAquifer.HasValue)
{
- if (isAquifer < 0.0 + tolerance
- && isAquifer > 0.0 - tolerance)
+ if (Math.Abs(0.0 - isAquifer.Value) < tolerance)
{
return false;
}
- if (isAquifer < 1.0 + tolerance
- && isAquifer > 1.0 - tolerance)
+ if (Math.Abs(1.0 - isAquifer.Value) < tolerance)
{
return true;
}
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilLayerIsAquiferConverterTest.cs
===================================================================
diff -u -rec201316303aa676976655dcdfd9285dcc3ec4f1 -r3ef29576f648d550db4fd66d986da3c2f0522b2d
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilLayerIsAquiferConverterTest.cs (.../SoilLayerIsAquiferConverterTest.cs) (revision ec201316303aa676976655dcdfd9285dcc3ec4f1)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilLayerIsAquiferConverterTest.cs (.../SoilLayerIsAquiferConverterTest.cs) (revision 3ef29576f648d550db4fd66d986da3c2f0522b2d)
@@ -49,11 +49,11 @@
[TestCase(null)]
[TestCase(0.5)]
[TestCase(1.1)]
- [TestCase(1 - 1e-6)]
- [TestCase(1 + 1e-6)]
[TestCase(0.1)]
- [TestCase(0 - 1e-6)]
- [TestCase(0 + 1e-6)]
+ [TestCase(1 - 1e-5)]
+ [TestCase(1 + 1e-5)]
+ [TestCase(0 - 1e-5)]
+ [TestCase(0 + 1e-5)]
[TestCase(double.NaN)]
public void Convert_InvalidValues_ThrowsImportedDataTransformException(double? isAquifer)
{