Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -968,19 +968,19 @@ GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.Sections); CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.SectionResults); - CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles); WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCoverFailureMechanism = assessmentSection.WaveImpactAsphaltCover; CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.Sections); CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.SectionResults); - CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.ForeshoreProfiles); StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.Sections); CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.SectionResults); - CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.ForeshoreProfiles); ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures; @@ -1681,19 +1681,19 @@ GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; CollectionAssert.Contains(changedObjects, grassCoverErosionOutwardsFailureMechanism); CollectionAssert.Contains(changedObjects, grassCoverErosionOutwardsFailureMechanism.SectionResults); - CollectionAssert.Contains(changedObjects, grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.Contains(changedObjects, grassCoverErosionOutwardsFailureMechanism.CalculationsGroup); CollectionAssert.Contains(changedObjects, grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles); WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCoverFailureMechanism = assessmentSection.WaveImpactAsphaltCover; CollectionAssert.Contains(changedObjects, waveImpactAsphaltCoverFailureMechanism); CollectionAssert.Contains(changedObjects, waveImpactAsphaltCoverFailureMechanism.SectionResults); - CollectionAssert.Contains(changedObjects, waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.Contains(changedObjects, waveImpactAsphaltCoverFailureMechanism.CalculationsGroup); CollectionAssert.Contains(changedObjects, waveImpactAsphaltCoverFailureMechanism.ForeshoreProfiles); StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism); CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.SectionResults); - CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.CalculationsGroup); CollectionAssert.Contains(changedObjects, stabilityStoneCoverFailureMechanism.ForeshoreProfiles); ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures; @@ -1851,7 +1851,7 @@ yield return failureMechanismObject; } - foreach (ICalculationBase calculationBase in failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } @@ -1869,7 +1869,7 @@ yield return failureMechanismObject; } - foreach (ICalculationBase calculationBase in failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } @@ -1887,7 +1887,7 @@ yield return failureMechanismObject; } - foreach (ICalculationBase calculationBase in failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -rea605fa74ee1372cd6bbce67c7ec039fef10c6d8 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision ea605fa74ee1372cd6bbce67c7ec039fef10c6d8) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -48,7 +48,7 @@ AddEntitiesForSectionResults(mechanism.SectionResults, registry); AddEntitiesForFailureMechanismMeta(mechanism, entity); AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); - entity.CalculationGroupEntity = mechanism.WaveConditionsCalculationGroup.Create(registry, 0); + entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0); return entity; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision ce73d815b0583615c74550ba004fd553202b43fe) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -526,7 +526,7 @@ WaveImpactAsphaltCoverFailureMechanismMetaEntity metaEntity = entity.WaveImpactAsphaltCoverFailureMechanismMetaEntities.Single(); entity.ReadForeshoreProfiles(failureMechanism.ForeshoreProfiles, metaEntity.ForeshoreProfileCollectionSourcePath, collector); - ReadWaveImpactAsphaltCoverRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.WaveConditionsCalculationGroup, collector); + ReadWaveImpactAsphaltCoverRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, collector); entity.ReadWaveImpactAsphaltCoverGeneralInput(failureMechanism.GeneralWaveImpactAsphaltCoverInput); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rff27539a67b19406483c3e267c7942ff316a4ad1 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision ff27539a67b19406483c3e267c7942ff316a4ad1) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -214,11 +214,11 @@ { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup { Name = "A" }); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup { Name = "B" }); @@ -230,7 +230,7 @@ // Assert Assert.IsNotNull(entity); - Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Name, entity.CalculationGroupEntity.Name); + Assert.AreEqual(failureMechanism.CalculationsGroup.Name, entity.CalculationGroupEntity.Name); Assert.AreEqual(0, entity.CalculationGroupEntity.Order); CalculationGroupEntity[] childGroupEntities = entity.CalculationGroupEntity.CalculationGroupEntity1 Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ce73d815b0583615c74550ba004fd553202b43fe) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -1820,7 +1820,7 @@ Assert.AreEqual(expectedFailureMechanism.GeneralWaveImpactAsphaltCoverInput.DeltaL, actualFailureMechanism.GeneralWaveImpactAsphaltCoverInput.DeltaL); AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); - AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); + AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup); } private static void AssertWaveImpactAsphaltCoverWaveConditionsCalculation(WaveImpactAsphaltCoverWaveConditionsCalculation expectedCalculation, Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision ce73d815b0583615c74550ba004fd553202b43fe) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -2119,12 +2119,12 @@ entity.ReadAsWaveImpactAsphaltCoverFailureMechanism(failureMechanism, collector); // Assert - Assert.AreEqual(2, failureMechanism.WaveConditionsCalculationGroup.Children.Count); + Assert.AreEqual(2, failureMechanism.CalculationsGroup.Children.Count); - ICalculationBase child1 = failureMechanism.WaveConditionsCalculationGroup.Children[0]; + ICalculationBase child1 = failureMechanism.CalculationsGroup.Children[0]; Assert.AreEqual("Child2", child1.Name); - ICalculationBase child2 = failureMechanism.WaveConditionsCalculationGroup.Children[1]; + ICalculationBase child2 = failureMechanism.CalculationsGroup.Children[1]; Assert.AreEqual("Child1", child2.Name); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision ce73d815b0583615c74550ba004fd553202b43fe) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -1232,7 +1232,7 @@ ForeshoreProfile foreshoreProfile = failureMechanism.ForeshoreProfiles[0]; HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations[0]; - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup { Name = "WIAC A", Children = @@ -1294,11 +1294,11 @@ } } }); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup { Name = "WIAC B" }); - failureMechanism.WaveConditionsCalculationGroup.Children.Add( + failureMechanism.CalculationsGroup.Children.Add( new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "Calculation 3", Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs =================================================================== diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision 9838d3c77d032488e2c638798ebcb6383457029c) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -34,15 +34,16 @@ /// Model containing input and output needed to perform different levels of the /// Wave Impact on Asphalt failure mechanism. /// - public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase + public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase, + ICalculatableFailureMechanism { /// /// Initializes a new instance of the class. /// public WaveImpactAsphaltCoverFailureMechanism() : base(Resources.WaveImpactAsphaltCoverFailureMechanism_DisplayName, Resources.WaveImpactAsphaltCoverFailureMechanism_Code) { - WaveConditionsCalculationGroup = new CalculationGroup + CalculationsGroup = new CalculationGroup { Name = RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName }; @@ -51,8 +52,6 @@ GeneralWaveImpactAsphaltCoverInput = new GeneralWaveImpactAsphaltCoverInput(); } - public override IEnumerable Calculations => WaveConditionsCalculationGroup.GetCalculations().OfType(); - /// /// Gets the available foreshore profiles for this instance. /// @@ -68,9 +67,8 @@ /// public GeneralWaveImpactAsphaltCoverInput GeneralWaveImpactAsphaltCoverInput { get; } - /// - /// Gets the container of all wave conditions calculations. - /// - public CalculationGroup WaveConditionsCalculationGroup { get; } + public override IEnumerable Calculations => CalculationsGroup.GetCalculations().OfType(); + + public CalculationGroup CalculationsGroup { get; } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs =================================================================== diff -u -r77a1a6c41c9fc86f454ba14b7027f50146a9dedc -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 77a1a6c41c9fc86f454ba14b7027f50146a9dedc) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -179,15 +179,15 @@ UpdateCalculationsMapData, pcg => pcg.Children.Concat(pcg.Children.OfType() .Select(pc => pc.InputParameters))) { - Observable = FailureMechanism.WaveConditionsCalculationGroup + Observable = FailureMechanism.CalculationsGroup }; calculationGroupObserver = new RecursiveObserver(UpdateCalculationsMapData, pcg => pcg.Children) { - Observable = FailureMechanism.WaveConditionsCalculationGroup + Observable = FailureMechanism.CalculationsGroup }; calculationObserver = new RecursiveObserver(UpdateCalculationsMapData, pcg => pcg.Children) { - Observable = FailureMechanism.WaveConditionsCalculationGroup + Observable = FailureMechanism.CalculationsGroup }; foreshoreProfileObserver = new RecursiveObserver(UpdateForeshoreProfilesMapData, coll => coll) { @@ -216,7 +216,7 @@ private void SetCalculationsMapData() { IEnumerable calculations = - FailureMechanism.WaveConditionsCalculationGroup.GetCalculations().Cast(); + FailureMechanism.CalculationsGroup.GetCalculations().Cast(); calculationsMapData.Features = WaveImpactAsphaltCoverMapDataFeaturesFactory.CreateCalculationFeatures(calculations); } Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -322,7 +322,7 @@ { new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input), - new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, null, + new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection) }; } Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverDataSynchronizationService.cs =================================================================== diff -u -re18edaf3e358e70cb01c8e1ec1c44f1dfbeb5032 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverDataSynchronizationService.cs (.../WaveImpactAsphaltCoverDataSynchronizationService.cs) (revision e18edaf3e358e70cb01c8e1ec1c44f1dfbeb5032) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverDataSynchronizationService.cs (.../WaveImpactAsphaltCoverDataSynchronizationService.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -100,16 +100,16 @@ var changedObjects = new List(); object[] removedObjects = failureMechanism.Sections.OfType() .Concat(failureMechanism.SectionResults) - .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) .Concat(failureMechanism.ForeshoreProfiles) .ToArray(); failureMechanism.ClearAllSections(); changedObjects.Add(failureMechanism); changedObjects.Add(failureMechanism.SectionResults); - failureMechanism.WaveConditionsCalculationGroup.Children.Clear(); - changedObjects.Add(failureMechanism.WaveConditionsCalculationGroup); + failureMechanism.CalculationsGroup.Children.Clear(); + changedObjects.Add(failureMechanism.CalculationsGroup); failureMechanism.ForeshoreProfiles.Clear(); changedObjects.Add(failureMechanism.ForeshoreProfiles); Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.cs =================================================================== diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.cs) (revision 4f4daebe59ab925c98cef039101ec70544530bbe) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -57,7 +57,7 @@ throw new ArgumentNullException(nameof(assessmentSection)); } - return CreateCalculationActivities(failureMechanism.WaveConditionsCalculationGroup, failureMechanism, assessmentSection); + return CreateCalculationActivities(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); } /// Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision 548d487e693b335827451b4f395f1b30e20b9e3e) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -39,13 +39,14 @@ // Assert Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf(failureMechanism); Assert.AreEqual("Golfklappen op asfaltbekleding", failureMechanism.Name); Assert.AreEqual("AGK", failureMechanism.Code); Assert.IsNotNull(failureMechanism.GeneralWaveImpactAsphaltCoverInput); Assert.IsNotNull(failureMechanism.GeneralInput); - Assert.AreEqual("Hydraulische belastingen", failureMechanism.WaveConditionsCalculationGroup.Name); - CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children); + Assert.AreEqual("Hydraulische belastingen", failureMechanism.CalculationsGroup.Name); + CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); CollectionAssert.IsEmpty(failureMechanism.Calculations); @@ -60,7 +61,7 @@ var mocks = new MockRepository(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism { - WaveConditionsCalculationGroup = + CalculationsGroup = { Children = { Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs =================================================================== diff -u -rf7eec559db80cfde85c0450557917735ec82ffdc -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision f7eec559db80cfde85c0450557917735ec82ffdc) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -191,8 +191,8 @@ profile2 }, "path"); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB); + failureMechanism.CalculationsGroup.Children.Add(calculationA); + failureMechanism.CalculationsGroup.Children.Add(calculationB); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] @@ -414,7 +414,7 @@ } }; var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA); + failureMechanism.CalculationsGroup.Children.Add(calculationA); WaveImpactAsphaltCoverFailureMechanismView view = CreateView(failureMechanism, new AssessmentSectionStub()); @@ -440,8 +440,8 @@ HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }; - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB); - failureMechanism.WaveConditionsCalculationGroup.NotifyObservers(); + failureMechanism.CalculationsGroup.Children.Add(calculationB); + failureMechanism.CalculationsGroup.NotifyObservers(); // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast(), calculationMapData); @@ -462,7 +462,7 @@ } }; var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA); + failureMechanism.CalculationsGroup.Children.Add(calculationA); WaveImpactAsphaltCoverFailureMechanismView view = CreateView(failureMechanism, new AssessmentSectionStub()); @@ -502,7 +502,7 @@ } }; var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA); + failureMechanism.CalculationsGroup.Children.Add(calculationA); WaveImpactAsphaltCoverFailureMechanismView view = CreateView(failureMechanism, new AssessmentSectionStub()); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailurePathViewTest.cs =================================================================== diff -u -rc5c44873ed7f7711408758865732490017eb030d -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailurePathViewTest.cs (.../WaveImpactAsphaltCoverFailurePathViewTest.cs) (revision c5c44873ed7f7711408758865732490017eb030d) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailurePathViewTest.cs (.../WaveImpactAsphaltCoverFailurePathViewTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -153,8 +153,8 @@ profile2 }, "path"); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB); + failureMechanism.CalculationsGroup.Children.Add(calculationA); + failureMechanism.CalculationsGroup.Children.Add(calculationB); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -178,7 +178,7 @@ Assert.AreSame(failureMechanism.CalculationsInputComments, calculationsInputComments); var hydraulicBoundariesCalculationGroup = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) children[1]; - Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, hydraulicBoundariesCalculationGroup.WrappedData); + Assert.AreSame(failureMechanism.CalculationsGroup, hydraulicBoundariesCalculationGroup.WrappedData); Assert.IsNull(hydraulicBoundariesCalculationGroup.Parent); Assert.AreSame(failureMechanism, hydraulicBoundariesCalculationGroup.FailureMechanism); Assert.AreSame(assessmentSection, hydraulicBoundariesCalculationGroup.AssessmentSection); @@ -263,7 +263,7 @@ using (var treeViewControl = new TreeViewControl()) { var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); + failureMechanism.CalculationsGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var nodeData = new WaveImpactAsphaltCoverHydraulicLoadsContext(failureMechanism, assessmentSection); @@ -297,7 +297,7 @@ HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(); WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation); WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation); - List calculations = failureMechanism.WaveConditionsCalculationGroup.Children; + List calculations = failureMechanism.CalculationsGroup.Children; calculations.AddRange(new[] { calculationA, Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -324,13 +324,13 @@ Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty()) }; var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); + failureMechanism.CalculationsGroup.Children.Add(calculation); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation, parent, failureMechanism, assessmentSection); - var parentContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -360,7 +360,7 @@ failureMechanism, assessmentSection); - var parentContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -387,14 +387,14 @@ Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty()) }; var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); - failureMechanism.WaveConditionsCalculationGroup.Attach(observer); + failureMechanism.CalculationsGroup.Children.Add(calculation); + failureMechanism.CalculationsGroup.Attach(observer); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation, parent, failureMechanism, assessmentSection); - var parentContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -403,7 +403,7 @@ info.OnNodeRemoved(context, parentContext); // Assert - CollectionAssert.DoesNotContain(failureMechanism.WaveConditionsCalculationGroup.Children, calculation); + CollectionAssert.DoesNotContain(failureMechanism.CalculationsGroup.Children, calculation); } [Test] Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -125,7 +125,7 @@ mocks.ReplayAll(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -145,7 +145,7 @@ mocks.ReplayAll(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -166,7 +166,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var groupContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var groupContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -189,10 +189,10 @@ var calculationItem = new WaveImpactAsphaltCoverWaveConditionsCalculation(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationItem); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(childGroup); + failureMechanism.CalculationsGroup.Children.Add(calculationItem); + failureMechanism.CalculationsGroup.Children.Add(childGroup); - var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -201,17 +201,17 @@ object[] children = info.ChildNodeObjects(nodeData).ToArray(); // Assert - Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Children.Count, children.Length); + Assert.AreEqual(failureMechanism.CalculationsGroup.Children.Count, children.Length); var returnedCalculationContext = (WaveImpactAsphaltCoverWaveConditionsCalculationContext) children[0]; Assert.AreSame(calculationItem, returnedCalculationContext.WrappedData); - Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationContext.Parent); + Assert.AreSame(failureMechanism.CalculationsGroup, returnedCalculationContext.Parent); Assert.AreSame(failureMechanism, returnedCalculationContext.FailureMechanism); Assert.AreSame(assessmentSection, returnedCalculationContext.AssessmentSection); var returnedCalculationGroupContext = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) children[1]; Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData); - Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationGroupContext.Parent); + Assert.AreSame(failureMechanism.CalculationsGroup, returnedCalculationGroupContext.Parent); Assert.AreSame(failureMechanism, returnedCalculationGroupContext.FailureMechanism); Assert.AreSame(assessmentSection, returnedCalculationGroupContext.AssessmentSection); } @@ -466,7 +466,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -575,7 +575,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -678,13 +678,13 @@ { var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var group = new CalculationGroup(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -718,13 +718,13 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var group = new CalculationGroup(); group.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -758,15 +758,15 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var group = new CalculationGroup(); group.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -811,13 +811,13 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var group = new CalculationGroup(); group.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -857,12 +857,12 @@ group.Children.Add(calculationA); group.Children.Add(calculationB); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -906,13 +906,13 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -954,17 +954,17 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1006,17 +1006,17 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = TestHelper.GetScratchPadPath(); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1071,17 +1071,17 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1136,12 +1136,12 @@ group.Children.Add(calculationA); group.Children.Add(calculationB); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1213,12 +1213,12 @@ var group = new CalculationGroup(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1261,12 +1261,12 @@ group.Children.Add(calculationA); group.Children.Add(calculationB); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1323,12 +1323,12 @@ calculationA.Attach(observerA); calculationB.Attach(observerB); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1382,13 +1382,13 @@ var group = new CalculationGroup(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + failureMechanism.CalculationsGroup.Children.Add(group); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1648,12 +1648,12 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup, failureMechanism, assessmentSection); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + failureMechanism.CalculationsGroup.Children.Add(group); + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1666,7 +1666,7 @@ info.OnNodeRemoved(nodeData, parentNodeData); // Assert - CollectionAssert.DoesNotContain(failureMechanism.WaveConditionsCalculationGroup.Children, group); + CollectionAssert.DoesNotContain(failureMechanism.CalculationsGroup.Children, group); } [Test] @@ -1676,7 +1676,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, assessmentSection); @@ -1723,9 +1723,9 @@ observer.Expect(o => o.UpdateObserver()); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Attach(observer); + failureMechanism.CalculationsGroup.Attach(observer); - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, new AssessmentSectionStub()); @@ -1758,8 +1758,8 @@ validateMenuItem.PerformClick(); // Then - Assert.AreEqual(1, failureMechanism.WaveConditionsCalculationGroup.Children.Count); - Assert.IsInstanceOf(failureMechanism.WaveConditionsCalculationGroup.Children[0]); + Assert.AreEqual(1, failureMechanism.CalculationsGroup.Children.Count); + Assert.IsInstanceOf(failureMechanism.CalculationsGroup.Children[0]); // Check expectancies in TearDown() } } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -r013435ed49ecc69ce2a584e37c9d0d7039fa6a7b -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs) (revision 013435ed49ecc69ce2a584e37c9d0d7039fa6a7b) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -196,11 +196,11 @@ new AssessmentSectionStub()); } - protected override IFailureMechanism GetFailureMechanismWithCalculation() + protected override ICalculatableFailureMechanism GetFailureMechanismWithCalculation() { return new WaveImpactAsphaltCoverFailureMechanism { - WaveConditionsCalculationGroup = + CalculationsGroup = { Children = { Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs =================================================================== diff -u -re18edaf3e358e70cb01c8e1ec1c44f1dfbeb5032 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision e18edaf3e358e70cb01c8e1ec1c44f1dfbeb5032) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -128,7 +128,7 @@ object[] expectedRemovedObjects = failureMechanism.Sections.OfType() .Concat(failureMechanism.SectionResults) - .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) + .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) .Concat(failureMechanism.ForeshoreProfiles) .ToArray(); @@ -140,14 +140,14 @@ // the return result, no ToArray() should be called before these assertions: CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.SectionResults); - CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); IObservable[] array = results.ChangedObjects.ToArray(); Assert.AreEqual(4, array.Length); CollectionAssert.Contains(array, failureMechanism); CollectionAssert.Contains(array, failureMechanism.SectionResults); - CollectionAssert.Contains(array, failureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.Contains(array, failureMechanism.CalculationsGroup); CollectionAssert.Contains(array, failureMechanism.ForeshoreProfiles); CollectionAssert.AreEquivalent(expectedRemovedObjects, results.RemovedObjects); @@ -217,11 +217,11 @@ } }; - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutput); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + failureMechanism.CalculationsGroup.Children.Add(calculation); + failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput); + failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); + failureMechanism.CalculationsGroup.Children.Add(calculationWithHydraulicBoundaryLocation); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup { Children = { Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) @@ -90,7 +90,7 @@ WaveImpactAsphaltCoverWaveConditionsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); WaveImpactAsphaltCoverWaveConditionsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); - failureMechanism.WaveConditionsCalculationGroup.Children.AddRange(new[] + failureMechanism.CalculationsGroup.Children.AddRange(new[] { calculation1, calculation2