Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewTest.cs =================================================================== diff -u -r8efc57155e7afac5745badfd36676bef01eec3bc -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision 8efc57155e7afac5745badfd36676bef01eec3bc) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../DikeHeightOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -37,7 +37,7 @@ { // Call var view = new DikeHeightOutputGeneralResultFaultTreeIllustrationPointView( - new GrassCoverErosionInwardsCalculation(0.1), + new GrassCoverErosionInwardsCalculation(), () => new TestGeneralResultFaultTreeIllustrationPoint()); // Assert Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationRowTest.cs =================================================================== diff -u -r8efc57155e7afac5745badfd36676bef01eec3bc -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationRowTest.cs (.../GrassCoverErosionInwardsCalculationRowTest.cs) (revision 8efc57155e7afac5745badfd36676bef01eec3bc) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationRowTest.cs (.../GrassCoverErosionInwardsCalculationRowTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -58,7 +58,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(); // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, handler); @@ -87,7 +87,7 @@ var selectableHydraulicBoundaryLocation = new SelectableHydraulicBoundaryLocation(newLocation, new Point2D(0, 0)); var newValue = new DataGridViewComboBoxItemWrapper(selectableHydraulicBoundaryLocation); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.SelectableHydraulicBoundaryLocation = newValue, calculation); @@ -100,7 +100,7 @@ DikeProfile newProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(0.0, 0.0)); var newValue = new DataGridViewComboBoxItemWrapper(newProfile); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.DikeProfile = newValue, calculation); @@ -112,7 +112,7 @@ // Setup var dikeProfileChangedCounter = 0; var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty()); - var row = new GrassCoverErosionInwardsCalculationRow(new GrassCoverErosionInwardsCalculationScenario(0.1), handler); + var row = new GrassCoverErosionInwardsCalculationRow(new GrassCoverErosionInwardsCalculationScenario(), handler); row.DikeProfileChanged += (s, a) => dikeProfileChangedCounter++; @@ -151,7 +151,7 @@ var dikeProfileChangedCounter = 0; var handler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty()); DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); - var row = new GrassCoverErosionInwardsCalculationRow(new GrassCoverErosionInwardsCalculationScenario(0.1) + var row = new GrassCoverErosionInwardsCalculationRow(new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -174,7 +174,7 @@ // Setup const bool newValue = true; - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.UseBreakWater = newValue, calculation); @@ -210,7 +210,7 @@ public void BreakWaterType_AlwaysOnChange_NotifyObserverAndCalculationPropertyChanged(BreakWaterType breakWaterType, BreakWaterType newBreakWaterType) { // Setup - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -252,7 +252,7 @@ // Setup var newValue = new RoundedDouble(4, 16); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.BreakWaterHeight = newValue, calculation); @@ -285,7 +285,7 @@ // Setup const bool newValue = true; - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.UseForeshoreGeometry = newValue, calculation); @@ -318,7 +318,7 @@ // Setup var newValue = new RoundedDouble(2, 2.08); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.DikeHeight = newValue, calculation); @@ -351,7 +351,7 @@ // Setup var newValue = new RoundedDouble(4, 0.03); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.MeanCriticalFlowRate = newValue, calculation); @@ -384,7 +384,7 @@ // Setup var newValue = new RoundedDouble(4, 0.0004); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.StandardDeviationCriticalFlowRate = newValue, calculation); @@ -516,11 +516,11 @@ public void Constructor_DikeProfileNull_CorrectColumnStates() { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(); // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))); + calculationScenario, new GrassCoverErosionInwardsInput())); // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; @@ -536,7 +536,7 @@ public void Constructor_DikeProfileWithoutForeshoreGeometry_CorrectColumnStates(bool useBreakWater) { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -547,7 +547,7 @@ // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))); + calculationScenario, new GrassCoverErosionInwardsInput())); // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; @@ -563,7 +563,7 @@ public void Constructor_DikeProfileWithForeshoreGeometry_CorrectColumnStates(bool useBreakWater) { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -577,7 +577,7 @@ // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))); + calculationScenario, new GrassCoverErosionInwardsInput())); // Assert IDictionary columnStateDefinitions = row.ColumnStateDefinitions; @@ -593,7 +593,7 @@ public void UseBreakWater_AlwaysOnChange_CorrectColumnStates(bool useBreakWater) { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -603,7 +603,7 @@ // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))) + calculationScenario, new GrassCoverErosionInwardsInput())) { UseBreakWater = useBreakWater }; @@ -618,7 +618,7 @@ public void DikeProfile_OnChangeToNull_CorrectColumnStates() { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -628,7 +628,7 @@ // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))) + calculationScenario, new GrassCoverErosionInwardsInput())) { DikeProfile = new DataGridViewComboBoxItemWrapper(null) }; @@ -645,11 +645,11 @@ public void DikeProfile_OnChangeToProfileWithoutForeshoreGeometry_CorrectColumnStates() { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(); // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))) + calculationScenario, new GrassCoverErosionInwardsInput())) { DikeProfile = new DataGridViewComboBoxItemWrapper(DikeProfileTestFactory.CreateDikeProfile()) }; @@ -666,11 +666,11 @@ public void DikeProfile_OnChangeToProfileWithForeshoreGeometry_CorrectColumnStates() { // Setup - var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculationScenario = new GrassCoverErosionInwardsCalculationScenario(); // Call var row = new GrassCoverErosionInwardsCalculationRow(calculationScenario, new ObservablePropertyChangeHandler( - calculationScenario, new GrassCoverErosionInwardsInput(0.1))) + calculationScenario, new GrassCoverErosionInwardsInput())) { DikeProfile = new DataGridViewComboBoxItemWrapper(DikeProfileTestFactory.CreateDikeProfile(new[] { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs =================================================================== diff -u -r8efc57155e7afac5745badfd36676bef01eec3bc -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs (.../GrassCoverErosionInwardsCalculationsViewTest.cs) (revision 8efc57155e7afac5745badfd36676bef01eec3bc) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs (.../GrassCoverErosionInwardsCalculationsViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -778,7 +778,7 @@ { Children = { - new GrassCoverErosionInwardsCalculationScenario(0.1) + new GrassCoverErosionInwardsCalculationScenario { Name = "Calculation 1", Comments = @@ -811,7 +811,7 @@ }, Output = null }, - new GrassCoverErosionInwardsCalculationScenario(0.1) + new GrassCoverErosionInwardsCalculationScenario { Name = "Calculation 2", Comments = Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r8efc57155e7afac5745badfd36676bef01eec3bc -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 8efc57155e7afac5745badfd36676bef01eec3bc) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -286,7 +286,7 @@ protected override GrassCoverErosionInwardsCalculation CreateCalculation() { - return new GrassCoverErosionInwardsCalculation(0.1); + return new GrassCoverErosionInwardsCalculation(); } } Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs =================================================================== diff -u -r8efc57155e7afac5745badfd36676bef01eec3bc -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision 8efc57155e7afac5745badfd36676bef01eec3bc) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -144,15 +144,15 @@ public void Constructor_WithAllData_DataUpdatedToCollectionOfFilledMapData() { // Setup - var calculationA = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationA = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(1.3, 1.3)), HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }; - var calculationB = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationB = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -512,15 +512,15 @@ public void GivenViewWithCalculationGroupData_WhenCalculationGroupUpdatedAndNotified_ThenMapDataUpdated() { // Given - var calculationA = new GrassCoverErosionInwardsCalculation(0.1) + var calculationA = new GrassCoverErosionInwardsCalculation { InputParameters = { DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(1.3, 1.3)), HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }; - var calculationB = new GrassCoverErosionInwardsCalculation(0.1) + var calculationB = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -555,7 +555,7 @@ public void GivenViewWithCalculationInputData_WhenCalculationInputUpdatedAndNotified_ThenMapDataUpdated() { // Given - var calculationA = new GrassCoverErosionInwardsCalculation(0.1) + var calculationA = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -592,7 +592,7 @@ public void GivenViewWithCalculationData_WhenCalculationUpdatedAndNotified_ThenMapDataUpdated() { // Given - var calculationA = new GrassCoverErosionInwardsCalculation(0.1) + var calculationA = new GrassCoverErosionInwardsCalculation { InputParameters = { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailurePathViewTest.cs =================================================================== diff -u -rf4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailurePathViewTest.cs (.../GrassCoverErosionInwardsFailurePathViewTest.cs) (revision f4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailurePathViewTest.cs (.../GrassCoverErosionInwardsFailurePathViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -116,15 +116,15 @@ // Setup var random = new Random(39); - var calculationA = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationA = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(1.3, 1.3)), HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }; - var calculationB = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationB = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -273,15 +273,15 @@ public void GivenViewWithCalculationGroupData_WhenCalculationGroupUpdatedAndNotified_ThenMapDataUpdated() { // Given - var calculationA = new GrassCoverErosionInwardsCalculation(0.1) + var calculationA = new GrassCoverErosionInwardsCalculation { InputParameters = { DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(1.3, 1.3)), HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }; - var calculationB = new GrassCoverErosionInwardsCalculation(0.1) + var calculationB = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -319,7 +319,7 @@ public void GivenViewWithCalculationInputData_WhenCalculationInputUpdatedAndNotified_ThenMapDataUpdated() { // Given - var calculationA = new GrassCoverErosionInwardsCalculation(0.1) + var calculationA = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -359,7 +359,7 @@ public void GivenViewWithCalculationData_WhenCalculationUpdatedAndNotified_ThenMapDataUpdated() { // Given - var calculationA = new GrassCoverErosionInwardsCalculation(0.1) + var calculationA = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -470,7 +470,7 @@ { // Given var random = new Random(39); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs =================================================================== diff -u -rf4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision f4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -78,7 +78,7 @@ // Setup using (var view = new GrassCoverErosionInwardsInputView()) { - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); // Call view.Data = calculation; @@ -110,7 +110,7 @@ // Setup using (var view = new GrassCoverErosionInwardsInputView { - Data = new GrassCoverErosionInwardsCalculation(0.1) + Data = new GrassCoverErosionInwardsCalculation() }) { // Precondition @@ -133,7 +133,7 @@ // Setup using (var view = new GrassCoverErosionInwardsInputView()) { - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); // Call view.Data = calculation; @@ -150,7 +150,7 @@ using (var view = new GrassCoverErosionInwardsInputView()) { DikeProfile dikeProfile = GetDikeProfileWithGeometry(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -180,7 +180,7 @@ using (var view = new GrassCoverErosionInwardsInputView()) { DikeProfile dikeProfile = GetDikeProfileWithGeometry(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -219,7 +219,7 @@ const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { Name = initialName }; @@ -248,7 +248,7 @@ const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { Name = initialName }; @@ -258,7 +258,7 @@ // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); - view.Data = new GrassCoverErosionInwardsCalculation(0.1) + view.Data = new GrassCoverErosionInwardsCalculation { Name = initialName }; @@ -286,7 +286,7 @@ { DikeProfile dikeProfile = GetDikeProfileWithGeometry(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -332,7 +332,7 @@ using (var view = new GrassCoverErosionInwardsInputView()) { - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -350,7 +350,7 @@ foreshoreChartData.Attach(observer); dikeHeightChartData.Attach(observer); - view.Data = new GrassCoverErosionInwardsCalculation(0.1) + view.Data = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -376,7 +376,7 @@ const int updatedForeshoreIndex = foreshoreIndex; const int updatedDikeHeightIndex = dikeHeightIndex - 1; - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); using (var view = new GrassCoverErosionInwardsInputView { @@ -424,15 +424,15 @@ using (var view = new GrassCoverErosionInwardsInputView()) { DikeProfile dikeProfile = GetDikeProfileWithGeometry(); - var calculation1 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation1 = new GrassCoverErosionInwardsCalculation { InputParameters = { DikeProfile = dikeProfile } }; - var calculation2 = new GrassCoverErosionInwardsCalculation(0.1); + var calculation2 = new GrassCoverErosionInwardsCalculation(); view.Data = calculation1; ChartData dataBeforeUpdate = view.Chart.Data; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenarioRowTest.cs =================================================================== diff -u -rf4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenarioRowTest.cs (.../GrassCoverErosionInwardsScenarioRowTest.cs) (revision f4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenarioRowTest.cs (.../GrassCoverErosionInwardsScenarioRowTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -44,7 +44,7 @@ mocks.ReplayAll(); // Call - void Call() => new GrassCoverErosionInwardsScenarioRow(new GrassCoverErosionInwardsCalculationScenario(0.1), + void Call() => new GrassCoverErosionInwardsScenarioRow(new GrassCoverErosionInwardsCalculationScenario(), null, assessmentSection); // Assert @@ -57,7 +57,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => new GrassCoverErosionInwardsScenarioRow(new GrassCoverErosionInwardsCalculationScenario(0.1), + void Call() => new GrassCoverErosionInwardsScenarioRow(new GrassCoverErosionInwardsCalculationScenario(), new GrassCoverErosionInwardsFailureMechanism(), null); // Assert @@ -73,7 +73,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call var row = new GrassCoverErosionInwardsScenarioRow(calculation, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); @@ -94,7 +94,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -119,7 +119,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection); @@ -139,7 +139,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection); @@ -167,7 +167,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -198,7 +198,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = new TestGrassCoverErosionInwardsOutput() }; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs =================================================================== diff -u -rf4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision f4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -158,15 +158,15 @@ failureMechanism.CalculationsGroup.Children.AddRange(new[] { - new GrassCoverErosionInwardsCalculationScenario(0.1) + new GrassCoverErosionInwardsCalculationScenario { Name = "Calculation 1", InputParameters = { DikeProfile = dikeProfile1 } }, - new GrassCoverErosionInwardsCalculationScenario(0.1) + new GrassCoverErosionInwardsCalculationScenario { Name = "Calculation 2", InputParameters = Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs =================================================================== diff -u -rf4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision f4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../OvertoppingOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -37,7 +37,7 @@ { // Call var view = new OvertoppingOutputGeneralResultFaultTreeIllustrationPointView( - new GrassCoverErosionInwardsCalculation(0.1), + new GrassCoverErosionInwardsCalculation(), () => new TestGeneralResultFaultTreeIllustrationPoint()); // Assert Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewTest.cs =================================================================== diff -u -rf4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision f4715d4d9ed85a05d3e5abc58dd2e8b27a9e756d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewTest.cs (.../OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410) @@ -37,7 +37,7 @@ { // Call var view = new OvertoppingRateOutputGeneralResultFaultTreeIllustrationPointView( - new GrassCoverErosionInwardsCalculation(0.1), + new GrassCoverErosionInwardsCalculation(), () => new TestGeneralResultFaultTreeIllustrationPoint()); // Assert