Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r42444785d5af2f87c4097525208463f69c4ba47a --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensions.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensions.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensions.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensions.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) @@ -49,7 +49,7 @@ AddEntitiesForFailureMechanismMeta(mechanism, entity); AddEntitiesForStochasticSoilModels(mechanism, registry, entity); AddEntitiesForSurfaceLines(mechanism, registry, entity); - AddEntitiesForSectionResults(mechanism.SectionResultsOld, registry); + AddEntitiesForSectionResults(mechanism.SectionResults, registry); entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0); @@ -92,10 +92,10 @@ } private static void AddEntitiesForSectionResults( - IEnumerable sectionResults, + IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (MacroStabilityInwardsFailureMechanismSectionResultOld failureMechanismSectionResult in sectionResults) + foreach (MacroStabilityInwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { MacroStabilityInwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r42444785d5af2f87c4097525208463f69c4ba47a --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision d07611d7e455e358e7255b2807447412ac56f9c6) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) @@ -26,19 +26,19 @@ namespace Riskeer.Storage.Core.Create.MacroStabilityInwards { /// - /// Extension methods for related to creating a + /// Extension methods for related to creating a /// . /// internal static class MacroStabilityInwardsFailureMechanismSectionResultCreateExtensions { /// /// Creates a based on the information - /// of the . + /// of the . /// /// The result to create a database entity for. /// A new . /// Thrown when is null. - internal static MacroStabilityInwardsSectionResultEntity Create(this MacroStabilityInwardsFailureMechanismSectionResultOld result) + internal static MacroStabilityInwardsSectionResultEntity Create(this MacroStabilityInwardsFailureMechanismSectionResult result) { if (result == null) { @@ -47,12 +47,14 @@ var sectionResultEntity = new MacroStabilityInwardsSectionResultEntity { - SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult), - DetailedAssessmentResult = Convert.ToByte(result.DetailedAssessmentResult), - TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult), - TailorMadeAssessmentProbability = result.TailorMadeAssessmentProbability.ToNaNAsNull(), - UseManualAssembly = Convert.ToByte(result.UseManualAssembly), - ManualAssemblyProbability = result.ManualAssemblyProbability.ToNaNAsNull() + IsRelevant = Convert.ToByte(result.IsRelevant), + InitialFailureMechanismResultType = Convert.ToByte(result.InitialFailureMechanismResult), + ManualInitialFailureMechanismResultProfileProbability = result.ManualInitialFailureMechanismResultProfileProbability.ToNaNAsNull(), + ManualInitialFailureMechanismResultSectionProbability = result.ManualInitialFailureMechanismResultSectionProbability.ToNaNAsNull(), + FurtherAnalysisNeeded = Convert.ToByte(result.FurtherAnalysisNeeded), + ProbabilityRefinementType = Convert.ToByte(result.ProbabilityRefinementType), + RefinedProfileProbability = result.RefinedProfileProbability.ToNaNAsNull(), + RefinedSectionProbability = result.RefinedSectionProbability.ToNaNAsNull() }; return sectionResultEntity; Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -rc1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4 -r42444785d5af2f87c4097525208463f69c4ba47a --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision c1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) @@ -563,7 +563,7 @@ foreach (MacroStabilityInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacroStabilityInwardsSectionResultEntities)) { FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - MacroStabilityInwardsFailureMechanismSectionResultOld result = failureMechanism.SectionResultsOld.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + MacroStabilityInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs =================================================================== diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r42444785d5af2f87c4097525208463f69c4ba47a --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensions.cs) (revision d07611d7e455e358e7255b2807447412ac56f9c6) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensions.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) @@ -20,27 +20,27 @@ // All rights reserved. using System; -using Riskeer.Common.Primitives; +using Riskeer.Common.Data.FailureMechanism; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Storage.Core.DbContext; namespace Riskeer.Storage.Core.Read.MacroStabilityInwards { /// - /// This class defines extension methods for read operations for a + /// This class defines extension methods for read operations for a /// based on the . /// internal static class MacroStabilityInwardsSectionResultEntityReadExtensions { /// /// Reads the and use the information to update a - /// . + /// . /// /// The used to /// update the . /// The target of the read operation. /// Thrown when any parameter is null. - internal static void Read(this MacroStabilityInwardsSectionResultEntity entity, MacroStabilityInwardsFailureMechanismSectionResultOld sectionResult) + internal static void Read(this MacroStabilityInwardsSectionResultEntity entity, MacroStabilityInwardsFailureMechanismSectionResult sectionResult) { if (entity == null) { @@ -52,12 +52,14 @@ throw new ArgumentNullException(nameof(sectionResult)); } - sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult; - sectionResult.DetailedAssessmentResult = (DetailedAssessmentProbabilityOnlyResultType) entity.DetailedAssessmentResult; - sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentProbabilityCalculationResultType) entity.TailorMadeAssessmentResult; - sectionResult.TailorMadeAssessmentProbability = entity.TailorMadeAssessmentProbability.ToNullAsNaN(); - sectionResult.UseManualAssembly = Convert.ToBoolean(entity.UseManualAssembly); - sectionResult.ManualAssemblyProbability = entity.ManualAssemblyProbability.ToNullAsNaN(); + sectionResult.IsRelevant = Convert.ToBoolean(entity.IsRelevant); + sectionResult.InitialFailureMechanismResult = (InitialFailureMechanismResultType) entity.InitialFailureMechanismResultType; + sectionResult.ManualInitialFailureMechanismResultProfileProbability = entity.ManualInitialFailureMechanismResultProfileProbability.ToNullAsNaN(); + sectionResult.ManualInitialFailureMechanismResultSectionProbability = entity.ManualInitialFailureMechanismResultSectionProbability.ToNullAsNaN(); + sectionResult.FurtherAnalysisNeeded = Convert.ToBoolean(entity.FurtherAnalysisNeeded); + sectionResult.ProbabilityRefinementType = (ProbabilityRefinementType) entity.ProbabilityRefinementType; + sectionResult.RefinedProfileProbability = entity.RefinedProfileProbability.ToNullAsNaN(); + sectionResult.RefinedSectionProbability = entity.RefinedSectionProbability.ToNullAsNaN(); } } } \ No newline at end of file Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r42444785d5af2f87c4097525208463f69c4ba47a --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision d07611d7e455e358e7255b2807447412ac56f9c6) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) @@ -22,8 +22,8 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; +using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; -using Riskeer.Common.Primitives; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Storage.Core.Create.MacroStabilityInwards; using Riskeer.Storage.Core.DbContext; @@ -37,63 +37,74 @@ public void Create_SectionResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResultOld) null).Create(); + void Call() => ((MacroStabilityInwardsFailureMechanismSectionResult) null).Create(); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("result", exception.ParamName); } [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults() { // Setup - var random = new Random(39); - var simpleAssessmentResult = random.NextEnumValue(); - var detailedAssessmentResult = random.NextEnumValue(); - var tailorMadeAssessmentResult = random.NextEnumValue(); - double tailorMadeAssessmentProbability = random.NextDouble(); - bool useManualAssembly = random.NextBoolean(); - double manualAssemblyProbability = random.NextDouble(); + var random = new Random(21); + bool isRelevant = random.NextBoolean(); + var initialFailureMechanismResultType = random.NextEnumValue(); + double manualProfileProbability = random.NextDouble(); + double manualSectionProbability = random.NextDouble(); - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + bool furtherAnalysisNeeded = random.NextBoolean(); + var probabilityRefinementType = random.NextEnumValue(); + double refinedProfileProbability = random.NextDouble(); + double refinedSectionProbability = random.NextDouble(); + + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = simpleAssessmentResult, - DetailedAssessmentResult = detailedAssessmentResult, - TailorMadeAssessmentResult = tailorMadeAssessmentResult, - TailorMadeAssessmentProbability = tailorMadeAssessmentProbability, - UseManualAssembly = useManualAssembly, - ManualAssemblyProbability = manualAssemblyProbability + IsRelevant = isRelevant, + InitialFailureMechanismResult = initialFailureMechanismResultType, + ManualInitialFailureMechanismResultProfileProbability = manualProfileProbability, + ManualInitialFailureMechanismResultSectionProbability = manualSectionProbability, + FurtherAnalysisNeeded = furtherAnalysisNeeded, + ProbabilityRefinementType = probabilityRefinementType, + RefinedProfileProbability = refinedProfileProbability, + RefinedSectionProbability = refinedSectionProbability }; // Call MacroStabilityInwardsSectionResultEntity entity = sectionResult.Create(); // Assert - Assert.AreEqual(Convert.ToByte(simpleAssessmentResult), entity.SimpleAssessmentResult); - Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult); - Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult); - Assert.AreEqual(tailorMadeAssessmentProbability, entity.TailorMadeAssessmentProbability); - Assert.AreEqual(Convert.ToByte(useManualAssembly), entity.UseManualAssembly); - Assert.AreEqual(manualAssemblyProbability, entity.ManualAssemblyProbability); + Assert.AreEqual(Convert.ToByte(isRelevant), entity.IsRelevant); + Assert.AreEqual(Convert.ToByte(initialFailureMechanismResultType), entity.InitialFailureMechanismResultType); + Assert.AreEqual(manualProfileProbability, entity.ManualInitialFailureMechanismResultProfileProbability); + Assert.AreEqual(manualSectionProbability, entity.ManualInitialFailureMechanismResultSectionProbability); + Assert.AreEqual(Convert.ToByte(furtherAnalysisNeeded), entity.FurtherAnalysisNeeded); + Assert.AreEqual(Convert.ToByte(probabilityRefinementType), entity.ProbabilityRefinementType); + Assert.AreEqual(refinedProfileProbability, entity.RefinedProfileProbability); + Assert.AreEqual(refinedSectionProbability, entity.RefinedSectionProbability); } [Test] public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults() { // Setup - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - TailorMadeAssessmentProbability = double.NaN, - ManualAssemblyProbability = double.NaN + ManualInitialFailureMechanismResultProfileProbability = double.NaN, + ManualInitialFailureMechanismResultSectionProbability = double.NaN, + RefinedProfileProbability = double.NaN, + RefinedSectionProbability = double.NaN }; // Call - MacroStabilityInwardsSectionResultEntity result = sectionResult.Create(); + MacroStabilityInwardsSectionResultEntity entity = sectionResult.Create(); // Assert - Assert.IsNull(result.TailorMadeAssessmentProbability); - Assert.IsNull(result.ManualAssemblyProbability); + Assert.IsNull(entity.ManualInitialFailureMechanismResultProfileProbability); + Assert.IsNull(entity.ManualInitialFailureMechanismResultSectionProbability); + Assert.IsNull(entity.RefinedProfileProbability); + Assert.IsNull(entity.RefinedSectionProbability); } } } \ No newline at end of file Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r42444785d5af2f87c4097525208463f69c4ba47a --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs) (revision d07611d7e455e358e7255b2807447412ac56f9c6) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensionsTest.cs) (revision 42444785d5af2f87c4097525208463f69c4ba47a) @@ -22,8 +22,8 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; +using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; -using Riskeer.Common.Primitives; using Riskeer.MacroStabilityInwards.Data; using Riskeer.Storage.Core.DbContext; using Riskeer.Storage.Core.Read.MacroStabilityInwards; @@ -37,13 +37,13 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Setup - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call - TestDelegate test = () => ((MacroStabilityInwardsSectionResultEntity) null).Read(sectionResult); + void Call() => ((MacroStabilityInwardsSectionResultEntity) null).Read(sectionResult); // Assert - var exception = Assert.Throws(test); + var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } @@ -54,61 +54,71 @@ var entity = new MacroStabilityInwardsSectionResultEntity(); // Call - TestDelegate call = () => entity.Read(null); + void Call() => entity.Read(null); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("sectionResult", paramName); } [Test] public void Read_ParameterValues_SetsSectionResultWithParameterValues() { // Setup - var random = new Random(31); - var simpleAssessmentResult = random.NextEnumValue(); - var detailedAssessmentResult = random.NextEnumValue(); - var tailorMadeAssessmentResult = random.NextEnumValue(); - double tailorMadeAssessmentProbability = random.NextDouble(); - bool useManualAssembly = random.NextBoolean(); - double manualAssemblyProbability = random.NextDouble(); + var random = new Random(21); + bool isRelevant = random.NextBoolean(); + var initialFailureMechanismResultType = random.NextEnumValue(); + double manualProfileProbability = random.NextDouble(); + double manualSectionProbability = random.NextDouble(); + bool furtherAnalysisNeeded = random.NextBoolean(); + var probabilityRefinementType = random.NextEnumValue(); + double refinedProfileProbability = random.NextDouble(); + double refinedSectionProbability = random.NextDouble(); + var entity = new MacroStabilityInwardsSectionResultEntity { - SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult), - DetailedAssessmentResult = Convert.ToByte(detailedAssessmentResult), - TailorMadeAssessmentResult = Convert.ToByte(tailorMadeAssessmentResult), - TailorMadeAssessmentProbability = tailorMadeAssessmentProbability, - UseManualAssembly = Convert.ToByte(useManualAssembly), - ManualAssemblyProbability = manualAssemblyProbability + IsRelevant = Convert.ToByte(isRelevant), + InitialFailureMechanismResultType = Convert.ToByte(initialFailureMechanismResultType), + ManualInitialFailureMechanismResultProfileProbability = manualProfileProbability, + ManualInitialFailureMechanismResultSectionProbability = manualSectionProbability, + FurtherAnalysisNeeded = Convert.ToByte(furtherAnalysisNeeded), + ProbabilityRefinementType = Convert.ToByte(probabilityRefinementType), + RefinedProfileProbability = refinedProfileProbability, + RefinedSectionProbability = refinedSectionProbability }; - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + // Call entity.Read(sectionResult); // Assert - Assert.AreEqual(simpleAssessmentResult, sectionResult.SimpleAssessmentResult); - Assert.AreEqual(detailedAssessmentResult, sectionResult.DetailedAssessmentResult); - Assert.AreEqual(tailorMadeAssessmentResult, sectionResult.TailorMadeAssessmentResult); - Assert.AreEqual(tailorMadeAssessmentProbability, sectionResult.TailorMadeAssessmentProbability, 1e-6); - Assert.AreEqual(useManualAssembly, sectionResult.UseManualAssembly); - Assert.AreEqual(manualAssemblyProbability, sectionResult.ManualAssemblyProbability, 1e-6); + Assert.AreEqual(isRelevant, sectionResult.IsRelevant); + Assert.AreEqual(initialFailureMechanismResultType, sectionResult.InitialFailureMechanismResult); + Assert.AreEqual(manualProfileProbability, sectionResult.ManualInitialFailureMechanismResultProfileProbability); + Assert.AreEqual(manualSectionProbability, sectionResult.ManualInitialFailureMechanismResultSectionProbability); + Assert.AreEqual(furtherAnalysisNeeded, sectionResult.FurtherAnalysisNeeded); + Assert.AreEqual(probabilityRefinementType, sectionResult.ProbabilityRefinementType); + Assert.AreEqual(refinedProfileProbability, sectionResult.RefinedProfileProbability); + Assert.AreEqual(refinedSectionProbability, sectionResult.RefinedSectionProbability); } [Test] public void Read_EntityWithNullValues_SetsSectionResultWithNaNValues() { // Setup var entity = new MacroStabilityInwardsSectionResultEntity(); - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResultOld(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call entity.Read(sectionResult); // Assert - Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability); - Assert.IsNaN(sectionResult.ManualAssemblyProbability); + Assert.IsNaN(sectionResult.ManualInitialFailureMechanismResultProfileProbability); + Assert.IsNaN(sectionResult.ManualInitialFailureMechanismResultSectionProbability); + Assert.IsNaN(sectionResult.RefinedProfileProbability); + Assert.IsNaN(sectionResult.RefinedSectionProbability); } } } \ No newline at end of file