Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensions.cs =================================================================== diff -u -r767fd4c880443be2882b7510b290bd690c938fdc -ra573e4b363426b67f499fe9eff6c63f76a16f87b --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision 767fd4c880443be2882b7510b290bd690c938fdc) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision a573e4b363426b67f499fe9eff6c63f76a16f87b) @@ -83,8 +83,7 @@ double totalDetailedAssessmentProbability = 0; foreach (StructuresCalculationScenario scenario in relevantScenarios) { - ProbabilityAssessmentOutput derivedOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - scenario.Output, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput derivedOutput = ProbabilityAssessmentOutputFactory.Create(scenario.Output.Reliability); totalDetailedAssessmentProbability += derivedOutput.Probability * (double) scenario.Contribution; } Fisheye: Tag a573e4b363426b67f499fe9eff6c63f76a16f87b refers to a dead (removed) revision in file `Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresProbabilityAssessmentOutputFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs =================================================================== diff -u -r767fd4c880443be2882b7510b290bd690c938fdc -ra573e4b363426b67f499fe9eff6c63f76a16f87b --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs (.../ClosingStructuresScenarioRow.cs) (revision 767fd4c880443be2882b7510b290bd690c938fdc) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs (.../ClosingStructuresScenarioRow.cs) (revision a573e4b363426b67f499fe9eff6c63f76a16f87b) @@ -76,8 +76,7 @@ private void CreateProbabilityAssessmentOutput() { probabilityAssessmentOutput = CalculationScenario.HasOutput - ? ClosingStructuresProbabilityAssessmentOutputFactory.Create( - CalculationScenario.Output, failureMechanism, assessmentSection) + ? ProbabilityAssessmentOutputFactory.Create(CalculationScenario.Output.Reliability) : null; } } Fisheye: Tag a573e4b363426b67f499fe9eff6c63f76a16f87b refers to a dead (removed) revision in file `Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresProbabilityAssessmentOutputFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/Riskeer.ClosingStructures.Data.Test.csproj =================================================================== diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -ra573e4b363426b67f499fe9eff6c63f76a16f87b --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/Riskeer.ClosingStructures.Data.Test.csproj (.../Riskeer.ClosingStructures.Data.Test.csproj) (revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/Riskeer.ClosingStructures.Data.Test.csproj (.../Riskeer.ClosingStructures.Data.Test.csproj) (revision a573e4b363426b67f499fe9eff6c63f76a16f87b) @@ -10,19 +10,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresOutputPropertiesTest.cs =================================================================== diff -u -r3ca6cbc5391c8e82d5f26c1174947e92a0412f07 -ra573e4b363426b67f499fe9eff6c63f76a16f87b --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresOutputPropertiesTest.cs (.../ClosingStructuresOutputPropertiesTest.cs) (revision 3ca6cbc5391c8e82d5f26c1174947e92a0412f07) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresOutputPropertiesTest.cs (.../ClosingStructuresOutputPropertiesTest.cs) (revision a573e4b363426b67f499fe9eff6c63f76a16f87b) @@ -21,10 +21,7 @@ using System; using NUnit.Framework; -using Rhino.Mocks; -using Riskeer.ClosingStructures.Data; using Riskeer.ClosingStructures.Forms.PropertyClasses; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Probability; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Helpers; @@ -53,24 +50,16 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var failureMechanism = new ClosingStructuresFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - var random = new Random(39); var structuresOutput = new TestStructuresOutput(random.NextDouble()); // Call var properties = new ClosingStructuresOutputProperties(structuresOutput); // Assert - ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - structuresOutput, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = ProbabilityAssessmentOutputFactory.Create(structuresOutput.Reliability); Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.Probability), properties.Probability); Assert.AreEqual(expectedProbabilityAssessmentOutput.Reliability, properties.Reliability, properties.Reliability.GetAccuracy()); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresScenarioRowTest.cs =================================================================== diff -u -r767fd4c880443be2882b7510b290bd690c938fdc -ra573e4b363426b67f499fe9eff6c63f76a16f87b --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresScenarioRowTest.cs (.../ClosingStructuresScenarioRowTest.cs) (revision 767fd4c880443be2882b7510b290bd690c938fdc) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresScenarioRowTest.cs (.../ClosingStructuresScenarioRowTest.cs) (revision a573e4b363426b67f499fe9eff6c63f76a16f87b) @@ -101,8 +101,7 @@ var row = new ClosingStructuresScenarioRow(calculation, failureMechanism, assessmentSection); // Assert - ProbabilityAssessmentOutput expectedDerivedOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - calculation.Output, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.Reliability); Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability); mocks.VerifyAll(); } @@ -149,8 +148,7 @@ row.Update(); // Then - ProbabilityAssessmentOutput expectedDerivedOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - calculation.Output, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.Reliability); Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability); mocks.VerifyAll(); } @@ -173,8 +171,7 @@ var row = new ClosingStructuresScenarioRow(calculation, failureMechanism, assessmentSection); // Precondition - ProbabilityAssessmentOutput expectedDerivedOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - calculation.Output, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.Reliability); Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability); // When @@ -204,8 +201,7 @@ var row = new ClosingStructuresScenarioRow(calculation, failureMechanism, assessmentSection); // Precondition - ProbabilityAssessmentOutput expectedDerivedOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - calculation.Output, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.Reliability); Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability); var random = new Random(11); @@ -215,8 +211,7 @@ row.Update(); // Then - ProbabilityAssessmentOutput newExpectedDerivedOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create( - calculation.Output, failureMechanism, assessmentSection); + ProbabilityAssessmentOutput newExpectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.Reliability); Assert.AreEqual(newExpectedDerivedOutput.Probability, row.FailureProbability); mocks.VerifyAll(); }