Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs
===================================================================
diff -u -rcd777bfd46c42a50f2398dbe39dfda37fc64e0a6 -rc2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision cd777bfd46c42a50f2398dbe39dfda37fc64e0a6)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision c2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b)
@@ -53,10 +53,10 @@
/// The coefficient of variation of the critical overtopping discharge of the stability point structure.
/// The mean of the flow width of the stability point structure at the bottom protection.
/// The standard deviation of the flow width of the stability point structure at the bottom protection.
- /// The mean of the constructive strength of the linear load model of the stability point structure.
- /// The coefficient of variation of the constructive strength of the linear load model of the stability point structure.
- /// The mean of the constructive strength of the quadratic load model of the stability point structure.
- /// The coefficient of variation of the constructive strength of the quadratic load model of the stability point structure.
+ /// The mean of the constructive strength of the linear load model of the stability point structure.
+ /// The coefficient of variation of the constructive strength of the linear load model of the stability point structure.
+ /// The mean of the constructive strength of the quadratic load model of the stability point structure.
+ /// The coefficient of variation of the constructive strength of the quadratic load model of the stability point structure.
/// The mean of the bank width of the stability point structure.
/// The standard deviation of the bank width of the stability point structure.
/// The mean of the inside water level failure construction of the stability point structure.
@@ -96,8 +96,8 @@
double thresholdHeightOpenWeirMean, double thresholdHeightOpenWeirStandardDeviation,
double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeCoefficientOfVariation,
double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation,
- double constructiveStrengthLinearModelMean, double constructiveStrengthLinearModelCoefficientOfVariation,
- double constructiveStrengthQuadraticModelMean, double constructiveStrengthQuadraticModelCoefficientOfVariation,
+ double constructiveStrengthLinearLoadModelMean, double constructiveStrengthLinearLoadModelCoefficientOfVariation,
+ double constructiveStrengthQuadraticLoadModelMean, double constructiveStrengthQuadraticLoadModelCoefficientOfVariation,
double bankWidthMean, double bankWidthStandardDeviation,
double insideWaterLevelFailureConstructionMean, double insideWaterLevelFailureConstructionStandardDeviation,
double evaluationLevel,
@@ -152,15 +152,15 @@
Mean = (RoundedDouble) flowWidthAtBottomProtectionMean,
StandardDeviation = (RoundedDouble) flowWidthAtBottomProtectionStandardDeviation
};
- ConstructiveStrengthLinearModel = new VariationCoefficientLogNormalDistribution(2)
+ ConstructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = (RoundedDouble) constructiveStrengthLinearModelMean,
- CoefficientOfVariation = (RoundedDouble) constructiveStrengthLinearModelCoefficientOfVariation
+ Mean = (RoundedDouble) constructiveStrengthLinearLoadModelMean,
+ CoefficientOfVariation = (RoundedDouble) constructiveStrengthLinearLoadModelCoefficientOfVariation
};
- ConstructiveStrengthQuadraticModel = new VariationCoefficientLogNormalDistribution(2)
+ ConstructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = (RoundedDouble) constructiveStrengthQuadraticModelMean,
- CoefficientOfVariation = (RoundedDouble) constructiveStrengthQuadraticModelCoefficientOfVariation
+ Mean = (RoundedDouble) constructiveStrengthQuadraticLoadModelMean,
+ CoefficientOfVariation = (RoundedDouble) constructiveStrengthQuadraticLoadModelCoefficientOfVariation
};
BankWidth = new NormalDistribution(2)
{
@@ -258,12 +258,12 @@
///
/// Gets the constructive strength of the linear load model of the stability point structure.
///
- public VariationCoefficientLogNormalDistribution ConstructiveStrengthLinearModel { get; private set; }
+ public VariationCoefficientLogNormalDistribution ConstructiveStrengthLinearLoadModel { get; private set; }
///
/// Gets the constructive strength of the quadratic load model of the stability point structure.
///
- public VariationCoefficientLogNormalDistribution ConstructiveStrengthQuadraticModel { get; private set; }
+ public VariationCoefficientLogNormalDistribution ConstructiveStrengthQuadraticLoadModel { get; private set; }
///
/// Gets the bank width of the stability point structure.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs
===================================================================
diff -u -rcd777bfd46c42a50f2398dbe39dfda37fc64e0a6 -rc2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision cd777bfd46c42a50f2398dbe39dfda37fc64e0a6)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision c2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b)
@@ -45,8 +45,8 @@
private readonly NormalDistribution levelCrestStructure;
private readonly NormalDistribution thresholdHeightOpenWeir;
private readonly LogNormalDistribution areaFlowApertures;
- private readonly VariationCoefficientLogNormalDistribution constructiveStrengthLinearModel;
- private readonly VariationCoefficientLogNormalDistribution constructiveStrengthQuadraticModel;
+ private readonly VariationCoefficientLogNormalDistribution constructiveStrengthLinearLoadModel;
+ private readonly VariationCoefficientLogNormalDistribution constructiveStrengthQuadraticLoadModel;
private readonly VariationCoefficientLogNormalDistribution stabilityLinearLoadModel;
private readonly VariationCoefficientLogNormalDistribution stabilityQuadraticLoadModel;
private readonly VariationCoefficientLogNormalDistribution failureCollisionEnergy;
@@ -137,13 +137,13 @@
StandardDeviation = (RoundedDouble) 0.01
};
- constructiveStrengthLinearModel = new VariationCoefficientLogNormalDistribution(2)
+ constructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN,
CoefficientOfVariation = (RoundedDouble) 0.1
};
- constructiveStrengthQuadraticModel = new VariationCoefficientLogNormalDistribution(2)
+ constructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN,
CoefficientOfVariation = (RoundedDouble) 0.1
@@ -546,12 +546,12 @@
{
get
{
- return constructiveStrengthLinearModel;
+ return constructiveStrengthLinearLoadModel;
}
set
{
- constructiveStrengthLinearModel.Mean = value.Mean;
- constructiveStrengthLinearModel.CoefficientOfVariation = value.CoefficientOfVariation;
+ constructiveStrengthLinearLoadModel.Mean = value.Mean;
+ constructiveStrengthLinearLoadModel.CoefficientOfVariation = value.CoefficientOfVariation;
}
}
@@ -563,12 +563,12 @@
{
get
{
- return constructiveStrengthQuadraticModel;
+ return constructiveStrengthQuadraticLoadModel;
}
set
{
- constructiveStrengthQuadraticModel.Mean = value.Mean;
- constructiveStrengthQuadraticModel.CoefficientOfVariation = value.CoefficientOfVariation;
+ constructiveStrengthQuadraticLoadModel.Mean = value.Mean;
+ constructiveStrengthQuadraticLoadModel.CoefficientOfVariation = value.CoefficientOfVariation;
}
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs
===================================================================
diff -u -rcd777bfd46c42a50f2398dbe39dfda37fc64e0a6 -rc2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision cd777bfd46c42a50f2398dbe39dfda37fc64e0a6)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision c2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b)
@@ -54,8 +54,8 @@
private const int levelCrestStructurePropertyIndex = 12;
private const int thresholdHeightOpenWeirPropertyIndex = 13;
private const int criticalOvertoppingDischargePropertyIndex = 14;
- private const int constructiveStrengthLinearModelPropertyIndex = 15;
- private const int constructiveStrengthQuadraticModelPropertyIndex = 16;
+ private const int constructiveStrengthLinearLoadModelPropertyIndex = 15;
+ private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 16;
private const int bankWidthPropertyIndex = 17;
private const int evaluationLevelPropertyIndex = 18;
private const int verticalDistancePropertyIndex = 19;
@@ -279,30 +279,30 @@
}
}
- [PropertyOrder(constructiveStrengthLinearModelPropertyIndex)]
+ [PropertyOrder(constructiveStrengthLinearLoadModelPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
- public LogNormalDistributionVariationProperties ConstructiveStrengthLinearModel
+ public LogNormalDistributionVariationProperties ConstructiveStrengthLinearLoadModel
{
get
{
return new LogNormalDistributionVariationProperties
{
- Data = data.ConstructiveStrengthLinearModel
+ Data = data.ConstructiveStrengthLinearLoadModel
};
}
}
- [PropertyOrder(constructiveStrengthQuadraticModelPropertyIndex)]
+ [PropertyOrder(constructiveStrengthQuadraticLoadModelPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
- public LogNormalDistributionVariationProperties ConstructiveStrengthQuadraticModel
+ public LogNormalDistributionVariationProperties ConstructiveStrengthQuadraticLoadModel
{
get
{
return new LogNormalDistributionVariationProperties
{
- Data = data.ConstructiveStrengthQuadraticModel
+ Data = data.ConstructiveStrengthQuadraticLoadModel
};
}
}
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs
===================================================================
diff -u -rcd777bfd46c42a50f2398dbe39dfda37fc64e0a6 -rc2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision cd777bfd46c42a50f2398dbe39dfda37fc64e0a6)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision c2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b)
@@ -112,17 +112,17 @@
Assert.AreEqual(2, flowWidthAtBottomProtection.StandardDeviation.NumberOfDecimalPlaces);
Assert.AreEqual(0.89, flowWidthAtBottomProtection.StandardDeviation, flowWidthAtBottomProtection.StandardDeviation.GetAccuracy());
- VariationCoefficientLogNormalDistribution constructiveStrengthLinearModel = structure.ConstructiveStrengthLinearModel;
- Assert.AreEqual(2, constructiveStrengthLinearModel.Mean.NumberOfDecimalPlaces);
- Assert.AreEqual(901.23, constructiveStrengthLinearModel.Mean, constructiveStrengthLinearModel.Mean.GetAccuracy());
- Assert.AreEqual(2, constructiveStrengthLinearModel.CoefficientOfVariation.NumberOfDecimalPlaces);
- Assert.AreEqual(0.90, constructiveStrengthLinearModel.CoefficientOfVariation, constructiveStrengthLinearModel.CoefficientOfVariation.GetAccuracy());
+ VariationCoefficientLogNormalDistribution constructiveStrengthLinearLoadModel = structure.ConstructiveStrengthLinearLoadModel;
+ Assert.AreEqual(2, constructiveStrengthLinearLoadModel.Mean.NumberOfDecimalPlaces);
+ Assert.AreEqual(901.23, constructiveStrengthLinearLoadModel.Mean, constructiveStrengthLinearLoadModel.Mean.GetAccuracy());
+ Assert.AreEqual(2, constructiveStrengthLinearLoadModel.CoefficientOfVariation.NumberOfDecimalPlaces);
+ Assert.AreEqual(0.90, constructiveStrengthLinearLoadModel.CoefficientOfVariation, constructiveStrengthLinearLoadModel.CoefficientOfVariation.GetAccuracy());
- VariationCoefficientLogNormalDistribution constructiveStrengthQuadraticModel = structure.ConstructiveStrengthQuadraticModel;
- Assert.AreEqual(2, constructiveStrengthQuadraticModel.Mean.NumberOfDecimalPlaces);
- Assert.AreEqual(123.46, constructiveStrengthQuadraticModel.Mean, constructiveStrengthQuadraticModel.Mean.GetAccuracy());
- Assert.AreEqual(2, constructiveStrengthQuadraticModel.CoefficientOfVariation.NumberOfDecimalPlaces);
- Assert.AreEqual(0.12, constructiveStrengthQuadraticModel.CoefficientOfVariation, constructiveStrengthQuadraticModel.CoefficientOfVariation.GetAccuracy());
+ VariationCoefficientLogNormalDistribution constructiveStrengthQuadraticLoadModel = structure.ConstructiveStrengthQuadraticLoadModel;
+ Assert.AreEqual(2, constructiveStrengthQuadraticLoadModel.Mean.NumberOfDecimalPlaces);
+ Assert.AreEqual(123.46, constructiveStrengthQuadraticLoadModel.Mean, constructiveStrengthQuadraticLoadModel.Mean.GetAccuracy());
+ Assert.AreEqual(2, constructiveStrengthQuadraticLoadModel.CoefficientOfVariation.NumberOfDecimalPlaces);
+ Assert.AreEqual(0.12, constructiveStrengthQuadraticLoadModel.CoefficientOfVariation, constructiveStrengthQuadraticLoadModel.CoefficientOfVariation.GetAccuracy());
NormalDistribution bankWidth = structure.BankWidth;
Assert.AreEqual(2, bankWidth.Mean.NumberOfDecimalPlaces);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs
===================================================================
diff -u -rcd777bfd46c42a50f2398dbe39dfda37fc64e0a6 -rc2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision cd777bfd46c42a50f2398dbe39dfda37fc64e0a6)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision c2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b)
@@ -50,8 +50,8 @@
private const int levelCrestStructurePropertyIndex = 11;
private const int thresholdHeightOpenWeirPropertyIndex = 12;
private const int criticalOvertoppingDischargePropertyIndex = 13;
- private const int constructiveStrengthLinearModelPropertyIndex = 14;
- private const int constructiveStrengthQuadraticModelPropertyIndex = 15;
+ private const int constructiveStrengthLinearLoadModelPropertyIndex = 14;
+ private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 15;
private const int bankWidthPropertyIndex = 16;
private const int evaluationLevelPropertyIndex = 17;
private const int verticalDistancePropertyIndex = 18;
@@ -145,15 +145,15 @@
Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean"));
Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("CoefficientOfVariation"));
- Assert.AreEqual("Lognormaal", properties.ConstructiveStrengthLinearModel.DistributionType);
- Assert.AreEqual(structure.ConstructiveStrengthLinearModel, properties.ConstructiveStrengthLinearModel.Data);
- Assert.IsTrue(properties.ConstructiveStrengthLinearModel.DynamicReadOnlyValidationMethod("Mean"));
- Assert.IsTrue(properties.ConstructiveStrengthLinearModel.DynamicReadOnlyValidationMethod("CoefficientOfVariation"));
+ Assert.AreEqual("Lognormaal", properties.ConstructiveStrengthLinearLoadModel.DistributionType);
+ Assert.AreEqual(structure.ConstructiveStrengthLinearLoadModel, properties.ConstructiveStrengthLinearLoadModel.Data);
+ Assert.IsTrue(properties.ConstructiveStrengthLinearLoadModel.DynamicReadOnlyValidationMethod("Mean"));
+ Assert.IsTrue(properties.ConstructiveStrengthLinearLoadModel.DynamicReadOnlyValidationMethod("CoefficientOfVariation"));
- Assert.AreEqual("Lognormaal", properties.ConstructiveStrengthQuadraticModel.DistributionType);
- Assert.AreEqual(structure.ConstructiveStrengthQuadraticModel, properties.ConstructiveStrengthQuadraticModel.Data);
- Assert.IsTrue(properties.ConstructiveStrengthQuadraticModel.DynamicReadOnlyValidationMethod("Mean"));
- Assert.IsTrue(properties.ConstructiveStrengthQuadraticModel.DynamicReadOnlyValidationMethod("CoefficientOfVariation"));
+ Assert.AreEqual("Lognormaal", properties.ConstructiveStrengthQuadraticLoadModel.DistributionType);
+ Assert.AreEqual(structure.ConstructiveStrengthQuadraticLoadModel, properties.ConstructiveStrengthQuadraticLoadModel.Data);
+ Assert.IsTrue(properties.ConstructiveStrengthQuadraticLoadModel.DynamicReadOnlyValidationMethod("Mean"));
+ Assert.IsTrue(properties.ConstructiveStrengthQuadraticLoadModel.DynamicReadOnlyValidationMethod("CoefficientOfVariation"));
Assert.AreEqual("Normaal", properties.BankWidth.DistributionType);
Assert.AreEqual(structure.BankWidth, properties.BankWidth.Data);
@@ -298,13 +298,13 @@
Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName);
Assert.AreEqual("Kritiek instromend debiet directe invoer.", criticalOvertoppingDischargeProperty.Description);
- PropertyDescriptor constructiveStrengthLinearModelProperty = dynamicProperties[constructiveStrengthLinearModelPropertyIndex];
- Assert.IsInstanceOf(constructiveStrengthLinearModelProperty.Converter);
- Assert.AreEqual(schematizationCategory, constructiveStrengthLinearModelProperty.Category);
+ PropertyDescriptor constructiveStrengthLinearLoadModelProperty = dynamicProperties[constructiveStrengthLinearLoadModelPropertyIndex];
+ Assert.IsInstanceOf(constructiveStrengthLinearLoadModelProperty.Converter);
+ Assert.AreEqual(schematizationCategory, constructiveStrengthLinearLoadModelProperty.Category);
- PropertyDescriptor constructiveStrengthQuadraticModelProperty = dynamicProperties[constructiveStrengthQuadraticModelPropertyIndex];
- Assert.IsInstanceOf(constructiveStrengthQuadraticModelProperty.Converter);
- Assert.AreEqual(schematizationCategory, constructiveStrengthQuadraticModelProperty.Category);
+ PropertyDescriptor constructiveStrengthQuadraticLoadModelProperty = dynamicProperties[constructiveStrengthQuadraticLoadModelPropertyIndex];
+ Assert.IsInstanceOf(constructiveStrengthQuadraticLoadModelProperty.Converter);
+ Assert.AreEqual(schematizationCategory, constructiveStrengthQuadraticLoadModelProperty.Category);
PropertyDescriptor bankWidthProperty = dynamicProperties[bankWidthPropertyIndex];
Assert.IsInstanceOf(bankWidthProperty.Converter);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs
===================================================================
diff -u -rcd777bfd46c42a50f2398dbe39dfda37fc64e0a6 -rc2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision cd777bfd46c42a50f2398dbe39dfda37fc64e0a6)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision c2a078ee5e2bd7923da2ef612bbf6cb3cdb5f33b)
@@ -154,8 +154,8 @@
Assert.AreEqual(6, structure.ThresholdHeightOpenWeir.StandardDeviation.Value);
Assert.AreEqual(1.5, structure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value);
Assert.AreEqual(8, structure.FlowWidthAtBottomProtection.StandardDeviation.Value);
- Assert.AreEqual(2, structure.ConstructiveStrengthLinearModel.CoefficientOfVariation.Value);
- Assert.AreEqual(2.5, structure.ConstructiveStrengthQuadraticModel.CoefficientOfVariation.Value);
+ Assert.AreEqual(2, structure.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation.Value);
+ Assert.AreEqual(2.5, structure.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation.Value);
Assert.AreEqual(10, structure.BankWidth.StandardDeviation.Value);
Assert.AreEqual(12, structure.InsideWaterLevelFailureConstruction.StandardDeviation.Value);
Assert.AreEqual(14, structure.LevelCrestStructure.StandardDeviation.Value);