Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs =================================================================== diff -u -re55650161e088d675d8d92374c5ee8b930b10464 -rf55334a0d7385c56ef1add20effeac5a6994a4a7 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs (.../StructuresCalculationStochastAssignerTest.cs) (revision e55650161e088d675d8d92374c5ee8b930b10464) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs (.../StructuresCalculationStochastAssignerTest.cs) (revision f55334a0d7385c56ef1add20effeac5a6994a4a7) @@ -257,20 +257,20 @@ { StandardDeviationStochasts = new[] { - StructuresCalculationStochastAssigner< + new StructuresCalculationStochastAssigner< StructuresCalculationConfiguration, SimpleStructuresInput, - StructureBase>.StandardDeviationDefinition.Create(stochastName, + StructureBase>.StandardDeviationDefinition(stochastName, standardDeviationStochastConfiguration, input => null, (input, distribution) => { }) }, VariationCoefficientStochasts = new[] { - StructuresCalculationStochastAssigner< + new StructuresCalculationStochastAssigner< StructuresCalculationConfiguration, SimpleStructuresInput, - StructureBase>.VariationCoefficientDefinition.Create(stochastName, + StructureBase>.VariationCoefficientDefinition(stochastName, variationCoefficientStochastConfiguration, input => null, (input, distribution) => { }) @@ -320,20 +320,20 @@ { StandardDeviationStochasts = new[] { - StructuresCalculationStochastAssigner< + new StructuresCalculationStochastAssigner< StructuresCalculationConfiguration, SimpleStructuresInput, - StructureBase>.StandardDeviationDefinition.Create(stochastName, + StructureBase>.StandardDeviationDefinition(stochastName, standardDeviationStochastConfiguration, input => new LogNormalDistribution(), (input, distribution) => { }) }, VariationCoefficientStochasts = new[] { - StructuresCalculationStochastAssigner< + new StructuresCalculationStochastAssigner< StructuresCalculationConfiguration, SimpleStructuresInput, - StructureBase>.VariationCoefficientDefinition.Create(stochastName, + StructureBase>.VariationCoefficientDefinition(stochastName, variationCoefficientStochastConfiguration, input => new VariationCoefficientLogNormalDistribution(), (input, distribution) => { }) @@ -388,10 +388,10 @@ StructuresCalculationConfiguration, SimpleStructuresInput, StructureBase>.StandardDeviationDefinition definitionA = - StructuresCalculationStochastAssigner< + new StructuresCalculationStochastAssigner< StructuresCalculationConfiguration, SimpleStructuresInput, - StructureBase>.StandardDeviationDefinition.Create("stochastA", + StructureBase>.StandardDeviationDefinition("stochastA", standardDeviationStochastConfiguration, input => input.AllowedLevelIncreaseStorage, (input, distribution) => @@ -403,10 +403,10 @@ StructuresCalculationConfiguration, SimpleStructuresInput, StructureBase>.VariationCoefficientDefinition definitionB = - StructuresCalculationStochastAssigner< + new StructuresCalculationStochastAssigner< StructuresCalculationConfiguration, SimpleStructuresInput, - StructureBase>.VariationCoefficientDefinition.Create("stochastB", + StructureBase>.VariationCoefficientDefinition("stochastB", variationCoefficientStochastConfiguration, input => input.CriticalOvertoppingDischarge, (input, distribution) => @@ -461,8 +461,8 @@ var setter = new Action((i, d) => { }); // Call - TestDelegate test = () => StructuresCalculationStochastAssigner - .StandardDeviationDefinition.Create(null, + TestDelegate test = () => new StructuresCalculationStochastAssigner + .StandardDeviationDefinition(null, null, getter, setter); @@ -480,8 +480,8 @@ var setter = new Action((i, d) => { }); // Call - TestDelegate test = () => StructuresCalculationStochastAssigner - .StandardDeviationDefinition.Create(stochastName, + TestDelegate test = () => new StructuresCalculationStochastAssigner + .StandardDeviationDefinition(stochastName, configuration, null, setter); @@ -498,8 +498,8 @@ var getter = new Func(i => null); // Call - TestDelegate test = () => StructuresCalculationStochastAssigner - .StandardDeviationDefinition.Create(stochastName, + TestDelegate test = () => new StructuresCalculationStochastAssigner + .StandardDeviationDefinition(stochastName, null, getter, null); @@ -525,8 +525,8 @@ // Call StructuresCalculationStochastAssigner.StandardDeviationDefinition definition = - StructuresCalculationStochastAssigner - .StandardDeviationDefinition.Create(stochastName, + new StructuresCalculationStochastAssigner + .StandardDeviationDefinition(stochastName, configuration, getter, setter); @@ -550,8 +550,8 @@ var setter = new Action((i, d) => { }); // Call - TestDelegate test = () => StructuresCalculationStochastAssigner - .VariationCoefficientDefinition.Create(null, + TestDelegate test = () => new StructuresCalculationStochastAssigner + .VariationCoefficientDefinition(null, null, getter, setter); @@ -569,8 +569,8 @@ // Call TestDelegate test = () => - StructuresCalculationStochastAssigner - .VariationCoefficientDefinition.Create(stochastName, + new StructuresCalculationStochastAssigner + .VariationCoefficientDefinition(stochastName, null, null, setter); @@ -588,8 +588,8 @@ // Call TestDelegate test = () => - StructuresCalculationStochastAssigner - .VariationCoefficientDefinition.Create(stochastName, + new StructuresCalculationStochastAssigner + .VariationCoefficientDefinition(stochastName, null, getter, null); @@ -615,8 +615,8 @@ // Call StructuresCalculationStochastAssigner.VariationCoefficientDefinition definition = - StructuresCalculationStochastAssigner - .VariationCoefficientDefinition.Create(stochastName, + new StructuresCalculationStochastAssigner + .VariationCoefficientDefinition(stochastName, configuration, getter, setter);