Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rd345cd556de0034cdff06806280d28dcf86c859b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision d345cd556de0034cdff06806280d28dcf86c859b)
@@ -284,20 +284,21 @@
///
/// Create calculation features based on the provided .
///
- /// The type of the .
- /// The type of the .
+ /// The type of the .
+ /// The type of the .
/// The collection of to create the
/// calculation features for.
/// An array of features or an empty array when is null
/// or empty.
- public static MapFeature[] CreateStructureCalculationsFeatures(IEnumerable> calculations)
- where T : StructuresInputBase, new()
- where TU : StructureBase
+ public static MapFeature[] CreateStructureCalculationsFeatures(
+ IEnumerable> calculations)
+ where TStructuresInput : StructuresInputBase, new()
+ where TStructure : StructureBase
{
if (calculations != null && calculations.Any())
{
- MapCalculationData[] calculationData = calculations.Where(CalculationHasStructureAndHydraulicBoundaryLocation)
- .Select(CreatemapCalculationData).ToArray();
+ MapCalculationData[] calculationData = calculations.Where(CalculationHasStructureAndHydraulicBoundaryLocation)
+ .Select(CreatemapCalculationData).ToArray();
return CreateCalculationFeatures(calculationData);
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rd345cd556de0034cdff06806280d28dcf86c859b
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision d345cd556de0034cdff06806280d28dcf86c859b)
@@ -101,7 +101,7 @@
timeIntegrationSettingsForLocationAndCalculationTypeQuery =
$"SELECT {timeIntegrationSchemeIdColumn} " +
- $"FROM TimeIntegrationSettings " +
+ "FROM TimeIntegrationSettings " +
$"WHERE LocationID = {locationIdParameterName} AND CalculationTypeID = {calculationTypeIdParameterName}";
excludedLocationsQuery = $"SELECT {locationIdColumn} FROM ExcludedLocations";
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rd345cd556de0034cdff06806280d28dcf86c859b
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs (.../FailureMechanismPropertyChangeHandlerTest.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs (.../FailureMechanismPropertyChangeHandlerTest.cs) (revision d345cd556de0034cdff06806280d28dcf86c859b)
@@ -143,10 +143,11 @@
Assert.AreEqual(expectedMessage, message);
}
Assert.AreEqual(1, propertySet);
- CollectionAssert.AreEqual(new List(testCase.ExpectedAffectedCalculations)
+ var expectedAffectedObjects = new List(testCase.ExpectedAffectedCalculations)
{
testFailureMechanism
- }, affectedObjects);
+ };
+ CollectionAssert.AreEqual(expectedAffectedObjects, affectedObjects);
Assert.IsTrue(testCase.Calculations.All(c => !c.HasOutput));
}
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rd345cd556de0034cdff06806280d28dcf86c859b
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs (.../StructuresCalculationStochastAssignerTest.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs (.../StructuresCalculationStochastAssignerTest.cs) (revision d345cd556de0034cdff06806280d28dcf86c859b)
@@ -197,17 +197,23 @@
{
StandardDeviationStochasts = new[]
{
- new StructuresCalculationStochastAssigner.StandardDeviationDefinition(stochastName,
- standardDeviationStochastConfiguration,
- input => null,
- (input, distribution) => {})
+ new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition(stochastName,
+ standardDeviationStochastConfiguration,
+ input => null,
+ (input, distribution) => {})
},
VariationCoefficientStochasts = new[]
{
- new StructuresCalculationStochastAssigner.VariationCoefficientDefinition(stochastName,
- variationCoefficientStochastConfiguration,
- input => null,
- (input, distribution) => {})
+ new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition(stochastName,
+ variationCoefficientStochastConfiguration,
+ input => null,
+ (input, distribution) => {})
}
};
@@ -254,17 +260,23 @@
{
StandardDeviationStochasts = new[]
{
- new StructuresCalculationStochastAssigner.StandardDeviationDefinition(stochastName,
- standardDeviationStochastConfiguration,
- input => new LogNormalDistribution(),
- (input, distribution) => {})
+ new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition(stochastName,
+ standardDeviationStochastConfiguration,
+ input => new LogNormalDistribution(),
+ (input, distribution) => {})
},
VariationCoefficientStochasts = new[]
{
- new StructuresCalculationStochastAssigner.VariationCoefficientDefinition(stochastName,
- variationCoefficientStochastConfiguration,
- input => new VariationCoefficientLogNormalDistribution(),
- (input, distribution) => {})
+ new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition(stochastName,
+ variationCoefficientStochastConfiguration,
+ input => new VariationCoefficientLogNormalDistribution(),
+ (input, distribution) => {})
}
};
@@ -313,16 +325,28 @@
};
var definitionA =
- new StructuresCalculationStochastAssigner.StandardDeviationDefinition("stochastA",
- standardDeviationStochastConfiguration,
- input => input.AllowedLevelIncreaseStorage,
- (input, distribution) => { input.AllowedLevelIncreaseStorage = (LogNormalDistribution) distribution; });
+ new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition("stochastA",
+ standardDeviationStochastConfiguration,
+ input => input.AllowedLevelIncreaseStorage,
+ (input, distribution) =>
+ {
+ input.AllowedLevelIncreaseStorage = (LogNormalDistribution) distribution;
+ });
var definitionB =
- new StructuresCalculationStochastAssigner.VariationCoefficientDefinition("stochastB",
- variationCoefficientStochastConfiguration,
- input => input.CriticalOvertoppingDischarge,
- (input, distribution) => { input.CriticalOvertoppingDischarge = (VariationCoefficientLogNormalDistribution) distribution; });
+ new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition("stochastB",
+ variationCoefficientStochastConfiguration,
+ input => input.CriticalOvertoppingDischarge,
+ (input, distribution) =>
+ {
+ input.CriticalOvertoppingDischarge = (VariationCoefficientLogNormalDistribution) distribution;
+ });
var assigner = new SimpleStructuresCalculationStochastAssigner(
configuration,
@@ -371,10 +395,13 @@
var setter = new Action((i, d) => {});
// Call
- TestDelegate test = () => new StructuresCalculationStochastAssigner.StandardDeviationDefinition(null,
- null,
- getter,
- setter);
+ TestDelegate test = () => new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition(null,
+ null,
+ getter,
+ setter);
// Assert
var exception = Assert.Throws(test);
@@ -390,10 +417,13 @@
var setter = new Action((i, d) => {});
// Call
- TestDelegate test = () => new StructuresCalculationStochastAssigner.StandardDeviationDefinition(stochastName,
- configuration,
- null,
- setter);
+ TestDelegate test = () => new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition(stochastName,
+ configuration,
+ null,
+ setter);
// Assert
var exception = Assert.Throws(test);
@@ -408,10 +438,13 @@
var getter = new Func(i => null);
// Call
- TestDelegate test = () => new StructuresCalculationStochastAssigner.StandardDeviationDefinition(stochastName,
- null,
- getter,
- null);
+ TestDelegate test = () => new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition(stochastName,
+ null,
+ getter,
+ null);
// Assert
var exception = Assert.Throws(test);
@@ -434,11 +467,13 @@
var setter = new Action((i, d) => {});
// Call
- var definition =
- new StructuresCalculationStochastAssigner.StandardDeviationDefinition(stochastName,
- configuration,
- getter,
- setter);
+ var definition = new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.StandardDeviationDefinition(stochastName,
+ configuration,
+ getter,
+ setter);
// Assert
Assert.NotNull(definition);
@@ -460,10 +495,13 @@
var setter = new Action((i, d) => {});
// Call
- TestDelegate test = () => new StructuresCalculationStochastAssigner.VariationCoefficientDefinition(null,
- null,
- getter,
- setter);
+ TestDelegate test = () => new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition(null,
+ null,
+ getter,
+ setter);
// Assert
var exception = Assert.Throws(test);
@@ -478,11 +516,13 @@
var setter = new Action((i, d) => {});
// Call
- TestDelegate test = () =>
- new StructuresCalculationStochastAssigner.VariationCoefficientDefinition(stochastName,
- null,
- null,
- setter);
+ TestDelegate test = () => new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition(stochastName,
+ null,
+ null,
+ setter);
// Assert
var exception = Assert.Throws(test);
@@ -497,11 +537,13 @@
var getter = new Func(i => null);
// Call
- TestDelegate test = () =>
- new StructuresCalculationStochastAssigner.VariationCoefficientDefinition(stochastName,
- null,
- getter,
- null);
+ TestDelegate test = () => new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition(stochastName,
+ null,
+ getter,
+ null);
// Assert
var exception = Assert.Throws(test);
@@ -524,11 +566,13 @@
var setter = new Action((i, d) => {});
// Call
- var definition =
- new StructuresCalculationStochastAssigner.VariationCoefficientDefinition(stochastName,
- configuration,
- getter,
- setter);
+ var definition = new StructuresCalculationStochastAssigner<
+ StructuresCalculationConfiguration,
+ SimpleStructuresInput,
+ StructureBase>.VariationCoefficientDefinition(stochastName,
+ configuration,
+ getter,
+ setter);
// Assert
Assert.NotNull(definition);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -rd345cd556de0034cdff06806280d28dcf86c859b
--- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs (.../CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs (.../CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs) (revision d345cd556de0034cdff06806280d28dcf86c859b)
@@ -34,8 +34,7 @@
namespace Ringtoets.Common.IO.TestUtil
{
[TestFixture]
- public abstract class CustomCalculationConfigurationExporterDesignGuidelinesTestFixture
- <
+ public abstract class CustomCalculationConfigurationExporterDesignGuidelinesTestFixture<
TCalculationConfigurationExporter, TWriter, TCalculation, TConfiguration>
where TCalculation : class, ICalculation
where TWriter : CalculationConfigurationWriter