Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenarioRow.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r6b101883cf554150bd1454ba54784cf325a6e07c
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenarioRow.cs	(.../HeightStructuresScenarioRow.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenarioRow.cs	(.../HeightStructuresScenarioRow.cs)	(revision 6b101883cf554150bd1454ba54784cf325a6e07c)
@@ -20,9 +20,10 @@
 // All rights reserved.
 
 using System;
-using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.Structures;
-using Riskeer.Common.Forms;
+using Riskeer.Common.Forms.Views;
 using Riskeer.HeightStructures.Data;
 
 namespace Riskeer.HeightStructures.Forms.Views
@@ -31,50 +32,53 @@
     /// Container of a <see cref="HeightStructuresFailureMechanismSectionResult"/>,
     /// which takes care of the representation of properties in a grid.
     /// </summary>
-    internal class HeightStructuresScenarioRow : IScenarioRow<StructuresCalculation<HeightStructuresInput>>
+    internal class HeightStructuresScenarioRow : ScenarioRow<StructuresCalculationScenario<HeightStructuresInput>>
     {
-        private readonly HeightStructuresFailureMechanismSectionResult sectionResult;
+        private readonly HeightStructuresFailureMechanism failureMechanism;
+        private readonly IAssessmentSection assessmentSection;
+        private ProbabilityAssessmentOutput probabilityAssessmentOutput;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="HeightStructuresScenarioRow"/> class.
+        /// Creates a new instance of <see cref="HeightStructuresScenarioRow"/>.
+        /// <param name="calculationScenario">The <see cref="StructuresCalculationScenario{ClosingStructuresInput}"/> this row contains.</param>
+        /// <param name="failureMechanism">The failure mechanism that the calculation belongs to.</param>
+        /// <param name="assessmentSection">The assessment section that the calculation belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// </summary>
-        /// <param name="sectionResult">The section result.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
-        public HeightStructuresScenarioRow(HeightStructuresFailureMechanismSectionResult sectionResult)
+        public HeightStructuresScenarioRow(StructuresCalculationScenario<HeightStructuresInput> calculationScenario,
+                                           HeightStructuresFailureMechanism failureMechanism,
+                                           IAssessmentSection assessmentSection)
+            : base(calculationScenario)
         {
-            if (sectionResult == null)
+            if (failureMechanism == null)
             {
-                throw new ArgumentNullException(nameof(sectionResult));
+                throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            this.sectionResult = sectionResult;
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
+            }
+
+            this.failureMechanism = failureMechanism;
+            this.assessmentSection = assessmentSection;
+
+            CreateProbabilityAssessmentOutput();
         }
 
-        /// <summary>
-        /// Gets the name of the <see cref="FailureMechanismSection"/>.
-        /// </summary>
-        public string Name
+        public override double FailureProbability => probabilityAssessmentOutput?.Probability ?? double.NaN;
+
+        public override void Update()
         {
-            get
-            {
-                return sectionResult.Section.Name;
-            }
+            CreateProbabilityAssessmentOutput();
         }
 
-        /// <summary>
-        /// Gets or sets the normative calculation for the section.
-        /// </summary>
-        public StructuresCalculation<HeightStructuresInput> Calculation
+        private void CreateProbabilityAssessmentOutput()
         {
-            get
-            {
-                return sectionResult.Calculation;
-            }
-            set
-            {
-                sectionResult.Calculation = value;
-                sectionResult.NotifyObservers();
-            }
+            probabilityAssessmentOutput = CalculationScenario.HasOutput
+                                              ? HeightStructuresProbabilityAssessmentOutputFactory.Create(
+                                                  CalculationScenario.Output, failureMechanism, assessmentSection)
+                                              : null;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r6b101883cf554150bd1454ba54784cf325a6e07c
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 6b101883cf554150bd1454ba54784cf325a6e07c)
@@ -131,10 +131,10 @@
                 IDictionary<string, List<ICalculation>> calculationsPerSegment =
                     StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
 
-                List<HeightStructuresScenarioRow> scenarioRows =
-                    FailureMechanism.SectionResults.Select(sectionResult => new HeightStructuresScenarioRow(sectionResult)).ToList();
-
-                scenarioSelectionControl.UpdateDataGridViewDataSource(calculations, scenarioRows, calculationsPerSegment);
+                // List<HeightStructuresScenarioRow> scenarioRows =
+                //     FailureMechanism.SectionResults.Select(sectionResult => new HeightStructuresScenarioRow(sectionResult)).ToList();
+                //
+                // scenarioSelectionControl.UpdateDataGridViewDataSource(calculations, scenarioRows, calculationsPerSegment);
             }
         }
     }
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresScenarioRowTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r6b101883cf554150bd1454ba54784cf325a6e07c
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresScenarioRowTest.cs	(.../HeightStructuresScenarioRowTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresScenarioRowTest.cs	(.../HeightStructuresScenarioRowTest.cs)	(revision 6b101883cf554150bd1454ba54784cf325a6e07c)
@@ -20,13 +20,13 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.Structures;
-using Riskeer.Common.Forms;
+using Riskeer.Common.Data.TestUtil;
+using Riskeer.Common.Forms.Views;
 using Riskeer.HeightStructures.Data;
 using Riskeer.HeightStructures.Forms.Views;
 
@@ -36,85 +36,190 @@
     public class HeightStructuresScenarioRowTest
     {
         [Test]
-        public void ParameteredConstructor_ExpectedValues()
+        public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
-            var section = new FailureMechanismSection("testName", new[]
-            {
-                new Point2D(1.1, 2.2),
-                new Point2D(3.3, 4.4)
-            });
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section);
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
 
             // Call
-            var row = new HeightStructuresScenarioRow(sectionResult);
+            void Call() => new HeightStructuresScenarioRow(new StructuresCalculationScenario<HeightStructuresInput>(), null, assessmentSection);
 
             // Assert
-            Assert.AreSame(sectionResult.Section.Name, row.Name);
-            Assert.AreSame(sectionResult.Calculation, row.Calculation);
-            Assert.IsInstanceOf<IScenarioRow<StructuresCalculation<HeightStructuresInput>>>(row);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+            mocks.VerifyAll();
         }
 
         [Test]
-        public void ParameteredConstructor_SectionResultIsNull_ThrowArgumentNullException()
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new HeightStructuresScenarioRow(null);
+            void Call() => new HeightStructuresScenarioRow(new StructuresCalculationScenario<HeightStructuresInput>(),
+                                                           new HeightStructuresFailureMechanism(), null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreSame("sectionResult", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         [Test]
-        public void Calculation_SetNewValue_UpdatesSectionResultCalculation()
+        public void Constructor_ExpectedValues()
         {
             // Setup
-            var section = new FailureMechanismSection("haha", new[]
-            {
-                new Point2D(1.1, 2.2),
-                new Point2D(3.3, 4.4)
-            });
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section);
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
 
-            var row = new HeightStructuresScenarioRow(sectionResult);
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>();
 
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
-
             // Call
-            row.Calculation = calculation;
+            var row = new HeightStructuresScenarioRow(calculation, new HeightStructuresFailureMechanism(), assessmentSection);
 
             // Assert
-            Assert.AreSame(calculation, row.Calculation);
-            Assert.AreSame(calculation, sectionResult.Calculation);
+            Assert.IsInstanceOf<ScenarioRow<StructuresCalculationScenario<HeightStructuresInput>>>(row);
+            Assert.AreSame(calculation, row.CalculationScenario);
+            mocks.VerifyAll();
         }
 
         [Test]
-        public void Calculation_SetNewValue_NotifyObserversOnSectionResult()
+        public void Constructor_WithCalculationWithOutput_PropertiesFromCalculation()
         {
             // Setup
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
             var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
+            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
             mocks.ReplayAll();
 
-            var section = new FailureMechanismSection("testSection", new[]
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>
             {
-                new Point2D(1.1, 2.2),
-                new Point2D(3.3, 4.4)
-            });
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(section);
-            sectionResult.Attach(observer);
+                Output = new TestStructuresOutput()
+            };
 
-            var row = new HeightStructuresScenarioRow(sectionResult);
+            // Call
+            var row = new HeightStructuresScenarioRow(calculation, failureMechanism, assessmentSection);
 
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
+            // Assert
+            ProbabilityAssessmentOutput expectedDerivedOutput = HeightStructuresProbabilityAssessmentOutputFactory.Create(
+                calculation.Output, failureMechanism, assessmentSection);
+            Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
+            mocks.VerifyAll();
+        }
 
+        [Test]
+        public void Constructor_WithCalculationWithoutOutput_PropertiesFromCalculation()
+        {
+            // Setup
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+            mocks.ReplayAll();
+
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>();
+
             // Call
-            row.Calculation = calculation;
+            var row = new HeightStructuresScenarioRow(calculation, failureMechanism, assessmentSection);
 
             // Assert
-            mocks.VerifyAll(); // Assert observer is notified
+            Assert.IsNaN(row.FailureProbability);
+            mocks.VerifyAll();
         }
+
+        [Test]
+        public void GivenScenarioRow_WhenOutputSetAndUpdate_ThenDerivedOutputUpdated()
+        {
+            // Given
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+            mocks.ReplayAll();
+
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>();
+
+            var row = new HeightStructuresScenarioRow(calculation, failureMechanism, assessmentSection);
+
+            // Precondition
+            Assert.IsNaN(row.FailureProbability);
+
+            // When
+            calculation.Output = new TestStructuresOutput();
+            row.Update();
+
+            // Then
+            ProbabilityAssessmentOutput expectedDerivedOutput = HeightStructuresProbabilityAssessmentOutputFactory.Create(
+                calculation.Output, failureMechanism, assessmentSection);
+            Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GivenScenarioRow_WhenOutputSetToNullAndUpdate_ThenDerivedOutputUpdated()
+        {
+            // Given
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+            mocks.ReplayAll();
+
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>
+            {
+                Output = new TestStructuresOutput()
+            };
+
+            var row = new HeightStructuresScenarioRow(calculation, failureMechanism, assessmentSection);
+
+            // Precondition
+            ProbabilityAssessmentOutput expectedDerivedOutput = HeightStructuresProbabilityAssessmentOutputFactory.Create(
+                calculation.Output, failureMechanism, assessmentSection);
+            Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
+
+            // When
+            calculation.Output = null;
+            row.Update();
+
+            // Then
+            Assert.IsNaN(row.FailureProbability);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GivenScenarioRow_WhenOutputChangedAndUpdate_ThenDerivedOutputUpdated()
+        {
+            // Given
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+            mocks.ReplayAll();
+
+            var calculation = new StructuresCalculationScenario<HeightStructuresInput>
+            {
+                Output = new TestStructuresOutput()
+            };
+
+            var row = new HeightStructuresScenarioRow(calculation, failureMechanism, assessmentSection);
+
+            // Precondition
+            ProbabilityAssessmentOutput expectedDerivedOutput = HeightStructuresProbabilityAssessmentOutputFactory.Create(
+                calculation.Output, failureMechanism, assessmentSection);
+            Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
+
+            var random = new Random(11);
+
+            // When
+            calculation.Output = new TestStructuresOutput(random.NextDouble());
+            row.Update();
+
+            // Then
+            ProbabilityAssessmentOutput newExpectedDerivedOutput = HeightStructuresProbabilityAssessmentOutputFactory.Create(
+                calculation.Output, failureMechanism, assessmentSection);
+            Assert.AreEqual(newExpectedDerivedOutput.Probability, row.FailureProbability);
+            mocks.VerifyAll();
+        }
     }
 }
\ No newline at end of file