Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r5f489223b4d730eec42acd55533dd012d10dd1ca -rb574376e8d2b485ff320504841723923c1e41331 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 5f489223b4d730eec42acd55533dd012d10dd1ca) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision b574376e8d2b485ff320504841723923c1e41331) @@ -22,16 +22,13 @@ using System; using System.Collections.Generic; using Core.Common.Base.Data; -using log4net; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.IO.Configurations; using Ringtoets.Common.IO.Configurations.Helpers; using Ringtoets.Common.IO.FileImporters; -using Ringtoets.Common.IO.Properties; using Ringtoets.Common.IO.Schema; using Ringtoets.HeightStructures.Data; using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources; @@ -120,55 +117,52 @@ } return TryReadStandardDeviationStochast( - calculation.Name, HeightStructuresConfigurationSchemaIdentifiers.LevelCrestStructureStochastName, + calculation.Name, calculation.InputParameters, readCalculation.LevelCrestStructure, - i => i.LevelCrestStructure, - (i, d) => i.LevelCrestStructure = d) + i => i.LevelCrestStructure, (i, d) => i.LevelCrestStructure = d) && TryReadStandardDeviationStochast( - calculation.Name, ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName, - calculation.InputParameters, readCalculation.AllowedLevelIncreaseStorage, - i => i.AllowedLevelIncreaseStorage, - (i, d) => i.AllowedLevelIncreaseStorage = d) - && TryReadStandardDeviationStochast( calculation.Name, - ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName, - calculation.InputParameters, readCalculation.FlowWidthAtBottomProtection, - i => i.FlowWidthAtBottomProtection, - (i, d) => i.FlowWidthAtBottomProtection = d) + calculation.InputParameters, + readCalculation.AllowedLevelIncreaseStorage, + i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d) && TryReadStandardDeviationStochast( + ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName, calculation.Name, - ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName, - calculation.InputParameters, readCalculation.ModelFactorSuperCriticalFlow, - i => i.ModelFactorSuperCriticalFlow, - (i, d) => i.ModelFactorSuperCriticalFlow = d) + calculation.InputParameters, + readCalculation.FlowWidthAtBottomProtection, + i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d) && TryReadStandardDeviationStochast( + ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName, calculation.Name, + calculation.InputParameters, + readCalculation.ModelFactorSuperCriticalFlow, + i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d) + && TryReadStandardDeviationStochast( ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName, - calculation.InputParameters, readCalculation.WidthFlowApertures, - i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d) - && TryReadVariationCoefficientStochast( calculation.Name, - ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName, - calculation.InputParameters, readCalculation.CriticalOvertoppingDischarge, - i => i.CriticalOvertoppingDischarge, - (i, d) => i.CriticalOvertoppingDischarge = d) + calculation.InputParameters, + readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d) && TryReadVariationCoefficientStochast( + ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName, calculation.Name, + calculation.InputParameters, + readCalculation.CriticalOvertoppingDischarge, + i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d) + && TryReadVariationCoefficientStochast( ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName, + calculation.Name, calculation.InputParameters, readCalculation.StorageStructureArea, - i => i.StorageStructureArea, - (i, d) => i.StorageStructureArea = d) + i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d) && TryReadVariationCoefficientStochast( - calculation.Name, ConfigurationSchemaIdentifiers.StormDurationStochastName, + calculation.Name, calculation.InputParameters, readCalculation.StormDuration, - i => i.StormDuration, - (i, d) => i.StormDuration = d); + i => i.StormDuration, (i, d) => i.StormDuration = d); } ///