Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableFailureMechanismAssemblyResult.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableFailureMechanismAssemblyResult.cs (.../SerializableFailureMechanismAssemblyResult.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/DataTypes/SerializableFailureMechanismAssemblyResult.cs (.../SerializableFailureMechanismAssemblyResult.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -49,7 +49,7 @@ AssemblyMethod = isManual ? SerializableAssemblyMethod.Manual - : SerializableAssemblyMethod.WBI1B1; + : SerializableAssemblyMethod.BOI1B1; } /// Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs (.../AssemblyXmlEnumIdentifiers.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/AssemblyXmlEnumIdentifiers.cs (.../AssemblyXmlEnumIdentifiers.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -108,34 +108,34 @@ #region SerializableAssemblyMethod /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssemblyMethodWBI0A2 = "WBI-0A-2"; + public const string SerializableAssemblyMethodBOI0A2 = "WBI-0A-2"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssemblyMethodWBI1B1 = "WBI-1B-1"; + public const string SerializableAssemblyMethodBOI1B1 = "WBI-1B-1"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssemblyMethodWBI2B1 = "WBI-2B-1"; + public const string SerializableAssemblyMethodBOI2B1 = "WBI-2B-1"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssemblyMethodWBI3A1 = "WBI-3A-1"; + public const string SerializableAssemblyMethodBOI3A1 = "WBI-3A-1"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssemblyMethodWBI3B1 = "WBI-3B-1"; + public const string SerializableAssemblyMethodBOI3B1 = "WBI-3B-1"; /// - /// Identifier for . + /// Identifier for . /// - public const string SerializableAssemblyMethodWBI3C1 = "WBI-3C-1"; + public const string SerializableAssemblyMethodBOI3C1 = "WBI-3C-1"; /// /// Identifier for . Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssemblyMethod.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssemblyMethod.cs (.../SerializableAssemblyMethod.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/SerializableAssemblyMethod.cs (.../SerializableAssemblyMethod.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -29,40 +29,40 @@ public enum SerializableAssemblyMethod { /// - /// Represents the assembly method WBI-0A-2. + /// Represents the assembly method BOI-0A-2. /// - [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI0A2)] - WBI0A2 = 1, + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI0A2)] + BOI0A2 = 1, /// - /// Represents the assembly method WBI-1B-1. + /// Represents the assembly method BOI-1B-1. /// - [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI1B1)] - WBI1B1 = 2, + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI1B1)] + BOI1B1 = 2, /// - /// Represents the assembly method WBI-2B-1. + /// Represents the assembly method BOI-2B-1. /// - [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI2B1)] - WBI2B1 = 3, + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI2B1)] + BOI2B1 = 3, /// - /// Represents the assembly method WBI-3A-1. + /// Represents the assembly method BOI-3A-1. /// - [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3A1)] - WBI3A1 = 4, + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI3A1)] + BOI3A1 = 4, /// - /// Represents the assembly method WBI-3B-1. + /// Represents the assembly method BOI-3B-1. /// - [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3B1)] - WBI3B1 = 5, + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI3B1)] + BOI3B1 = 5, /// - /// Represents the assembly method WBI-3C-1. + /// Represents the assembly method BOI-3C-1. /// - [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3C1)] - WBI3C1 = 6, + [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI3C1)] + BOI3C1 = 6, /// /// Represents a manual assembly. Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableFailureMechanismAssemblyResultTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableFailureMechanismAssemblyResultTest.cs (.../SerializableFailureMechanismAssemblyResultTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/DataTypes/SerializableFailureMechanismAssemblyResultTest.cs (.../SerializableFailureMechanismAssemblyResultTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -51,7 +51,7 @@ [Test] [TestCase(true, SerializableAssemblyMethod.Manual)] - [TestCase(false, SerializableAssemblyMethod.WBI1B1)] + [TestCase(false, SerializableAssemblyMethod.BOI1B1)] public void Constructor_WithValidData_ReturnsExpectedValues(bool isManual, SerializableAssemblyMethod expectedAssemblyMethod) { // Setup Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs (.../AssemblyXmlEnumIdentifiersTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs (.../AssemblyXmlEnumIdentifiersTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -46,12 +46,12 @@ Assert.AreEqual("C", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionAssemblyGroupC); Assert.AreEqual("D", AssemblyXmlEnumIdentifiers.SerializableAssessmentSectionAssemblyGroupD); - Assert.AreEqual("WBI-0A-2", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI0A2); - Assert.AreEqual("WBI-1B-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI1B1); - Assert.AreEqual("WBI-2B-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI2B1); - Assert.AreEqual("WBI-3A-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3A1); - Assert.AreEqual("WBI-3B-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3B1); - Assert.AreEqual("WBI-3C-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodWBI3C1); + Assert.AreEqual("WBI-0A-2", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI0A2); + Assert.AreEqual("WBI-1B-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI1B1); + Assert.AreEqual("WBI-2B-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI2B1); + Assert.AreEqual("WBI-3A-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI3A1); + Assert.AreEqual("WBI-3B-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI3B1); + Assert.AreEqual("WBI-3C-1", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodBOI3C1); Assert.AreEqual("HANDMTG", AssemblyXmlEnumIdentifiers.SerializableAssemblyMethodManual); Assert.AreEqual("GENRK", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismTypeGeneric); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableAssemblyMethodTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableAssemblyMethodTest.cs (.../SerializableAssemblyMethodTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/SerializableAssemblyMethodTest.cs (.../SerializableAssemblyMethodTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -33,22 +33,22 @@ new Dictionary { { - SerializableAssemblyMethod.WBI0A2, 1 + SerializableAssemblyMethod.BOI0A2, 1 }, { - SerializableAssemblyMethod.WBI1B1, 2 + SerializableAssemblyMethod.BOI1B1, 2 }, { - SerializableAssemblyMethod.WBI2B1, 3 + SerializableAssemblyMethod.BOI2B1, 3 }, { - SerializableAssemblyMethod.WBI3A1, 4 + SerializableAssemblyMethod.BOI3A1, 4 }, { - SerializableAssemblyMethod.WBI3B1, 5 + SerializableAssemblyMethod.BOI3B1, 5 }, { - SerializableAssemblyMethod.WBI3C1, 6 + SerializableAssemblyMethod.BOI3C1, 6 }, { SerializableAssemblyMethod.Manual, 7 @@ -59,22 +59,22 @@ new Dictionary { { - SerializableAssemblyMethod.WBI0A2, "WBI-0A-2" + SerializableAssemblyMethod.BOI0A2, "WBI-0A-2" }, { - SerializableAssemblyMethod.WBI1B1, "WBI-1B-1" + SerializableAssemblyMethod.BOI1B1, "WBI-1B-1" }, { - SerializableAssemblyMethod.WBI2B1, "WBI-2B-1" + SerializableAssemblyMethod.BOI2B1, "WBI-2B-1" }, { - SerializableAssemblyMethod.WBI3A1, "WBI-3A-1" + SerializableAssemblyMethod.BOI3A1, "WBI-3A-1" }, { - SerializableAssemblyMethod.WBI3B1, "WBI-3B-1" + SerializableAssemblyMethod.BOI3B1, "WBI-3B-1" }, { - SerializableAssemblyMethod.WBI3C1, "WBI-3C-1" + SerializableAssemblyMethod.BOI3C1, "WBI-3C-1" }, { SerializableAssemblyMethod.Manual, "HANDMTG" Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs (.../SerializableFailureMechanismSectionTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs (.../SerializableFailureMechanismSectionTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -167,7 +167,7 @@ } [Test] - [TestCase(SerializableAssemblyMethod.WBI0A2, true)] + [TestCase(SerializableAssemblyMethod.BOI0A2, true)] [TestCase(null, false)] public void ShouldSerializeAssemblyMethod_WithAssemblyMethodValues_ReturnsExpectedValue(SerializableAssemblyMethod? assemblyMethod, bool expectedShouldSerialize) { Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -281,7 +281,7 @@ assessmentSection); var totalAssemblyResult = new SerializableTotalAssemblyResult( - "veiligheidsoordeel_1", assessmentProcess, SerializableAssemblyMethod.WBI2B1, + "veiligheidsoordeel_1", assessmentProcess, SerializableAssemblyMethod.BOI2B1, SerializableAssessmentSectionAssemblyGroup.B, 0.00068354); var failureMechanism = new SerializableFailureMechanism( @@ -308,7 +308,7 @@ var result = new SerializableFailureMechanismSectionAssembly( "resultaat_GABI_1", failureMechanism, section1, new SerializableFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI0A2, SerializableFailureMechanismSectionAssemblyGroup.III, 0.00073)); + SerializableAssemblyMethod.BOI0A2, SerializableFailureMechanismSectionAssemblyGroup.III, 0.00073)); var sections2 = new SerializableFailureMechanismSectionCollection("vakindeling_gecombineerd"); var section2 = new SerializableFailureMechanismSection( @@ -322,28 +322,28 @@ new Point2D(10.23, 10.24) }, SerializableFailureMechanismSectionType.Combined, - SerializableAssemblyMethod.WBI3A1); + SerializableAssemblyMethod.BOI3A1); var combinedResult = new SerializableCombinedFailureMechanismSectionAssembly( "resultaat_gecombineerd_1", totalAssemblyResult, section2, new[] { new SerializableCombinedFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI3B1, + SerializableAssemblyMethod.BOI3B1, SerializableFailureMechanismType.Generic, "HTKW", "Hoogte kunstwerk", SerializableFailureMechanismSectionAssemblyGroup.III), new SerializableCombinedFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI3B1, + SerializableAssemblyMethod.BOI3B1, SerializableFailureMechanismType.Generic, "STPH", "Piping", SerializableFailureMechanismSectionAssemblyGroup.II), new SerializableCombinedFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI3B1, + SerializableAssemblyMethod.BOI3B1, SerializableFailureMechanismType.Specific, "NIEUW", "Specifiek", SerializableFailureMechanismSectionAssemblyGroup.Zero) }, new SerializableFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI3C1, SerializableFailureMechanismSectionAssemblyGroup.I)); + SerializableAssemblyMethod.BOI3C1, SerializableFailureMechanismSectionAssemblyGroup.I)); var assembly = new SerializableAssembly( "assemblage_1", Index: Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableAssemblyMethod.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableAssemblyMethod.cs (.../ExportableAssemblyMethod.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableAssemblyMethod.cs (.../ExportableAssemblyMethod.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -27,33 +27,33 @@ public enum ExportableAssemblyMethod { /// - /// Represents the assembly method WBI-0A-2. + /// Represents the assembly method BOI-0A-2. /// - WBI0A2 = 1, + BOI0A2 = 1, /// - /// Represents the assembly method WBI-1B-1. + /// Represents the assembly method BOI-1B-1. /// - WBI1B1 = 2, + BOI1B1 = 2, /// - /// Represents the assembly method WBI-2B-1. + /// Represents the assembly method BOI-2B-1. /// - WBI2B1 = 3, + BOI2B1 = 3, /// - /// Represents the assembly method WBI-3A-1. + /// Represents the assembly method BOI-3A-1. /// - WBI3A1 = 4, + BOI3A1 = 4, /// - /// Represents the assembly method WBI-3B-1. + /// Represents the assembly method BOI-3B-1. /// - WBI3B1 = 5, + BOI3B1 = 5, /// - /// Represents the assembly method WBI-3C-1. + /// Represents the assembly method BOI-3C-1. /// - WBI3C1 = 6 + BOI3C1 = 6 } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreator.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -90,7 +90,7 @@ .Select(SerializableCombinedFailureMechanismSectionAssemblyResultCreator.Create) .ToArray(), new SerializableFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI3C1, + SerializableAssemblyMethod.BOI3C1, SerializableFailureMechanismSectionAssemblyGroupCreator.Create( combinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyGroup)))); } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssemblyMethodCreator.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssemblyMethodCreator.cs (.../SerializableAssemblyMethodCreator.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableAssemblyMethodCreator.cs (.../SerializableAssemblyMethodCreator.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -53,16 +53,16 @@ switch (assemblyMethod) { - case ExportableAssemblyMethod.WBI1B1: - return SerializableAssemblyMethod.WBI1B1; - case ExportableAssemblyMethod.WBI2B1: - return SerializableAssemblyMethod.WBI2B1; - case ExportableAssemblyMethod.WBI3A1: - return SerializableAssemblyMethod.WBI3A1; - case ExportableAssemblyMethod.WBI3B1: - return SerializableAssemblyMethod.WBI3B1; - case ExportableAssemblyMethod.WBI3C1: - return SerializableAssemblyMethod.WBI3C1; + case ExportableAssemblyMethod.BOI1B1: + return SerializableAssemblyMethod.BOI1B1; + case ExportableAssemblyMethod.BOI2B1: + return SerializableAssemblyMethod.BOI2B1; + case ExportableAssemblyMethod.BOI3A1: + return SerializableAssemblyMethod.BOI3A1; + case ExportableAssemblyMethod.BOI3B1: + return SerializableAssemblyMethod.BOI3B1; + case ExportableAssemblyMethod.BOI3C1: + return SerializableAssemblyMethod.BOI3C1; default: throw new NotSupportedException(); } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableFailureMechanismSectionAssemblyResultCreator.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs (.../SerializableFailureMechanismSectionAssemblyResultCreator.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -53,7 +53,7 @@ ValidateAssemblyResult(sectionResult); return new SerializableFailureMechanismSectionAssemblyResult( - SerializableAssemblyMethod.WBI0A2, + SerializableAssemblyMethod.BOI0A2, SerializableFailureMechanismSectionAssemblyGroupCreator.Create(sectionResult.AssemblyGroup), sectionResult.Probability); } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs =================================================================== diff -u -r471224d51d3bab0b29df0f0cba10edb319b1a7ca -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 471224d51d3bab0b29df0f0cba10edb319b1a7ca) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -87,7 +87,7 @@ private static ExportableAssessmentSectionAssemblyResult CreateExportableAssessmentSectionAssemblyResult(AssessmentSection assessmentSection) { AssessmentSectionAssemblyResult assemblyResult = AssessmentSectionAssemblyFactory.AssembleAssessmentSection(assessmentSection).AssemblyResult; - return new ExportableAssessmentSectionAssemblyResult(ExportableAssemblyMethod.WBI2B1, assemblyResult.AssemblyGroup, + return new ExportableAssessmentSectionAssemblyResult(ExportableAssemblyMethod.BOI2B1, assemblyResult.AssemblyGroup, assemblyResult.Probability); } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -67,11 +67,11 @@ assessmentSection.ReferenceLine, assemblyResult.SectionStart, assemblyResult.SectionEnd), assemblyResult.SectionStart, assemblyResult.SectionEnd, - ExportableAssemblyMethod.WBI3A1); + ExportableAssemblyMethod.BOI3A1); var exportableSectionResult = new ExportableCombinedSectionAssembly( exportableSection, new ExportableFailureMechanismSectionAssemblyResult( - exportableSection, assemblyResult.TotalResult, ExportableAssemblyMethod.WBI3C1), + exportableSection, assemblyResult.TotalResult, ExportableAssemblyMethod.BOI3C1), CreateFailureMechanismCombinedSectionAssemblyResults(assemblyResult, assessmentSection)); sectionResults.Add(exportableSectionResult); @@ -134,7 +134,7 @@ string failureMechanismCode, string failureMechanismName) { return new ExportableFailureMechanismCombinedSectionAssemblyResult( - new ExportableFailureMechanismSubSectionAssemblyResult(sectionAssemblyGroup, ExportableAssemblyMethod.WBI3B1), + new ExportableFailureMechanismSubSectionAssemblyResult(sectionAssemblyGroup, ExportableAssemblyMethod.BOI3B1), failureMechanismType, failureMechanismCode, failureMechanismName); } } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs (.../ExportableFailureMechanismFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs (.../ExportableFailureMechanismFactory.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -124,7 +124,7 @@ exportableResults.Add( new ExportableFailureMechanismSectionAssemblyWithProbabilityResult( failureMechanismSectionPair.Value, assemblyResult.FailureMechanismSectionAssemblyGroup, - assemblyResult.SectionProbability, ExportableAssemblyMethod.WBI0A2)); + assemblyResult.SectionProbability, ExportableAssemblyMethod.BOI0A2)); } return exportableResults; Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableAssemblyMethodTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableAssemblyMethodTest.cs (.../ExportableAssemblyMethodTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableAssemblyMethodTest.cs (.../ExportableAssemblyMethodTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -33,22 +33,22 @@ new Dictionary { { - ExportableAssemblyMethod.WBI0A2, 1 + ExportableAssemblyMethod.BOI0A2, 1 }, { - ExportableAssemblyMethod.WBI1B1, 2 + ExportableAssemblyMethod.BOI1B1, 2 }, { - ExportableAssemblyMethod.WBI2B1, 3 + ExportableAssemblyMethod.BOI2B1, 3 }, { - ExportableAssemblyMethod.WBI3A1, 4 + ExportableAssemblyMethod.BOI3A1, 4 }, { - ExportableAssemblyMethod.WBI3B1, 5 + ExportableAssemblyMethod.BOI3B1, 5 }, { - ExportableAssemblyMethod.WBI3C1, 6 + ExportableAssemblyMethod.BOI3C1, 6 } }; } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyMethodCreatorTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyMethodCreatorTest.cs (.../SerializableAssemblyMethodCreatorTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyMethodCreatorTest.cs (.../SerializableAssemblyMethodCreatorTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -46,11 +46,11 @@ } [Test] - [TestCase(ExportableAssemblyMethod.WBI1B1, SerializableAssemblyMethod.WBI1B1)] - [TestCase(ExportableAssemblyMethod.WBI2B1, SerializableAssemblyMethod.WBI2B1)] - [TestCase(ExportableAssemblyMethod.WBI3A1, SerializableAssemblyMethod.WBI3A1)] - [TestCase(ExportableAssemblyMethod.WBI3B1, SerializableAssemblyMethod.WBI3B1)] - [TestCase(ExportableAssemblyMethod.WBI3C1, SerializableAssemblyMethod.WBI3C1)] + [TestCase(ExportableAssemblyMethod.BOI1B1, SerializableAssemblyMethod.BOI1B1)] + [TestCase(ExportableAssemblyMethod.BOI2B1, SerializableAssemblyMethod.BOI2B1)] + [TestCase(ExportableAssemblyMethod.BOI3A1, SerializableAssemblyMethod.BOI3A1)] + [TestCase(ExportableAssemblyMethod.BOI3B1, SerializableAssemblyMethod.BOI3B1)] + [TestCase(ExportableAssemblyMethod.BOI3C1, SerializableAssemblyMethod.BOI3C1)] public void Create_WithAssemblyMethod_ReturnsExpectedValues(ExportableAssemblyMethod assemblyMethod, SerializableAssemblyMethod expectedAssemblyMethod) { Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -98,7 +98,7 @@ CollectionAssert.AreEqual(assessmentSection.ReferenceLine.Points, exportableAssessmentSection.Geometry); ExportableAssessmentSectionAssemblyResult exportableAssessmentSectionAssemblyResult = exportableAssessmentSection.AssessmentSectionAssembly; - Assert.AreEqual(ExportableAssemblyMethod.WBI2B1, exportableAssessmentSectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI2B1, exportableAssessmentSectionAssemblyResult.AssemblyMethod); Assert.AreEqual(AssessmentSectionAssemblyGroup.APlus, exportableAssessmentSectionAssemblyResult.AssemblyGroup); Assert.AreEqual(0.14, exportableAssessmentSectionAssemblyResult.Probability); @@ -107,11 +107,11 @@ Assert.AreEqual(1, exportableAssessmentSection.CombinedSectionAssemblies.Count()); ExportableCombinedSectionAssembly exportableCombinedSectionAssembly = exportableAssessmentSection.CombinedSectionAssemblies.ElementAt(0); Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Zero, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyGroup); - Assert.AreEqual(ExportableAssemblyMethod.WBI3C1, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3C1, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyMethod); Assert.AreEqual(0.0, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.FailureMechanismSection.StartDistance); Assert.AreEqual(1.0, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.FailureMechanismSection.EndDistance); AssertExportableFailureMechanismCombinedSectionAssemblyResults(exportableCombinedSectionAssembly.FailureMechanismResults, assessmentSection); - Assert.AreEqual(ExportableAssemblyMethod.WBI3A1, exportableCombinedSectionAssembly.Section.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3A1, exportableCombinedSectionAssembly.Section.AssemblyMethod); Assert.AreEqual(0.0, exportableCombinedSectionAssembly.Section.StartDistance); Assert.AreEqual(1.0, exportableCombinedSectionAssembly.Section.EndDistance); } @@ -173,7 +173,7 @@ CollectionAssert.AreEqual(assessmentSection.ReferenceLine.Points, exportableAssessmentSection.Geometry); ExportableAssessmentSectionAssemblyResult exportableAssessmentSectionAssemblyResult = exportableAssessmentSection.AssessmentSectionAssembly; - Assert.AreEqual(ExportableAssemblyMethod.WBI2B1, exportableAssessmentSectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI2B1, exportableAssessmentSectionAssemblyResult.AssemblyMethod); Assert.AreEqual(AssessmentSectionAssemblyGroup.APlus, exportableAssessmentSectionAssemblyResult.AssemblyGroup); Assert.AreEqual(0.14, exportableAssessmentSectionAssemblyResult.Probability); @@ -182,11 +182,11 @@ Assert.AreEqual(1, exportableAssessmentSection.CombinedSectionAssemblies.Count()); ExportableCombinedSectionAssembly exportableCombinedSectionAssembly = exportableAssessmentSection.CombinedSectionAssemblies.ElementAt(0); Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Zero, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyGroup); - Assert.AreEqual(ExportableAssemblyMethod.WBI3C1, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3C1, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.AssemblyMethod); Assert.AreEqual(0.0, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.FailureMechanismSection.StartDistance); Assert.AreEqual(1.0, exportableCombinedSectionAssembly.CombinedSectionAssemblyResult.FailureMechanismSection.EndDistance); CollectionAssert.IsEmpty(exportableCombinedSectionAssembly.FailureMechanismResults); - Assert.AreEqual(ExportableAssemblyMethod.WBI3A1, exportableCombinedSectionAssembly.Section.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3A1, exportableCombinedSectionAssembly.Section.AssemblyMethod); Assert.AreEqual(0.0, exportableCombinedSectionAssembly.Section.StartDistance); Assert.AreEqual(1.0, exportableCombinedSectionAssembly.Section.EndDistance); } @@ -363,7 +363,7 @@ Assert.AreEqual(expectedFailureMechanismType, actualExportableFailureMechanismCombinedSectionAssemblyResult.FailureMechanismType); Assert.AreEqual(failureMechanism.Name, actualExportableFailureMechanismCombinedSectionAssemblyResult.Name); Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, actualExportableFailureMechanismCombinedSectionAssemblyResult.SectionAssemblyResult.AssemblyGroup); - Assert.AreEqual(ExportableAssemblyMethod.WBI3B1, actualExportableFailureMechanismCombinedSectionAssemblyResult.SectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3B1, actualExportableFailureMechanismCombinedSectionAssemblyResult.SectionAssemblyResult.AssemblyMethod); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs =================================================================== diff -u -r3e75fc50ffdf533afc5985680446e00f32c38f8a -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision 3e75fc50ffdf533afc5985680446e00f32c38f8a) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -174,7 +174,7 @@ Assert.AreEqual(expectedSection.SectionStart, actualSection.StartDistance); Assert.AreEqual(expectedSection.SectionEnd, actualSection.EndDistance); CollectionAssert.AreEqual(expectedGeometry, actualSection.Geometry); - Assert.AreEqual(ExportableAssemblyMethod.WBI3A1, actualSection.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3A1, actualSection.AssemblyMethod); } private static void AssertExportableCombinedFailureMechanismSectionResult(CombinedFailureMechanismSectionAssemblyResult expectedSection, @@ -184,7 +184,7 @@ { Assert.AreSame(actualSection, actualSectionResult.Section); Assert.AreEqual(expectedSection.TotalResult, actualSectionResult.CombinedSectionAssemblyResult.AssemblyGroup); - Assert.AreEqual(ExportableAssemblyMethod.WBI3C1, actualSectionResult.CombinedSectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI3C1, actualSectionResult.CombinedSectionAssemblyResult.AssemblyMethod); IEnumerable failureMechanismCombinedSectionResults = actualSectionResult.FailureMechanismResults; @@ -195,7 +195,7 @@ } Assert.AreEqual(17, failureMechanismCombinedSectionResults.Count()); - Assert.IsTrue(failureMechanismCombinedSectionResults.All(result => result.SectionAssemblyResult.AssemblyMethod == ExportableAssemblyMethod.WBI3B1)); + Assert.IsTrue(failureMechanismCombinedSectionResults.All(result => result.SectionAssemblyResult.AssemblyMethod == ExportableAssemblyMethod.BOI3B1)); AssertSubSection(expectedSection.Piping, "STPH", ExportableFailureMechanismType.Generic, failureMechanismCombinedSectionResults.ElementAt(0)); Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableAssessmentSectionAssemblyResultTestFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableAssessmentSectionAssemblyResultTestFactory.cs (.../ExportableAssessmentSectionAssemblyResultTestFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableAssessmentSectionAssemblyResultTestFactory.cs (.../ExportableAssessmentSectionAssemblyResultTestFactory.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -37,7 +37,7 @@ public static ExportableAssessmentSectionAssemblyResult CreateResult() { return new ExportableAssessmentSectionAssemblyResult( - ExportableAssemblyMethod.WBI2B1, AssessmentSectionAssemblyGroup.C, 0.0); + ExportableAssemblyMethod.BOI2B1, AssessmentSectionAssemblyGroup.C, 0.0); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs (.../ExportableFailureMechanismSectionAssemblyResultTestHelper.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs (.../ExportableFailureMechanismSectionAssemblyResultTestHelper.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -61,7 +61,7 @@ FailureMechanismSectionAssemblyResult expectedAssemblyResult = expectedAssemblyResultWrapper.AssemblyResult; Assert.AreEqual(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup, actualExportableAssemblyResult.AssemblyGroup); Assert.AreEqual(expectedAssemblyResult.SectionProbability, actualExportableAssemblyResult.Probability); - Assert.AreEqual(ExportableAssemblyMethod.WBI0A2, actualExportableAssemblyResult.AssemblyMethod); + Assert.AreEqual(ExportableAssemblyMethod.BOI0A2, actualExportableAssemblyResult.AssemblyMethod); } } } Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismSectionTestFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismSectionTestFactory.cs (.../ExportableFailureMechanismSectionTestFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismSectionTestFactory.cs (.../ExportableFailureMechanismSectionTestFactory.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -69,7 +69,7 @@ { new Point2D(1, 1), new Point2D(3, 3) - }, 1, 3, ExportableAssemblyMethod.WBI3A1); + }, 1, 3, ExportableAssemblyMethod.BOI3A1); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismAssemblyResultTestHelper.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r12a45184a234ff9d485fac043e1668a0c5bf8f93 --- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismAssemblyResultTestHelper.cs (.../SerializableFailureMechanismAssemblyResultTestHelper.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismAssemblyResultTestHelper.cs (.../SerializableFailureMechanismAssemblyResultTestHelper.cs) (revision 12a45184a234ff9d485fac043e1668a0c5bf8f93) @@ -51,7 +51,7 @@ private static SerializableAssemblyMethod GetAssemblyMethod(bool isManual) { - return isManual ? SerializableAssemblyMethod.Manual : SerializableAssemblyMethod.WBI1B1; + return isManual ? SerializableAssemblyMethod.Manual : SerializableAssemblyMethod.BOI1B1; } } } \ No newline at end of file