Index: Riskeer/Common/src/Riskeer.Common.Data/Calculation/ICalculationScenario.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r0a2ccc1740669e48d2c629e5bcfe3283f730b2f5 --- Riskeer/Common/src/Riskeer.Common.Data/Calculation/ICalculationScenario.cs (.../ICalculationScenario.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Data/Calculation/ICalculationScenario.cs (.../ICalculationScenario.cs) (revision 0a2ccc1740669e48d2c629e5bcfe3283f730b2f5) @@ -37,10 +37,5 @@ /// Gets or sets the contribution of the scenario. /// RoundedDouble Contribution { get; set; } - - /// - /// Gets the status of the scenario. - /// - CalculationScenarioStatus Status { get; } } } \ No newline at end of file Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculationScenario.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0a2ccc1740669e48d2c629e5bcfe3283f730b2f5 --- Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision 0a2ccc1740669e48d2c629e5bcfe3283f730b2f5) @@ -49,24 +49,8 @@ public RoundedDouble Contribution { - get - { - return contribution; - } - set - { - contribution = value.ToPrecision(contribution.NumberOfDecimalPlaces); - } + get => contribution; + set => contribution = value.ToPrecision(contribution.NumberOfDecimalPlaces); } - - public CalculationScenarioStatus Status - { - get - { - return Output == null - ? CalculationScenarioStatus.NotCalculated - : CalculationScenarioStatus.Done; - } - } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r0a2ccc1740669e48d2c629e5bcfe3283f730b2f5 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 0a2ccc1740669e48d2c629e5bcfe3283f730b2f5) @@ -49,7 +49,6 @@ Assert.IsTrue(scenario.IsRelevant); Assert.AreEqual(4, scenario.Contribution.NumberOfDecimalPlaces); Assert.AreEqual(1.0, scenario.Contribution, scenario.Contribution.GetAccuracy()); - Assert.AreEqual(CalculationScenarioStatus.NotCalculated, scenario.Status); } [Test] @@ -85,35 +84,6 @@ } [Test] - public void CalculationScenarioStatus_OutputNull_ReturnsStatusNotCalculated() - { - // Setup - var scenario = new PipingCalculationScenario(new GeneralPipingInput()); - - // Call - CalculationScenarioStatus status = scenario.Status; - - // Assert - Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); - } - - [Test] - public void CalculationScenarioStatus_PipingOutputSet_ReturnsStatusDone() - { - // Setup - var scenario = new PipingCalculationScenario(new GeneralPipingInput()) - { - Output = PipingOutputTestFactory.Create() - }; - - // Call - CalculationScenarioStatus status = scenario.Status; - - // Assert - Assert.AreEqual(CalculationScenarioStatus.Done, status); - } - - [Test] public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup