Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs =================================================================== diff -u -rd226a725b8d8cff126a9332f32431594bf140a05 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs (.../AssemblyGmlWriter.cs) (revision d226a725b8d8cff126a9332f32431594bf140a05) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs (.../AssemblyGmlWriter.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -199,7 +199,7 @@ WriteFeatureMember(writeFailureMechanismAction); - foreach (ExportableFailureMechanismSectionAssemblyWithProbabilityResult sectionAssemblyResult in failureMechanism.SectionAssemblyResults) + foreach (ExportableFailureMechanismSectionAssemblyResult sectionAssemblyResult in failureMechanism.SectionAssemblyResults) { WriteFeatureMember(() => WriteSectionAssemblyResult(sectionAssemblyResult, failureMechanism.Id)); } @@ -224,7 +224,7 @@ writer.WriteEndElement(); } - private void WriteSectionAssemblyResult(ExportableFailureMechanismSectionAssemblyWithProbabilityResult sectionAssemblyResult, + private void WriteSectionAssemblyResult(ExportableFailureMechanismSectionAssemblyResult sectionAssemblyResult, string failureMechanismId) { WriteStartElementWithId(AssemblyXmlIdentifiers.FailureMechanismSectionAssembly, AssemblyXmlIdentifiers.UboiNamespace, sectionAssemblyResult.Id); Fisheye: Tag 191163e5ea9e3725076cd87d69225f6420bd2aad refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableFailureMechanismSectionAssemblyWithProbabilityResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableGenericFailureMechanism.cs =================================================================== diff -u -r3fedb02f6284e45456911f5831bb399ecc85e307 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableGenericFailureMechanism.cs (.../ExportableGenericFailureMechanism.cs) (revision 3fedb02f6284e45456911f5831bb399ecc85e307) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableGenericFailureMechanism.cs (.../ExportableGenericFailureMechanism.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -40,7 +40,7 @@ /// or is null. /// Thrown when is invalid. public ExportableGenericFailureMechanism(string id, ExportableFailureMechanismAssemblyResult failureMechanismAssembly, - IEnumerable sectionAssemblyResults, + IEnumerable sectionAssemblyResults, string code) : base(id, failureMechanismAssembly, sectionAssemblyResults) { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableSpecificFailureMechanism.cs =================================================================== diff -u -r3fedb02f6284e45456911f5831bb399ecc85e307 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableSpecificFailureMechanism.cs (.../ExportableSpecificFailureMechanism.cs) (revision 3fedb02f6284e45456911f5831bb399ecc85e307) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/ExportableSpecificFailureMechanism.cs (.../ExportableSpecificFailureMechanism.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -40,7 +40,7 @@ /// or is null. /// Thrown when is invalid. public ExportableSpecificFailureMechanism(string id, ExportableFailureMechanismAssemblyResult failureMechanismAssembly, - IEnumerable sectionAssemblyResults, + IEnumerable sectionAssemblyResults, string name) : base(id, failureMechanismAssembly, sectionAssemblyResults) { Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs =================================================================== diff -u -rfaef9046b62f643860c2885dc4270fce2542a1e3 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs (.../AssemblyGmlWriterTest.cs) (revision faef9046b62f643860c2885dc4270fce2542a1e3) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyGmlWriterTest.cs (.../AssemblyGmlWriterTest.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -175,12 +175,12 @@ new ExportableGenericFailureMechanism("toetsspoorGABI", new ExportableFailureMechanismAssemblyResult(0.08419, ExportableAssemblyMethod.BOI1A1), new[] { - new ExportableFailureMechanismSectionAssemblyWithProbabilityResult( - "resultaat_GABI_1", failureMechanismSection, FailureMechanismSectionAssemblyGroup.III, - 0.00073, ExportableAssemblyMethod.BOI0B1, ExportableAssemblyMethod.BOI0A2) + new ExportableFailureMechanismSectionAssemblyResult( + "resultaat_GABI_1", failureMechanismSection, 0.00073, FailureMechanismSectionAssemblyGroup.III, + ExportableAssemblyMethod.BOI0B1, ExportableAssemblyMethod.BOI0A2) }, "GABI"), new ExportableSpecificFailureMechanism("specifiekFaalmechanisme", new ExportableFailureMechanismAssemblyResult(0.002834, ExportableAssemblyMethod.BOI1A1), - Enumerable.Empty(), "Specifiek faalmechanisme") + Enumerable.Empty(), "Specifiek faalmechanisme") }, new[] { new ExportableCombinedSectionAssembly(combinedSection, new ExportableFailureMechanismSectionAssemblyResult( Fisheye: Tag 191163e5ea9e3725076cd87d69225f6420bd2aad refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismSectionAssemblyWithProbabilityResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismTest.cs =================================================================== diff -u -r3fedb02f6284e45456911f5831bb399ecc85e307 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 3fedb02f6284e45456911f5831bb399ecc85e307) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -37,7 +37,7 @@ public void Constructor_InvalidId_ThrowsArgumentException(string invalidId) { // Call - void Call() => new TestExportableFailureMechanism(invalidId, null, Enumerable.Empty()); + void Call() => new TestExportableFailureMechanism(invalidId, null, Enumerable.Empty()); // Assert const string expectedMessage = "'id' must have a value and consist only of alphanumerical characters, '-', '_' or '.'."; @@ -48,7 +48,7 @@ public void Constructor_FailureMechanismAssemblyResultNull_ThrowsArgumentNullException() { // Call - void Call() => new TestExportableFailureMechanism("id", null, Enumerable.Empty()); + void Call() => new TestExportableFailureMechanism("id", null, Enumerable.Empty()); // Assert var exception = Assert.Throws(Call); @@ -74,8 +74,8 @@ ExportableFailureMechanismAssemblyResult failureMechanismAssembly = ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(); - IEnumerable sectionAssemblyResults = - Enumerable.Empty(); + IEnumerable sectionAssemblyResults = + Enumerable.Empty(); // Call var failureMechanism = new TestExportableFailureMechanism(id, failureMechanismAssembly, sectionAssemblyResults); @@ -89,7 +89,7 @@ private class TestExportableFailureMechanism : ExportableFailureMechanism { public TestExportableFailureMechanism(string id, ExportableFailureMechanismAssemblyResult failureMechanismAssembly, - IEnumerable sectionAssemblyResults) + IEnumerable sectionAssemblyResults) : base(id, failureMechanismAssembly, sectionAssemblyResults) {} } } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableGenericFailureMechanismTest.cs =================================================================== diff -u -r3fedb02f6284e45456911f5831bb399ecc85e307 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableGenericFailureMechanismTest.cs (.../ExportableGenericFailureMechanismTest.cs) (revision 3fedb02f6284e45456911f5831bb399ecc85e307) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableGenericFailureMechanismTest.cs (.../ExportableGenericFailureMechanismTest.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -39,8 +39,8 @@ ExportableFailureMechanismAssemblyResult failureMechanismAssembly = ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(); - IEnumerable sectionAssemblyResults = - Enumerable.Empty(); + IEnumerable sectionAssemblyResults = + Enumerable.Empty(); // Call var failureMechanism = new ExportableGenericFailureMechanism( Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableSpecificFailureMechanismTest.cs =================================================================== diff -u -r3fedb02f6284e45456911f5831bb399ecc85e307 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableSpecificFailureMechanismTest.cs (.../ExportableSpecificFailureMechanismTest.cs) (revision 3fedb02f6284e45456911f5831bb399ecc85e307) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/ExportableSpecificFailureMechanismTest.cs (.../ExportableSpecificFailureMechanismTest.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -39,8 +39,8 @@ ExportableFailureMechanismAssemblyResult failureMechanismAssembly = ExportableFailureMechanismAssemblyResultTestFactory.CreateResult(); - IEnumerable sectionAssemblyResults = - Enumerable.Empty(); + IEnumerable sectionAssemblyResults = + Enumerable.Empty(); // Call var failureMechanism = new ExportableSpecificFailureMechanism( Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs =================================================================== diff -u -rfaef9046b62f643860c2885dc4270fce2542a1e3 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs (.../ExportableFailureMechanismSectionAssemblyResultTestFactory.cs) (revision faef9046b62f643860c2885dc4270fce2542a1e3) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestFactory.cs (.../ExportableFailureMechanismSectionAssemblyResultTestFactory.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -62,35 +62,5 @@ random.NextEnumValue(), random.NextEnumValue()); } - - /// - /// Creates a new instance of . - /// - /// The . - /// The seed to use. - /// The created - public static ExportableFailureMechanismSectionAssemblyWithProbabilityResult CreateWithProbability( - ExportableFailureMechanismSection section, int seed) - { - var random = new Random(seed); - - return new ExportableFailureMechanismSectionAssemblyWithProbabilityResult( - "id", section, - random.NextEnumValue(new[] - { - FailureMechanismSectionAssemblyGroup.NotDominant, - FailureMechanismSectionAssemblyGroup.III, - FailureMechanismSectionAssemblyGroup.II, - FailureMechanismSectionAssemblyGroup.I, - FailureMechanismSectionAssemblyGroup.Zero, - FailureMechanismSectionAssemblyGroup.IMin, - FailureMechanismSectionAssemblyGroup.IIMin, - FailureMechanismSectionAssemblyGroup.IIIMin, - FailureMechanismSectionAssemblyGroup.NotRelevant - }), - random.NextDouble(), - random.NextEnumValue(), - random.NextEnumValue()); - } } } \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs =================================================================== diff -u -rc46850930c0d7a9f2f93767cffc00233b0cc6b3b -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs (.../ExportableFailureMechanismSectionAssemblyResultTestHelper.cs) (revision c46850930c0d7a9f2f93767cffc00233b0cc6b3b) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/ExportableFailureMechanismSectionAssemblyResultTestHelper.cs (.../ExportableFailureMechanismSectionAssemblyResultTestHelper.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -29,12 +29,12 @@ namespace Riskeer.AssemblyTool.IO.TestUtil { /// - /// Helper class to assert . + /// Helper class to assert . /// public static class ExportableFailureMechanismSectionAssemblyResultTestHelper { /// - /// Asserts a collection of + /// Asserts a collection of /// against the assembly result. /// /// The expected . Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs =================================================================== diff -u -r1267614afc8c93fd6c07358bbe9d2aa22464b1a7 -r191163e5ea9e3725076cd87d69225f6420bd2aad --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs (.../ExportableFailureMechanismFactory.cs) (revision 1267614afc8c93fd6c07358bbe9d2aa22464b1a7) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismFactory.cs (.../ExportableFailureMechanismFactory.cs) (revision 191163e5ea9e3725076cd87d69225f6420bd2aad) @@ -154,19 +154,19 @@ } /// - /// Creates a collection of + /// Creates a collection of /// with assembly results based on . /// /// The failure mechanism to create a collection of - /// for. + /// for. /// The to use in the assembly. /// The /// to perform the failure mechanism section assembly. /// The type of the failure mechanism. /// The type of the section result. - /// A collection of . + /// A collection of . /// Thrown when assembly results cannot be created. - private static IEnumerable CreateExportableFailureMechanismSectionResults + private static IEnumerable CreateExportableFailureMechanismSectionResults ( TFailureMechanism failureMechanism, IAssessmentSection assessmentSection, Func assembleFailureMechanismSectionFunc) @@ -176,16 +176,16 @@ IDictionary failureMechanismSectionsLookup = ExportableFailureMechanismSectionHelper.CreateFailureMechanismSectionResultLookup(failureMechanism.SectionResults); - var exportableResults = new List(); + var exportableResults = new List(); foreach (KeyValuePair failureMechanismSectionPair in failureMechanismSectionsLookup) { FailureMechanismSectionAssemblyResultWrapper assemblyResultWrapper = assembleFailureMechanismSectionFunc( failureMechanismSectionPair.Key, failureMechanism, assessmentSection); FailureMechanismSectionAssemblyResult assemblyResult = assemblyResultWrapper.AssemblyResult; exportableResults.Add( - new ExportableFailureMechanismSectionAssemblyWithProbabilityResult( - "id", failureMechanismSectionPair.Value, assemblyResult.FailureMechanismSectionAssemblyGroup, assemblyResult.SectionProbability, + new ExportableFailureMechanismSectionAssemblyResult( + "id", failureMechanismSectionPair.Value, assemblyResult.SectionProbability, assemblyResult.FailureMechanismSectionAssemblyGroup, ExportableAssemblyMethodFactory.Create(assemblyResultWrapper.AssemblyGroupMethod), ExportableAssemblyMethodFactory.Create(assemblyResultWrapper.ProbabilityMethod))); }