Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r12a979c9f67747abf7ee894b66ec83f832221049 -r5a7d12426493f37ca9a8f5be5899ea7ab281ce2a --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs) (revision 12a979c9f67747abf7ee894b66ec83f832221049) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs) (revision 5a7d12426493f37ca9a8f5be5899ea7ab281ce2a) @@ -88,7 +88,7 @@ private static GrassCoverErosionInwardsCalculationScenario CreateFullCalculation() { - return new GrassCoverErosionInwardsCalculationScenario(0.1) + return new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1", InputParameters = @@ -116,23 +116,23 @@ private static GrassCoverErosionInwardsCalculationScenario CreateSparseCalculation() { - return new GrassCoverErosionInwardsCalculationScenario(0.1) + return new GrassCoverErosionInwardsCalculationScenario { Name = "sparse config" }; } private static CalculationGroup CreateNestedCalculation() { - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1", InputParameters = { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Location1") } }; - var calculation2 = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation2 = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 2" }; @@ -161,7 +161,7 @@ private static GrassCoverErosionInwardsCalculationScenario CreateIrrelevantCalculationScenario() { - return new GrassCoverErosionInwardsCalculationScenario(0.1) + return new GrassCoverErosionInwardsCalculationScenario { Name = "irrelevant", Contribution = (RoundedDouble) 0.5432, @@ -171,7 +171,7 @@ protected override GrassCoverErosionInwardsCalculationScenario CreateCalculation() { - return new GrassCoverErosionInwardsCalculationScenario(0.1); + return new GrassCoverErosionInwardsCalculationScenario(); } protected override GrassCoverErosionInwardsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r12a979c9f67747abf7ee894b66ec83f832221049 -r5a7d12426493f37ca9a8f5be5899ea7ab281ce2a --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision 12a979c9f67747abf7ee894b66ec83f832221049) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision 5a7d12426493f37ca9a8f5be5899ea7ab281ce2a) @@ -367,7 +367,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1", InputParameters = @@ -403,7 +403,7 @@ TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Calculation", Contribution = (RoundedDouble) 0.8765 @@ -436,7 +436,7 @@ TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Calculation", IsRelevant = false @@ -467,7 +467,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1", InputParameters = @@ -504,7 +504,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1" }; @@ -534,7 +534,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1", InputParameters = @@ -597,7 +597,7 @@ Assert.IsTrue(successful); - var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var expectedCalculation = new GrassCoverErosionInwardsCalculationScenario { Name = "Berekening 1", InputParameters = Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rebfd500b10e6634a584b5dd904d445078769ae90 -r5a7d12426493f37ca9a8f5be5899ea7ab281ce2a --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision ebfd500b10e6634a584b5dd904d445078769ae90) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 5a7d12426493f37ca9a8f5be5899ea7ab281ce2a) @@ -65,7 +65,7 @@ } }; - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -114,7 +114,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -206,7 +206,7 @@ DikeProfile dikeProfile = CreateDikeProfile(); dikeProfile.BreakWater.Type = breakWaterType; - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -290,7 +290,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -345,7 +345,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -415,7 +415,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -459,7 +459,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -528,7 +528,7 @@ DikeProfile dikeProfile = CreateDikeProfile(); dikeProfile.BreakWater.Type = breakWaterType; - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -612,7 +612,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -673,7 +673,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -735,7 +735,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -797,7 +797,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -860,7 +860,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -909,7 +909,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -979,7 +979,7 @@ DikeProfile dikeProfile = CreateDikeProfile(); dikeProfile.BreakWater.Type = breakWaterType; - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -1062,7 +1062,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -1123,7 +1123,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -1185,7 +1185,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -1247,7 +1247,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -1310,7 +1310,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -1359,7 +1359,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); ImportHydraulicBoundaryDatabase(assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs =================================================================== diff -u -r018a25f6131d2e1f7bc15f39a5f427bb49ff08e0 -r5a7d12426493f37ca9a8f5be5899ea7ab281ce2a --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 018a25f6131d2e1f7bc15f39a5f427bb49ff08e0) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 5a7d12426493f37ca9a8f5be5899ea7ab281ce2a) @@ -125,7 +125,7 @@ // Call foreach (DikeProfile profile in assessmentSection.GrassCoverErosionInwards.DikeProfiles) { - calculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculationScenario(0.1) + calculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculationScenario { Name = NamingHelper.GetUniqueName(((CalculationGroup) view.Data).Children, profile.Name, c => c.Name), InputParameters = @@ -183,7 +183,7 @@ foreach (DikeProfile profile in assessmentSection.GrassCoverErosionInwards.DikeProfiles) { - calculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculationScenario(0.1) + calculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculationScenario { Name = NamingHelper.GetUniqueName(calculationsGroup.Children, profile.Name, c => c.Name), InputParameters = @@ -250,7 +250,7 @@ foreach (DikeProfile profile in assessmentSection.GrassCoverErosionInwards.DikeProfiles) { - assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculationScenario(0.1) + assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculationScenario { Name = NamingHelper.GetUniqueName(assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children, profile.Name + "Calculation", c => c.Name), InputParameters =