Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -rbabec62dabf2b28efe0151887472b0756f59a6ce -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision babec62dabf2b28efe0151887472b0756f59a6ce)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -1,18 +1,18 @@
-// Copyright (C) Stichting Deltares 2019. All rights reserved.
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
//
// This file is part of Riskeer.
//
// Riskeer is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
+// 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 Lesser General Public License for more details.
+// GNU General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public License
+// 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
@@ -1615,5 +1615,15 @@
return ResourceManager.GetString("UpdateInfo_Default_category", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ ///
+ public static System.Drawing.Icon warning {
+ get {
+ object obj = ResourceManager.GetObject("warning", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
}
}
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -rbabec62dabf2b28efe0151887472b0756f59a6ce -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision babec62dabf2b28efe0151887472b0756f59a6ce)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -613,4 +613,7 @@
Gegevens zijn geëxporteerd naar bestand '{0}'.
+
+ ..\Resources\warning.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs
===================================================================
diff -u -r877aa4db1dd1b197afcf1ab5bea72fc9c29720e7 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 877aa4db1dd1b197afcf1ab5bea72fc9c29720e7)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -475,11 +475,11 @@
schematizationIncomingFlowCategoryIndex, totalNrOfCategories)]
[ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName))]
[ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_Description))]
- public NormalDistributionProperties DrainCoefficient
+ public LogNormalDistributionProperties DrainCoefficient
{
get
{
- return new NormalDistributionProperties(
+ return new LogNormalDistributionProperties(
DistributionReadOnlyProperties.StandardDeviation,
data.WrappedData.DrainCoefficient,
PropertyChangeHandler);
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -r60f55814ef0249973949c97aab43051b052550fd -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 60f55814ef0249973949c97aab43051b052550fd)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -185,7 +185,7 @@
Mean = (RoundedDouble) 2,
CoefficientOfVariation = (RoundedDouble) 0.1
},
- DrainCoefficient = new NormalDistribution
+ DrainCoefficient = new LogNormalDistribution
{
Mean = (RoundedDouble) 1.1,
StandardDeviation = (RoundedDouble) 0.02
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r29267948fd68ab5728c79a0b519b36887ea57096 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 29267948fd68ab5728c79a0b519b36887ea57096)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -213,7 +213,7 @@
Assert.AreEqual($"De variatiecoëfficiënt voor '{stormDuration}' moet groter zijn dan of gelijk zijn aan 0.", msgs[2]);
Assert.AreEqual($"De verwachtingswaarde voor '{insideWaterLevel}' moet een concreet getal zijn.", msgs[3]);
Assert.AreEqual($"De standaardafwijking voor '{insideWaterLevel}' moet groter zijn dan of gelijk zijn aan 0.", msgs[4]);
- Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficient}' moet een concreet getal zijn.", msgs[5]);
+ Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficient}' moet een positief getal zijn.", msgs[5]);
Assert.AreEqual($"De standaardafwijking voor '{drainCoefficient}' moet groter zijn dan of gelijk zijn aan 0.", msgs[6]);
Assert.AreEqual($"De waarde voor '{factorStormDurationOpenStructure}' moet een concreet getal zijn.", msgs[7]);
Assert.AreEqual($"De verwachtingswaarde voor '{areaFlowApertures}' moet een positief getal zijn.", msgs[8]);
@@ -1157,7 +1157,6 @@
private static void SetInvalidInputParameters(ClosingStructuresInput input, RoundedDouble value)
{
input.DeviationWaveDirection = RoundedDouble.NaN;
- input.DrainCoefficient.Mean = value;
input.FactorStormDurationOpenStructure = value;
input.InsideWaterLevel.Mean = value;
input.LevelCrestStructureNotClosing.Mean = value;
@@ -1170,11 +1169,12 @@
{
input.AllowedLevelIncreaseStorage.Mean = RoundedDouble.NaN;
input.AllowedLevelIncreaseStorage.StandardDeviation = RoundedDouble.NaN;
+ input.DrainCoefficient.Mean = RoundedDouble.NaN;
+ input.DrainCoefficient.StandardDeviation = RoundedDouble.NaN;
input.AreaFlowApertures.Mean = RoundedDouble.NaN;
input.AreaFlowApertures.StandardDeviation = RoundedDouble.NaN;
input.CriticalOvertoppingDischarge.Mean = RoundedDouble.NaN;
input.CriticalOvertoppingDischarge.CoefficientOfVariation = RoundedDouble.NaN;
- input.DrainCoefficient.StandardDeviation = RoundedDouble.NaN;
input.FlowWidthAtBottomProtection.Mean = RoundedDouble.NaN;
input.FlowWidthAtBottomProtection.StandardDeviation = RoundedDouble.NaN;
input.InsideWaterLevel.StandardDeviation = RoundedDouble.NaN;
@@ -1191,11 +1191,12 @@
{
input.AllowedLevelIncreaseStorage.Mean = value;
input.AllowedLevelIncreaseStorage.StandardDeviation = value;
+ input.DrainCoefficient.Mean = value;
+ input.DrainCoefficient.StandardDeviation = value;
input.AreaFlowApertures.Mean = value;
input.AreaFlowApertures.StandardDeviation = value;
input.CriticalOvertoppingDischarge.Mean = value;
input.CriticalOvertoppingDischarge.CoefficientOfVariation = value;
- input.DrainCoefficient.StandardDeviation = value;
input.FlowWidthAtBottomProtection.Mean = value;
input.FlowWidthAtBottomProtection.StandardDeviation = value;
input.InsideWaterLevel.StandardDeviation = value;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r07370a0bcf299efaec6ad0685788d8bd170df824 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 07370a0bcf299efaec6ad0685788d8bd170df824)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -4417,16 +4417,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
- ///
- public static System.Drawing.Icon warning {
- get {
- object obj = ResourceManager.GetObject("warning", resourceCulture);
- return ((System.Drawing.Icon)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Waterstanden en Golfhoogten.
///
public static string WaterLevel_and_WaveHeight_DisplayName {
@@ -4454,6 +4444,24 @@
}
///
+ /// Looks up a localized string similar to Volumiek gewicht van water..
+ ///
+ public static string WaterVolumetricWeight_Description {
+ get {
+ return ResourceManager.GetString("WaterVolumetricWeight_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Volumiek gewicht van water [kN/m³].
+ ///
+ public static string WaterVolumetricWeight_DisplayName {
+ get {
+ return ResourceManager.GetString("WaterVolumetricWeight_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Berekende belastingen bij verschillende waterstanden.
///
public static string WaveConditionsExporter_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r07370a0bcf299efaec6ad0685788d8bd170df824 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 07370a0bcf299efaec6ad0685788d8bd170df824)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -933,9 +933,6 @@
Er zijn geen berekeningen geselecteerd.
-
- ..\Resources\warning.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Bronlocatie
@@ -1610,4 +1607,10 @@
..\Resources\folder-open-document-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Volumiek gewicht van water [kN/m³]
+
+
+ Volumiek gewicht van water.
+
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj
===================================================================
diff -u -r156d0459ae98bc7a79b056e7b62dccbf3455995c -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj (.../Riskeer.Common.Forms.csproj) (revision 156d0459ae98bc7a79b056e7b62dccbf3455995c)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Riskeer.Common.Forms.csproj (.../Riskeer.Common.Forms.csproj) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -80,6 +80,9 @@
True
Resources.resx
+
+ UserControl
+
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs
===================================================================
diff -u -rdd65da2990c97928228adfc407a0981c87c61331 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs (.../CommonCloneAssert.cs) (revision dd65da2990c97928228adfc407a0981c87c61331)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs (.../CommonCloneAssert.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -101,6 +101,7 @@
public static void AreClones(SubMechanismIllustrationPointStochast original, SubMechanismIllustrationPointStochast clone)
{
AreClones((Stochast) original, clone);
+ Assert.AreEqual(original.Unit, clone.Unit);
Assert.AreEqual(original.Realization, clone.Realization);
}
@@ -157,6 +158,7 @@
public static void AreClones(IllustrationPointResult original, IllustrationPointResult clone)
{
Assert.AreEqual(original.Description, clone.Description);
+ Assert.AreEqual(original.Unit, clone.Unit);
Assert.AreEqual(original.Value, clone.Value);
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs
===================================================================
diff -u -r80681c7cdb8847879e6111abdd889401c16b0474 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs (.../IllustrationPointNodeConverterTest.cs) (revision 80681c7cdb8847879e6111abdd889401c16b0474)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs (.../IllustrationPointNodeConverterTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -52,10 +52,10 @@
public void Convert_HydraRingIllustrationPointTreeNodeNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate test = () => IllustrationPointNodeConverter.Convert(null);
+ void Call() => IllustrationPointNodeConverter.Convert(null);
// Assert
- var exception = Assert.Throws(test);
+ var exception = Assert.Throws(Call);
Assert.AreEqual("hydraRingIllustrationPointTreeNode", exception.ParamName);
}
@@ -92,8 +92,8 @@
public void Convert_TreeNodeWithoutChildrenAndSubMechanismIllustrationPointData_ReturnIllustrationPointNode()
{
// Setup
- var hydraRingStochast = new HydraRingSubMechanismIllustrationPointStochast("stochast", 1, 2, 3);
- var hydraRingIllustrationPointResult = new HydraRingIllustrationPointResult("description", 4);
+ var hydraRingStochast = new HydraRingSubMechanismIllustrationPointStochast("stochast", "[-]", 1, 2, 3);
+ var hydraRingIllustrationPointResult = new HydraRingIllustrationPointResult("description", "[-]",4);
var hydraRingSubMechanismIllustrationPoint = new HydraRingSubMechanismIllustrationPoint(
"point",
new[]
@@ -121,6 +121,7 @@
IllustrationPointResult result = subMechanismIllustrationPointTreeNodeData.IllustrationPointResults.First();
Assert.AreEqual(hydraRingStochast.Name, stochast.Name);
+ Assert.AreEqual(hydraRingStochast.Unit, stochast.Unit);
Assert.AreEqual(hydraRingStochast.Duration, stochast.Duration, stochast.Duration.GetAccuracy());
Assert.AreEqual(hydraRingStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy());
Assert.AreEqual(hydraRingStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy());
@@ -198,12 +199,12 @@
IllustrationPointNode illustrationPointNode = null;
// Call
- TestDelegate call = () => illustrationPointNode = IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode);
+ void Call() => illustrationPointNode = IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode);
// Assert
Assert.IsNull(illustrationPointNode);
- var exception = Assert.Throws(call);
+ var exception = Assert.Throws(Call);
string expectedMessage = $"An illustration point containing a Hydra-Ring data type of {typeof(TestHydraRingIllustrationPointData)} is not supported.";
Assert.AreEqual(expectedMessage, exception.Message);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -131,7 +131,7 @@
{
yield return new DeterministicHydraRingVariable(58, 1.1);
yield return new DeterministicHydraRingVariable(63, 2.2);
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 21.1, 22.2);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, 21.1, 22.2);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 23.3, 24.4);
yield return new DeterministicHydraRingVariable(68, 3.3);
yield return new DeterministicHydraRingVariable(69, 4.4);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -194,7 +194,7 @@
yield return new DeterministicHydraRingVariable(61, 5.5);
yield return new DeterministicHydraRingVariable(63, 6.6);
yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 7.7, 8.8);
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.54, 55.55);
yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, 56.56, 57.57);
yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 9.9, 10.10);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs
===================================================================
diff -u -r773aa3005a70fa9fb34054679eef8a75184021bc -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 773aa3005a70fa9fb34054679eef8a75184021bc)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -194,7 +194,7 @@
yield return new DeterministicHydraRingVariable(61, 5.5);
yield return new DeterministicHydraRingVariable(63, 6.6);
yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 7.7, 8.8);
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.54, 55.55);
yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, 56.56, 57.57);
yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 9.9, 10.10);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r8efbf201390d37758506008e45505dc67cb82e81 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 8efbf201390d37758506008e45505dc67cb82e81)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -1207,7 +1207,7 @@
"DELETE FROM [VariableDatas];" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 58, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 63, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 66, 0, 2, 21.1, 22.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 66, 0, 4, 21.1, 22.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 67, 0, 4, 23.3, 24.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 68, 3.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1632,7 +1632,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 61, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 63, 6.6, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 65, 0, 2, 7.7, 8.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 2, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 4, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 67, 0, 4, 54.4, 55.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 80, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 9.9, 10, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1800,7 +1800,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 61, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 63, 6.6, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 65, 0, 2, 7.7, 8.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 2, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 4, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 67, 0, 4, 54.4, 55.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 81, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 9.9, 10, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -rfd572b1d0d0be95b5218314d9022665514b68caf -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision fd572b1d0d0be95b5218314d9022665514b68caf)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -173,7 +173,7 @@
Name = Resources.MacroStabilityInwardsCalculationExporter_DisplayName,
Extension = Resources.Stix_file_filter_extension,
CreateFileExporter = (context, filePath) => new MacroStabilityInwardsCalculationExporter(
- context.WrappedData, new PersistenceFactory(), filePath,
+ context.WrappedData, context.FailureMechanism.GeneralInput, new PersistenceFactory(), filePath,
() => GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData)),
IsEnabled = context => context.WrappedData.HasOutput,
GetExportPath = () => ExportHelper.GetFilePath(GetInquiryHelper(), new FileFilterGenerator(Resources.Stix_file_filter_extension,
@@ -184,7 +184,8 @@
{
Name = Resources.MacroStabilityInwardsCalculationExporter_DisplayName,
Extension = Resources.Stix_file_filter_extension,
- CreateFileExporter = (context, folderPath) => new MacroStabilityInwardsCalculationGroupExporter(context.WrappedData, new PersistenceFactory(), folderPath, Resources.Stix_file_filter_extension,
+ CreateFileExporter = (context, folderPath) => new MacroStabilityInwardsCalculationGroupExporter(context.WrappedData, context.FailureMechanism.GeneralInput,
+ new PersistenceFactory(), folderPath, Resources.Stix_file_filter_extension,
calculation => GetNormativeAssessmentLevel(context.AssessmentSection, calculation)),
IsEnabled = context => context.WrappedData.HasOutput(),
GetExportPath = () => ExportHelper.GetFolderPath(GetInquiryHelper())
@@ -276,6 +277,7 @@
Image = RiskeerCommonFormsResources.GenericInputOutputIcon,
CloseForData = CloseInputViewForData,
CreateInstance = context => new MacroStabilityInwardsInputView(context.MacroStabilityInwardsCalculation,
+ context.FailureMechanism.GeneralInput,
context.AssessmentSection,
() => context.AssessmentSection.GetNormativeHydraulicBoundaryLocationCalculation(context.WrappedData.HydraulicBoundaryLocation))
};
@@ -295,7 +297,7 @@
GetViewName = (view, context) => RiskeerCommonFormsResources.CalculationOutput_DisplayName,
Image = RiskeerCommonFormsResources.GeneralOutputIcon,
CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
- CreateInstance = context => new MacroStabilityInwardsOutputView(context.WrappedData,
+ CreateInstance = context => new MacroStabilityInwardsOutputView(context.WrappedData, context.FailureMechanism.GeneralInput,
() => GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData))
};
@@ -431,11 +433,11 @@
return assessmentSection.GetNormativeAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation);
}
- private static void ValidateAll(IEnumerable calculations, IAssessmentSection assessmentSection)
+ private static void ValidateAll(IEnumerable calculations, GeneralMacroStabilityInwardsInput generalInput, IAssessmentSection assessmentSection)
{
foreach (MacroStabilityInwardsCalculation calculation in calculations)
{
- MacroStabilityInwardsCalculationService.Validate(calculation, GetNormativeAssessmentLevel(assessmentSection, calculation));
+ MacroStabilityInwardsCalculationService.Validate(calculation, generalInput, GetNormativeAssessmentLevel(assessmentSection, calculation));
}
}
@@ -684,14 +686,14 @@
private static void ValidateAllInFailureMechanism(MacroStabilityInwardsFailureMechanismContext context)
{
- ValidateAll(context.WrappedData.Calculations.OfType(), context.Parent);
+ ValidateAll(context.WrappedData.Calculations.OfType(), context.WrappedData.GeneralInput, context.Parent);
}
private void CalculateAllInFailureMechanism(MacroStabilityInwardsFailureMechanismContext context)
{
ActivityProgressDialogRunner.Run(
Gui.MainWindow,
- MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.Parent));
+ MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.WrappedData.GeneralInput, context.Parent));
}
#endregion
@@ -862,14 +864,15 @@
private static void ValidateAllInCalculationGroup(MacroStabilityInwardsCalculationGroupContext context)
{
- ValidateAll(context.WrappedData.GetCalculations().OfType(), context.AssessmentSection);
+ ValidateAll(context.WrappedData.GetCalculations().OfType(), context.FailureMechanism.GeneralInput, context.AssessmentSection);
}
private void CalculateAllInCalculationGroup(MacroStabilityInwardsCalculationGroupContext context)
{
ActivityProgressDialogRunner.Run(
Gui.MainWindow,
MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData,
+ context.FailureMechanism.GeneralInput,
context.AssessmentSection));
}
@@ -939,14 +942,15 @@
private static void Validate(MacroStabilityInwardsCalculationScenarioContext context)
{
- MacroStabilityInwardsCalculationService.Validate(context.WrappedData, GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData));
+ MacroStabilityInwardsCalculationService.Validate(context.WrappedData, context.FailureMechanism.GeneralInput, GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData));
}
private void Calculate(MacroStabilityInwardsCalculationScenarioContext context)
{
ActivityProgressDialogRunner.Run(
Gui.MainWindow,
MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
+ context.FailureMechanism.GeneralInput,
context.AssessmentSection));
}
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs
===================================================================
diff -u -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -73,6 +73,7 @@
// Call
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -101,29 +102,43 @@
mocks.ReplayAll();
// Call
- TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(null,
- AssessmentSectionTestHelper.GetTestAssessmentLevel(),
- propertyChangeHandler);
+ void Call() => new MacroStabilityInwardsWaterStressesProperties(null, new GeneralMacroStabilityInwardsInput(), AssessmentSectionTestHelper.GetTestAssessmentLevel(), propertyChangeHandler);
// Assert
- var exception = Assert.Throws(call);
+ var exception = Assert.Throws(Call);
Assert.AreEqual("data", exception.ParamName);
mocks.VerifyAll();
}
+
+ [Test]
+ public void Constructor_GeneralInputNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
+ var mocks = new MockRepository();
+ var propertyChangeHandler = mocks.Stub();
+ mocks.ReplayAll();
+ // Call
+ void Call() => new MacroStabilityInwardsWaterStressesProperties(input, null, AssessmentSectionTestHelper.GetTestAssessmentLevel(), propertyChangeHandler);
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("generalInput", exception.ParamName);
+ mocks.VerifyAll();
+ }
+
[Test]
public void Constructor_PropertyChangeHandlerNull_ThrowsArgumentNullException()
{
// Setup
var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
// Call
- TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(input,
- AssessmentSectionTestHelper.GetTestAssessmentLevel(),
- null);
+ void Call() => new MacroStabilityInwardsWaterStressesProperties(input, new GeneralMacroStabilityInwardsInput(), AssessmentSectionTestHelper.GetTestAssessmentLevel(), null);
// Assert
- var exception = Assert.Throws(call);
+ var exception = Assert.Throws(Call);
Assert.AreEqual("propertyChangeHandler", exception.ParamName);
}
@@ -139,6 +154,7 @@
// Call
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -274,7 +290,7 @@
MacroStabilityInwardsInput input = calculation.InputParameters;
// Call
- var properties = new MacroStabilityInwardsWaterStressesProperties(input, assessmentLevel, propertyChangeHandler);
+ var properties = new MacroStabilityInwardsWaterStressesProperties(input, new GeneralMacroStabilityInwardsInput(), assessmentLevel, propertyChangeHandler);
// Assert
Assert.AreEqual(input.WaterLevelRiverAverage, properties.WaterLevelRiverAverage);
@@ -315,7 +331,8 @@
MacroStabilityInwardsInput input = calculation.InputParameters;
var propertyChangeHandler = new ObservablePropertyChangeHandler(calculation, input);
- var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -478,6 +495,7 @@
DikeSoilScenario = MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand
};
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -507,6 +525,7 @@
DikeSoilScenario = MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand
};
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -538,6 +557,7 @@
DikeSoilScenario = dikeSoilScenario
};
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -564,6 +584,7 @@
var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties());
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
@@ -591,6 +612,7 @@
});
var properties = new MacroStabilityInwardsWaterStressesProperties(input,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel(),
propertyChangeHandler);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r0f980b031fc6a5d44beed5dfedd59bc3abf58452 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 0f980b031fc6a5d44beed5dfedd59bc3abf58452)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -55,7 +55,7 @@
public void Validate_CalculationNull_ThrowArgumentNullException()
{
// Call
- void Call() => MacroStabilityInwardsCalculationService.Validate(null, RoundedDouble.NaN);
+ void Call() => MacroStabilityInwardsCalculationService.Validate(null, new GeneralMacroStabilityInwardsInput(), RoundedDouble.NaN);
// Assert
var exception = Assert.Throws(Call);
@@ -69,7 +69,7 @@
using (new MacroStabilityInwardsCalculatorFactoryConfig())
{
// Call
- void Call() => MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => MacroStabilityInwardsCalculationService.Validate(testCalculation, new GeneralMacroStabilityInwardsInput(),AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -93,6 +93,7 @@
// Call
bool isValid = MacroStabilityInwardsCalculationService.Validate(invalidMacroStabilityInwardsCalculation,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
@@ -108,7 +109,7 @@
var isValid = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(calculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(calculation, new GeneralMacroStabilityInwardsInput(), AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -135,7 +136,9 @@
calculator.LastCreatedUpliftVanCalculator.ReturnValidationError = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -163,7 +166,9 @@
calculator.LastCreatedUpliftVanCalculator.ReturnValidationWarning = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -192,7 +197,9 @@
calculator.LastCreatedUpliftVanCalculator.ReturnValidationError = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -222,7 +229,9 @@
calculator.LastCreatedWaternetExtremeCalculator.ReturnValidationError = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -252,7 +261,9 @@
calculator.LastCreatedWaternetExtremeCalculator.ReturnValidationWarning = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -284,7 +295,9 @@
calculator.LastCreatedWaternetExtremeCalculator.ReturnValidationError = true;
// Call
- void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => isValid = MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -314,7 +327,9 @@
calculatorFactory.LastCreatedUpliftVanCalculator.ThrowExceptionOnValidate = true;
// Call
- void Call() => MacroStabilityInwardsCalculationService.Validate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(Call, tuples =>
@@ -342,7 +357,9 @@
using (new MacroStabilityInwardsCalculatorFactoryConfig())
{
// Call
- MacroStabilityInwardsCalculationService.Validate(testCalculation, normativeAssessmentLevel);
+ MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ normativeAssessmentLevel);
// Assert
RoundedDouble expectedAssessmentLevel = useAssessmentLevelManualInput
@@ -361,7 +378,9 @@
public void Calculate_CalculationNull_ThrowArgumentNullException()
{
// Call
- void Call() => MacroStabilityInwardsCalculationService.Calculate(null, RoundedDouble.NaN);
+ void Call() => MacroStabilityInwardsCalculationService.Calculate(null,
+ new GeneralMacroStabilityInwardsInput(),
+ RoundedDouble.NaN);
// Assert
var exception = Assert.Throws(Call);
@@ -379,10 +398,12 @@
void Call()
{
// Precondition
- Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation, normativeAssessmentLevel));
+ Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ normativeAssessmentLevel));
// Call
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), normativeAssessmentLevel);
}
// Assert
@@ -411,10 +432,12 @@
using (new MacroStabilityInwardsCalculatorFactoryConfig())
{
// Precondition
- Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation, normativeAssessmentLevel));
+ Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ normativeAssessmentLevel));
// Call
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), normativeAssessmentLevel);
// Assert
Assert.AreNotSame(output, testCalculation.Output);
@@ -435,6 +458,7 @@
{
// Call
MacroStabilityInwardsCalculationService.Calculate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
@@ -468,6 +492,7 @@
{
// Call
MacroStabilityInwardsCalculationService.Calculate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
@@ -514,6 +539,7 @@
{
// Call
MacroStabilityInwardsCalculationService.Calculate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
@@ -551,6 +577,7 @@
{
// Call
MacroStabilityInwardsCalculationService.Calculate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
@@ -582,7 +609,9 @@
using (new MacroStabilityInwardsCalculatorFactoryConfig())
{
// Call
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance)
@@ -616,7 +645,9 @@
using (new MacroStabilityInwardsCalculatorFactoryConfig())
{
// Call
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ normativeAssessmentLevel);
// Assert
RoundedDouble expectedAssessmentLevel = useAssessmentLevelManualInput
@@ -638,10 +669,12 @@
var calculatorFactory = (TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance;
// Precondition
- Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation, normativeAssessmentLevel));
+ Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ normativeAssessmentLevel));
// Call
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), normativeAssessmentLevel);
// Assert
AssertOutput(calculatorFactory.LastCreatedUpliftVanCalculator.Output, testCalculation.Output);
@@ -661,7 +694,9 @@
calculatorFactory.LastCreatedUpliftVanCalculator.ReturnCalculationError = true;
// Precondition
- Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation, normativeAssessmentLevel));
+ Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation,
+ new GeneralMacroStabilityInwardsInput(),
+ normativeAssessmentLevel));
var exceptionThrown = false;
@@ -670,7 +705,7 @@
{
try
{
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), normativeAssessmentLevel);
}
catch (UpliftVanCalculatorException)
{
@@ -719,7 +754,7 @@
{
try
{
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), AssessmentSectionTestHelper.GetTestAssessmentLevel());
}
catch (UpliftVanCalculatorException)
{
@@ -763,7 +798,7 @@
calculator.LastCreatedUpliftVanCalculator.ReturnCalculationWarning = true;
// Call
- void Call() => MacroStabilityInwardsCalculationService.Calculate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ void Call() => MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), AssessmentSectionTestHelper.GetTestAssessmentLevel());
// Assert
TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(Call, messages =>
@@ -807,7 +842,7 @@
{
try
{
- MacroStabilityInwardsCalculationService.Calculate(testCalculation, AssessmentSectionTestHelper.GetTestAssessmentLevel());
+ MacroStabilityInwardsCalculationService.Calculate(testCalculation, new GeneralMacroStabilityInwardsInput(), AssessmentSectionTestHelper.GetTestAssessmentLevel());
}
catch (UpliftVanCalculatorException)
{
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r49f869d57d02dab67341714eae6c842b9dc80960 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 49f869d57d02dab67341714eae6c842b9dc80960)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -289,24 +289,6 @@
}
///
- /// Looks up a localized string similar to Volumiek gewicht van water..
- ///
- public static string GeneralPipingInput_WaterVolumetricWeight_Description {
- get {
- return ResourceManager.GetString("GeneralPipingInput_WaterVolumetricWeight_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Volumiek gewicht van water [kN/m³].
- ///
- public static string GeneralPipingInput_WaterVolumetricWeight_DisplayName {
- get {
- return ResourceManager.GetString("GeneralPipingInput_WaterVolumetricWeight_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Sleepkrachtfactor volgens White..
///
public static string GeneralPipingInput_WhitesDragCoefficient_Description {
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r49f869d57d02dab67341714eae6c842b9dc80960 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 49f869d57d02dab67341714eae6c842b9dc80960)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -213,12 +213,6 @@
Kinematische viscositeit van water bij 10° C [m²/s]
-
- Volumiek gewicht van water.
-
-
- Volumiek gewicht van water [kN/m³]
-
Sleepkrachtfactor volgens White.
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs
===================================================================
diff -u -rda4400b6eb2326e3e04089607658b020f9be28f6 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -233,8 +233,8 @@
[DynamicVisible]
[PropertyOrder(waterVolumetricWeightPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.GeneralPipingInput_WaterVolumetricWeight_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.GeneralPipingInput_WaterVolumetricWeight_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.WaterVolumetricWeight_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.WaterVolumetricWeight_Description))]
public RoundedDouble WaterVolumetricWeight
{
get
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r61d18d1cceb25d93556b03be9f7e3ff978ebda7a -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 61d18d1cceb25d93556b03be9f7e3ff978ebda7a)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -214,7 +214,7 @@
}
///
- /// Looks up a localized string similar to Als ondergrondschematisaties wijzigen door het bijwerken, dan worden de resultaten van berekeningen die deze ondergrondschematisaties gebruiken verwijderd.
+ /// Looks up a localized string similar to Als stochastische ondergrondmodellen wijzigen door het bijwerken, dan worden de resultaten van berekeningen die deze stochastische ondergrondmodellen gebruiken verwijderd.
///
///Weet u zeker dat u wilt doorgaan?.
///
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/Properties/Resources.resx
===================================================================
diff -u -r61d18d1cceb25d93556b03be9f7e3ff978ebda7a -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 61d18d1cceb25d93556b03be9f7e3ff978ebda7a)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -154,7 +154,7 @@
Weet u zeker dat u wilt doorgaan?
- Als ondergrondschematisaties wijzigen door het bijwerken, dan worden de resultaten van berekeningen die deze ondergrondschematisaties gebruiken verwijderd.
+ Als stochastische ondergrondmodellen wijzigen door het bijwerken, dan worden de resultaten van berekeningen die deze stochastische ondergrondmodellen gebruiken verwijderd.
Weet u zeker dat u wilt doorgaan?
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs
===================================================================
diff -u -r264c94b348b33d01eb87d2cdafb4aeef584799f3 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs (.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 264c94b348b33d01eb87d2cdafb4aeef584799f3)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs (.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -205,8 +205,8 @@
bool updatesVerified = updateInfo.VerifyUpdates(context);
// Assert
- string expectedInquiryMessage = "Als ondergrondschematisaties wijzigen door het bijwerken, " +
- "dan worden de resultaten van berekeningen die deze ondergrondschematisaties gebruiken " +
+ string expectedInquiryMessage = "Als stochastische ondergrondmodellen wijzigen door het bijwerken, " +
+ "dan worden de resultaten van berekeningen die deze stochastische ondergrondmodellen gebruiken " +
$"verwijderd.{Environment.NewLine}{Environment.NewLine}Weet u zeker dat u wilt doorgaan?";
Assert.AreEqual(expectedInquiryMessage, textBoxMessage);
Assert.AreEqual(isActionConfirmed, updatesVerified);
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs
===================================================================
diff -u -r877aa4db1dd1b197afcf1ab5bea72fc9c29720e7 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 877aa4db1dd1b197afcf1ab5bea72fc9c29720e7)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -273,8 +273,8 @@
[PropertyOrder(volumicWeightWaterPropertyIndex)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_HydraulicLoads),
hydraulicLoadsCategoryIndex, totalNrOfCategories)]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_VolumicWeightWater_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_VolumicWeightWater_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.WaterVolumetricWeight_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.WaterVolumetricWeight_Description))]
public RoundedDouble VolumicWeightWater
{
get
@@ -561,11 +561,11 @@
schematizationIncomingFlowCategoryIndex, totalNrOfCategories)]
[ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName))]
[ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_Description))]
- public NormalDistributionProperties DrainCoefficient
+ public LogNormalDistributionProperties DrainCoefficient
{
get
{
- return new NormalDistributionProperties(
+ return new LogNormalDistributionProperties(
DistributionReadOnlyProperties.StandardDeviation,
data.WrappedData.DrainCoefficient,
PropertyChangeHandler);
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -r60f55814ef0249973949c97aab43051b052550fd -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 60f55814ef0249973949c97aab43051b052550fd)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -252,7 +252,7 @@
Mean = (RoundedDouble) 2,
CoefficientOfVariation = (RoundedDouble) 0.1
},
- DrainCoefficient = new NormalDistribution
+ DrainCoefficient = new LogNormalDistribution
{
Mean = (RoundedDouble) 0.1
},
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -r29267948fd68ab5728c79a0b519b36887ea57096 -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 29267948fd68ab5728c79a0b519b36887ea57096)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -318,7 +318,7 @@
Assert.AreEqual($"De standaardafwijking voor '{insideWaterLevelFailureConstructionParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[7]);
Assert.AreEqual($"De verwachtingswaarde voor '{flowVelocityStructureClosableParameterName}' moet een concreet getal zijn.", msgs[8]);
Assert.AreEqual($"De variatiecoëfficiënt voor '{flowVelocityStructureClosableParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[9]);
- Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een concreet getal zijn.", msgs[10]);
+ Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een positief getal zijn.", msgs[10]);
Assert.AreEqual($"De standaardafwijking voor '{drainCoefficientParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[11]);
Assert.AreEqual($"De waarde voor '{factorStormDurationOpenStructureParameterName}' moet een concreet getal zijn.", msgs[12]);
Assert.AreEqual($"De waarde voor '{structureNormalOrientationParameterName}' moet een concreet getal zijn.", msgs[13]);
@@ -399,7 +399,7 @@
Assert.AreEqual($"De standaardafwijking voor '{insideWaterLevelFailureConstructionParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[7]);
Assert.AreEqual($"De verwachtingswaarde voor '{flowVelocityStructureClosableParameterName}' moet een concreet getal zijn.", msgs[8]);
Assert.AreEqual($"De variatiecoëfficiënt voor '{flowVelocityStructureClosableParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[9]);
- Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een concreet getal zijn.", msgs[10]);
+ Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een positief getal zijn.", msgs[10]);
Assert.AreEqual($"De standaardafwijking voor '{drainCoefficientParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[11]);
Assert.AreEqual($"De waarde voor '{factorStormDurationOpenStructureParameterName}' moet een concreet getal zijn.", msgs[12]);
Assert.AreEqual($"De waarde voor '{structureNormalOrientationParameterName}' moet een concreet getal zijn.", msgs[13]);
@@ -1876,7 +1876,6 @@
input.InsideWaterLevelFailureConstruction.Mean = value;
input.InsideWaterLevel.Mean = value;
input.FlowVelocityStructureClosable.Mean = value;
- input.DrainCoefficient.Mean = value;
input.LevelCrestStructure.Mean = value;
input.ThresholdHeightOpenWeir.Mean = value;
input.ShipMass.Mean = value;
@@ -1933,6 +1932,7 @@
input.InsideWaterLevel.StandardDeviation = value;
input.StormDuration.CoefficientOfVariation = value;
input.FlowVelocityStructureClosable.CoefficientOfVariation = value;
+ input.DrainCoefficient.Mean = value;
input.DrainCoefficient.StandardDeviation = value;
input.LevelCrestStructure.StandardDeviation = value;
input.ThresholdHeightOpenWeir.StandardDeviation = value;
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r3e0ebf71d8d9015968bf707685f45015f387891b -r1416355bd00bdc40ae5ce5eed924cdd127593715
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 3e0ebf71d8d9015968bf707685f45015f387891b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 1416355bd00bdc40ae5ce5eed924cdd127593715)
@@ -469,8 +469,8 @@
private static GeneralResult GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint()
{
- var illustrationPointResult = new IllustrationPointResult("Description of result", 5);
- var subMechanismIllustrationPointStochast = new SubMechanismIllustrationPointStochast("Name of a stochast", 10, 9, 8);
+ var illustrationPointResult = new IllustrationPointResult("Description of result", "[-]", 5);
+ var subMechanismIllustrationPointStochast = new SubMechanismIllustrationPointStochast("Name of a stochast", "[-]", 10, 9, 8);
var illustrationPoint = new SubMechanismIllustrationPoint("Name of illustrationPoint", 3, new[]
{