Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs =================================================================== diff -u -r17d94418777b0f9fe0e6ed05553ea30cc9977e67 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision 17d94418777b0f9fe0e6ed05553ea30cc9977e67) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create.GrassCoverErosionOutwards; using Application.Ringtoets.Storage.DbContext; using Ringtoets.GrassCoverErosionInwards.Data; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs =================================================================== diff -u -ra50f8fe4c13956d52e563e1f9e154f1bd186edad -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision a50f8fe4c13956d52e563e1f9e154f1bd186edad) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -90,7 +90,7 @@ inputParameters.UseAssessmentLevelManualInput = Convert.ToBoolean(entity.UseAssessmentLevelManualInput); if (inputParameters.UseAssessmentLevelManualInput) { - inputParameters.AssessmentLevel = (RoundedDouble)entity.AssessmentLevel.ToNullAsNaN(); + inputParameters.AssessmentLevel = (RoundedDouble) entity.AssessmentLevel.ToNullAsNaN(); } else { @@ -105,7 +105,7 @@ inputParameters.StochasticSoilModel = entity.StochasticSoilProfileEntity.StochasticSoilModelEntity.Read(collector); inputParameters.StochasticSoilProfile = entity.StochasticSoilProfileEntity.Read(collector); } - + inputParameters.EntryPointL = (RoundedDouble) entity.EntryPointL.ToNullAsNaN(); inputParameters.ExitPointL = (RoundedDouble) entity.ExitPointL.ToNullAsNaN(); inputParameters.PhreaticLevelExit.Mean = (RoundedDouble) entity.PhreaticLevelExitMean.ToNullAsNaN(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -50,7 +50,7 @@ entity.TargetReliability.ToNullAsNaN(), entity.CalculatedProbability.ToNullAsNaN(), entity.CalculatedReliability.ToNullAsNaN(), - (CalculationConvergence)entity.CalculationConvergence); + (CalculationConvergence) entity.CalculationConvergence); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensionsTest.cs =================================================================== diff -u -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensionsTest.cs (.../RingtoetsPipingSurfaceLineCreateExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensionsTest.cs (.../RingtoetsPipingSurfaceLineCreateExtensionsTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -195,22 +195,22 @@ Assert.AreEqual(geometry[bottomDitchPolderIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[bottomDitchPolderIndex].Z, characteristicPointEntity.Z); break; - case (byte)CharacteristicPointType.DikeToeAtPolder: + case (byte) CharacteristicPointType.DikeToeAtPolder: Assert.AreEqual(geometry[toePolderIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[toePolderIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[toePolderIndex].Z, characteristicPointEntity.Z); break; - case (byte)CharacteristicPointType.DikeToeAtRiver: + case (byte) CharacteristicPointType.DikeToeAtRiver: Assert.AreEqual(geometry[toeDikeIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[toeDikeIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[toeDikeIndex].Z, characteristicPointEntity.Z); break; - case (byte)CharacteristicPointType.DitchDikeSide: + case (byte) CharacteristicPointType.DitchDikeSide: Assert.AreEqual(geometry[ditchDikeIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[ditchDikeIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[ditchDikeIndex].Z, characteristicPointEntity.Z); break; - case (byte)CharacteristicPointType.DitchPolderSide: + case (byte) CharacteristicPointType.DitchPolderSide: Assert.AreEqual(geometry[ditchPolderIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[ditchPolderIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[ditchPolderIndex].Z, characteristicPointEntity.Z); @@ -261,8 +261,8 @@ Assert.AreEqual(6, entity.CharacteristicPointEntities.Count); byte[] characteristicPointTypeValues = entity.CharacteristicPointEntities - .Select(cpe => cpe.Type) - .ToArray(); + .Select(cpe => cpe.Type) + .ToArray(); CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DikeToeAtRiver); CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DikeToeAtPolder); CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DitchDikeSide); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs =================================================================== diff -u -r7a7526e4ff1bccf09b09fadcfd309a725c6494b9 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs) (revision 7a7526e4ff1bccf09b09fadcfd309a725c6494b9) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -166,7 +166,7 @@ Assert.IsNotNull(expected.CalculatedReliability); Assert.AreEqual((RoundedDouble) expected.CalculatedReliability, actual.CalculatedReliability, actual.CalculatedReliability.GetAccuracy()); Assert.IsNotNull(expected.CalculatedProbability); - Assert.AreEqual( expected.CalculatedProbability, actual.CalculatedProbability); + Assert.AreEqual(expected.CalculatedProbability, actual.CalculatedProbability); Assert.AreEqual((CalculationConvergence) expected.CalculationConvergence, actual.CalculationConvergence); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs =================================================================== diff -u -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -316,7 +316,7 @@ { return new CharacteristicPointEntity { - Type = (byte)type, + Type = (byte) type, X = point.X, Y = point.Y, Z = point.Z }; } Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -r9063c3c60f936760953c52185b72f0cb2dce9bf8 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 9063c3c60f936760953c52185b72f0cb2dce9bf8) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -87,8 +87,6 @@ } } - private OnProgressChanged ProgressChanged { get; set; } - /// /// Gets the import target. /// @@ -128,5 +126,7 @@ ProgressChanged(currentStepName, currentStep, totalNumberOfSteps); } } + + private OnProgressChanged ProgressChanged { get; set; } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Geometry/AdvancedMath2D.cs =================================================================== diff -u -r8c1fffbb415e7c2470be6d3fa2971103777d418e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/src/Core.Common.Geometry/AdvancedMath2D.cs (.../AdvancedMath2D.cs) (revision 8c1fffbb415e7c2470be6d3fa2971103777d418e) +++ Core/Common/src/Core.Common.Geometry/AdvancedMath2D.cs (.../AdvancedMath2D.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -26,7 +26,6 @@ using MathNet.Spatial.Euclidean; using MathNet.Spatial.Units; using NetTopologySuite.Geometries; - using Point2D = Core.Common.Base.Geometry.Point2D; namespace Core.Common.Geometry Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -rb122ff28fb091ae4a8cf1ca8b3572d376da043ed -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision b122ff28fb091ae4a8cf1ca8b3572d376da043ed) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -153,6 +153,22 @@ return base.ProcessCmdKey(ref msg, keyData); } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + cancellationTokenSource.Dispose(); + + base.Dispose(disposing); + } + private void ButtonCancelClick(object sender, EventArgs e) { CancelActivities(); @@ -202,22 +218,5 @@ labelActivityProgressText.Text = progressTextNullOrEmpty ? string.Empty : activity.ProgressText; }); } - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - - cancellationTokenSource.Dispose(); - - base.Dispose(disposing); - } - } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Plugin/ViewInfo.cs =================================================================== diff -u -r3df4971064b76a8e789bed245e8851fea72ba085 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/src/Core.Common.Gui/Plugin/ViewInfo.cs (.../ViewInfo.cs) (revision 3df4971064b76a8e789bed245e8851fea72ba085) +++ Core/Common/src/Core.Common.Gui/Plugin/ViewInfo.cs (.../ViewInfo.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -35,7 +35,7 @@ /// public ViewInfo() { - CreateInstance = () => (IView)Activator.CreateInstance(ViewType); + CreateInstance = () => (IView) Activator.CreateInstance(ViewType); } /// @@ -114,17 +114,17 @@ /// public Func CloseForData { get; set; } - public override string ToString() - { - return DataType + " : " + ViewDataType + " : " + ViewType; - } - /// /// Gets or sets the optional method that allows for the construction of the view. /// /// This property needs to be set if no default constructor is available /// for the view type. public Func CreateInstance { get; set; } + + public override string ToString() + { + return DataType + " : " + ViewDataType + " : " + ViewType; + } } /// @@ -140,7 +140,7 @@ /// public ViewInfo() { - CreateInstance = () => (TView)Activator.CreateInstance(ViewType); + CreateInstance = () => (TView) Activator.CreateInstance(ViewType); } /// @@ -238,6 +238,13 @@ public Func CloseForData { get; set; } /// + /// Gets or sets the optional method that allows for the construction of the view. + /// + /// This property needs to be set if no default constructor is available + /// for the view type. + public Func CreateInstance { get; set; } + + /// /// Performs an implicit conversion from to . /// /// The view information to convert. @@ -270,13 +277,6 @@ { return DataType + " : " + ViewDataType + " : " + ViewType; } - - /// - /// Gets or sets the optional method that allows for the construction of the view. - /// - /// This property needs to be set if no default constructor is available - /// for the view type. - public Func CreateInstance { get; set; } } /// Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs =================================================================== diff -u -rf08fd5cc1482a6c706bdb04d46b6482d489b7c5b -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision f08fd5cc1482a6c706bdb04d46b6482d489b7c5b) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -160,7 +160,7 @@ { // Setup Point2D first = null; - Point2D second = new Point2D(0,0); + Point2D second = new Point2D(0, 0); // Call TestDelegate call = () => { Vector result = first - second; }; Index: Core/Common/test/Core.Common.Base.Test/ObserverTest.cs =================================================================== diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) +++ Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -35,7 +35,6 @@ // Call using (var observer = new Observer(() => { counter++; })) { - // Assert Assert.IsInstanceOf(observer); Assert.IsNull(observer.Observable); Index: Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs =================================================================== diff -u -r4c653ca26b45ca9141158597fd548fb052dbe0df -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 4c653ca26b45ca9141158597fd548fb052dbe0df) +++ Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -254,7 +254,7 @@ // Setup const string fileName = "newProject"; string pathToSomeValidFile = string.Format("C://folder/directory/{0}.rtd", - fileName); + fileName); var loadedProject = mocks.Stub(); var projectFactory = mocks.Stub(); Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs =================================================================== diff -u -r25695fa024db28f8926ed7e361d19bec16d3c112 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -118,24 +118,12 @@ var firedEvents = new List(); var control1 = new TextBox(); - control1.Validating += (sender, args) => - { - firedEvents.Add(validatingTextBoxEventName); - }; - control1.Validated += (sender, args) => - { - firedEvents.Add(validatedTextBoxEventName); - }; + control1.Validating += (sender, args) => { firedEvents.Add(validatingTextBoxEventName); }; + control1.Validated += (sender, args) => { firedEvents.Add(validatedTextBoxEventName); }; var control2 = new NumericUpDown(); - control2.Validating += (sender, args) => - { - firedEvents.Add(validatingNumericUpDownEventName); - }; - control2.Validated += (sender, args) => - { - firedEvents.Add(validatedNumericUpDownEventName); - }; + control2.Validating += (sender, args) => { firedEvents.Add(validatingNumericUpDownEventName); }; + control2.Validated += (sender, args) => { firedEvents.Add(validatedNumericUpDownEventName); }; var testView = new TestView(); testView.Controls.AddRange(new Control[] @@ -154,8 +142,10 @@ // Assert CollectionAssert.AreEqual(new[] { - validatingTextBoxEventName, validatedTextBoxEventName, - validatingNumericUpDownEventName, validatedNumericUpDownEventName + validatingTextBoxEventName, + validatedTextBoxEventName, + validatingNumericUpDownEventName, + validatedNumericUpDownEventName }, firedEvents); } Index: Core/Common/test/Core.Common.IO.Test/Readers/IDataReaderExtensionsTest.cs =================================================================== diff -u -r0615f3f2d1a71890c749543b2ac54372be10d259 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.IO.Test/Readers/IDataReaderExtensionsTest.cs (.../IDataReaderExtensionsTest.cs) (revision 0615f3f2d1a71890c749543b2ac54372be10d259) +++ Core/Common/test/Core.Common.IO.Test/Readers/IDataReaderExtensionsTest.cs (.../IDataReaderExtensionsTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -37,7 +37,7 @@ public void Read_NullDataReader_ThrowsArgumentNullException() { // Call - TestDelegate test = () => ((IDataReader)null).Read("column"); + TestDelegate test = () => ((IDataReader) null).Read("column"); // Assert var paramName = Assert.Throws(test).ParamName; @@ -120,9 +120,9 @@ // Assert var message = Assert.Throws(test).Message; - var expectedMessage = string.Format(CultureInfo.CurrentCulture, - "Value read from data reader ('{0}') could not be cast to desired type System.Data.IDataReader.", - value); + var expectedMessage = string.Format(CultureInfo.CurrentCulture, + "Value read from data reader ('{0}') could not be cast to desired type System.Data.IDataReader.", + value); Assert.AreEqual(expectedMessage, message); mockRepository.VerifyAll(); Index: Core/Common/test/Core.Common.TestUtil.Test/ControlsTestHelperTest.cs =================================================================== diff -u -r4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.TestUtil.Test/ControlsTestHelperTest.cs (.../ControlsTestHelperTest.cs) (revision 4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f) +++ Core/Common/test/Core.Common.TestUtil.Test/ControlsTestHelperTest.cs (.../ControlsTestHelperTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -40,7 +40,7 @@ string value1 = "1"; string value2 = "2"; - using(var form = new Form()) + using (var form = new Form()) using (var control = new ComboBox { DropDownStyle = ComboBoxStyle.DropDownList, @@ -59,26 +59,11 @@ form.Show(); var raisedEvents = new Collection(); - control.SelectedIndexChanged += (sender, args) => - { - raisedEvents.Add(selectedindexchanged); - }; - control.SelectedValueChanged += (sender, args) => - { - raisedEvents.Add(selectedvaluechanged); - }; - control.SelectionChangeCommitted += (sender, args) => - { - raisedEvents.Add(selectionchangecommitted); - }; - control.Validating += (sender, args) => - { - Assert.Fail("Validating event should not be fired as 'FakeUserSelectingNewValue' method does not handle focus-changes."); - }; - control.Validated += (sender, args) => - { - Assert.Fail("Validated event should not be fired as 'FakeUserSelectingNewValue' method does not handle focus-changes."); - }; + control.SelectedIndexChanged += (sender, args) => { raisedEvents.Add(selectedindexchanged); }; + control.SelectedValueChanged += (sender, args) => { raisedEvents.Add(selectedvaluechanged); }; + control.SelectionChangeCommitted += (sender, args) => { raisedEvents.Add(selectionchangecommitted); }; + control.Validating += (sender, args) => { Assert.Fail("Validating event should not be fired as 'FakeUserSelectingNewValue' method does not handle focus-changes."); }; + control.Validated += (sender, args) => { Assert.Fail("Validated event should not be fired as 'FakeUserSelectingNewValue' method does not handle focus-changes."); }; // Call ControlsTestHelper.FakeUserSelectingNewValue(control, value2); Index: Core/Common/test/Core.Common.Utils.Test/Extensions/StringExtensionsTest.cs =================================================================== diff -u -r2aa9661130f20e88c41dac921ffb780573dcf799 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Common/test/Core.Common.Utils.Test/Extensions/StringExtensionsTest.cs (.../StringExtensionsTest.cs) (revision 2aa9661130f20e88c41dac921ffb780573dcf799) +++ Core/Common/test/Core.Common.Utils.Test/Extensions/StringExtensionsTest.cs (.../StringExtensionsTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -67,6 +67,7 @@ Assert.IsNull(result); } + [Test] [TestCase("t", "T")] [TestCase("T", "T")] [TestCase("test", "Test")] @@ -95,6 +96,7 @@ Assert.IsNull(result); } + [Test] [TestCase("t", "t")] [TestCase("T", "t")] [TestCase("test", "test")] Index: Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs =================================================================== diff -u -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs (.../ShapeFileReaderBase.cs) (revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4) +++ Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs (.../ShapeFileReaderBase.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -136,7 +136,7 @@ if (column.TypeCharacter != 'C' && dataRowValue is string) { string nullValue = string.Join(string.Empty, Enumerable.Repeat('*', column.Length)); - if (!string.Equals(dataRowValue, nullValue)) + if (!Equals(dataRowValue, nullValue)) { newValue = dataRowValue; } Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs =================================================================== diff -u -rd420d88d2514112972db8e6fb5d28e61c2dc8de3 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs (.../ChartControl.cs) (revision d420d88d2514112972db8e6fb5d28e61c2dc8de3) +++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs (.../ChartControl.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -207,7 +207,7 @@ private void DrawMissingChartDataOnCollectionChange(IEnumerable chartDataThatShouldBeDrawn, IDictionary drawnChartDataLookup) { - foreach (var chartDataToDraw in chartDataThatShouldBeDrawn.Where(chartDataToDraw => !drawnChartDataLookup.ContainsKey(chartDataToDraw))) + foreach (var chartDataToDraw in chartDataThatShouldBeDrawn.Where(chartDataToDraw => !drawnChartDataLookup.ContainsKey(chartDataToDraw))) { DrawChartData(chartDataToDraw); } Index: Core/Components/test/Core.Components.Gis.IO.Test/Readers/ShapeFileReaderBaseTest.cs =================================================================== diff -u -r2aa9661130f20e88c41dac921ffb780573dcf799 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Components/test/Core.Components.Gis.IO.Test/Readers/ShapeFileReaderBaseTest.cs (.../ShapeFileReaderBaseTest.cs) (revision 2aa9661130f20e88c41dac921ffb780573dcf799) +++ Core/Components/test/Core.Components.Gis.IO.Test/Readers/ShapeFileReaderBaseTest.cs (.../ShapeFileReaderBaseTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -123,7 +123,7 @@ { // Setup string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "traject_10-1.shp"); - + var reader = new TestShapeFileReaderBase(validFilePath); var targetFeature = new MapFeature(new MapGeometry[0]); @@ -144,7 +144,7 @@ { // Setup string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "Multiple_Polygon_with_ID.shp"); - + var reader = new TestShapeFileReaderBase(validFilePath); var features = new List(); @@ -159,7 +159,13 @@ } // Assert - CollectionAssert.AreEqual(new [] { 4,3,2,1 } , features.Select(f => f.MetaData["id"])); + CollectionAssert.AreEqual(new[] + { + 4, + 3, + 2, + 1 + }, features.Select(f => f.MetaData["id"])); } [Test] @@ -221,6 +227,11 @@ } } + public void PublicCopyMetaDataIntoFeature(MapFeature targetFeature, int sourceFeatureIndex) + { + CopyMetaDataIntoFeature(targetFeature, sourceFeatureIndex); + } + public override FeatureBasedMapData ReadFeature(string name = null) { return null; @@ -235,11 +246,6 @@ { return null; } - - public void PublicCopyMetaDataIntoFeature(MapFeature targetFeature, int sourceFeatureIndex) - { - CopyMetaDataIntoFeature(targetFeature, sourceFeatureIndex); - } } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs =================================================================== diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) +++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -201,10 +201,10 @@ (sender, args) => ShowSelectShapeFileDialog(mapDataCollection)); return contextMenuBuilderProvider.Get(mapDataCollection, treeView) - .AddCustomItem(addMapLayerMenuItem) - .AddSeparator() - .AddPropertiesItem() - .Build(); + .AddCustomItem(addMapLayerMenuItem) + .AddSeparator() + .AddPropertiesItem() + .Build(); } #endregion Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs =================================================================== diff -u -ra7394bfd186c74ff8c0a080f158230670eb4d6d4 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs (.../FeatureBasedMapDataProperties.cs) (revision a7394bfd186c74ff8c0a080f158230670eb4d6d4) +++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/FeatureBasedMapDataProperties.cs (.../FeatureBasedMapDataProperties.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -116,11 +116,6 @@ } } - public IEnumerable GetAvailableMetaDataAttributes() - { - return data.MetaData.Select(md => new SelectableMetaDataAttribute(md)); - } - [DynamicReadOnlyValidationMethod] public bool DynamicReadonlyValidator(string propertyName) { @@ -132,5 +127,10 @@ { return data.ShowLabels; } + + public IEnumerable GetAvailableMetaDataAttributes() + { + return data.MetaData.Select(md => new SelectableMetaDataAttribute(md)); + } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapDataCollectionProperties.cs =================================================================== diff -u -r7a02214c204a80a085b50b8d5fd7f90b9e0b4149 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapDataCollectionProperties.cs (.../MapDataCollectionProperties.cs) (revision 7a02214c204a80a085b50b8d5fd7f90b9e0b4149) +++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapDataCollectionProperties.cs (.../MapDataCollectionProperties.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -42,4 +42,4 @@ } } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapDataCollectionPropertiesTest.cs =================================================================== diff -u -r73a045414bb5159fa5dc09c6b15c89fda0eb9cd0 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapDataCollectionPropertiesTest.cs (.../MapDataCollectionPropertiesTest.cs) (revision 73a045414bb5159fa5dc09c6b15c89fda0eb9cd0) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapDataCollectionPropertiesTest.cs (.../MapDataCollectionPropertiesTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -84,4 +84,4 @@ true); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/SelectableMetaDataAttributeTest.cs =================================================================== diff -u -r758b0db0a58b0fecd5e3d7d8b5f22d162778ee04 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/SelectableMetaDataAttributeTest.cs (.../SelectableMetaDataAttributeTest.cs) (revision 758b0db0a58b0fecd5e3d7d8b5f22d162778ee04) +++ Core/Plugins/test/Core.Plugins.Map.Test/UITypeEditors/SelectableMetaDataAttributeTest.cs (.../SelectableMetaDataAttributeTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -61,7 +61,7 @@ // Call bool areEqual = selectableAttribute.Equals(selectableAttribute); - + // Assert Assert.IsTrue(areEqual); } Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/ChartDataViewTest.cs =================================================================== diff -u -r4dbfc20ef0200e34db43efeb8899d72e4046cc5b -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/ChartDataViewTest.cs (.../ChartDataViewTest.cs) (revision 4dbfc20ef0200e34db43efeb8899d72e4046cc5b) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/ChartDataViewTest.cs (.../ChartDataViewTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Windows.Forms; using Core.Components.Charting.Data; using Core.Components.OxyPlot.Forms; Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs =================================================================== diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -56,7 +56,7 @@ // Assert Assert.AreEqual(1, view.Controls.Count); Assert.AreSame(view.Map, view.Controls[0]); - Assert.AreEqual(DockStyle.Fill, ((Control)view.Map).Dock); + Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock); Assert.IsNull(view.Map.Data); } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r44ce84b25d7dfc4a0b7057443a7439af3cafb8bb -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 44ce84b25d7dfc4a0b7057443a7439af3cafb8bb) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -212,7 +212,6 @@ properties.FailureProbabilityOpenStructure = "1e-3"; properties.FailureProbabilityReparation = "1e-4"; properties.IdenticalApertures = newIdenticalApertures; - // Assert var expectedProbabilityOrFrequencyOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(0.01); @@ -262,7 +261,7 @@ mockRepository.VerifyAll(); } - + [Test] [TestCase(double.MinValue)] [TestCase(double.MaxValue)] @@ -475,11 +474,7 @@ string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.CurrentCulture), overflow); // Call - TestDelegate call = () => - { - - properties.FailureProbabilityReparation = newProbabilityString; - }; + TestDelegate call = () => { properties.FailureProbabilityReparation = newProbabilityString; }; // Assert var expectedMessage = "De waarde voor de faalkans is te groot of te klein."; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs =================================================================== diff -u -rca77db5948e6c622ea1fb3092917341ba1234711 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision ca77db5948e6c622ea1fb3092917341ba1234711) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -129,10 +129,10 @@ // Assert Assert.AreEqual(3, viewInfos.Length); - + PluginTestHelper.AssertViewInfoDefined( - viewInfos, - typeof(ClosingStructuresFailureMechanismContext), + viewInfos, + typeof(ClosingStructuresFailureMechanismContext), typeof(ClosingStructuresFailureMechanismView)); PluginTestHelper.AssertViewInfoDefined( @@ -142,7 +142,7 @@ typeof(ClosingStructuresFailureMechanismResultView)); PluginTestHelper.AssertViewInfoDefined( - viewInfos, + viewInfos, typeof(ClosingStructuresScenariosContext), typeof(CalculationGroup), typeof(ClosingStructuresScenariosView)); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismViewInfoTest.cs =================================================================== diff -u -r8c1fffbb415e7c2470be6d3fa2971103777d418e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismViewInfoTest.cs (.../ClosingStructuresFailureMechanismViewInfoTest.cs) (revision 8c1fffbb415e7c2470be6d3fa2971103777d418e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismViewInfoTest.cs (.../ClosingStructuresFailureMechanismViewInfoTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -24,10 +24,10 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Forms.PresentationObjects; using Ringtoets.ClosingStructures.Forms.Views; +using Ringtoets.Common.Data.AssessmentSection; using ClosingStructuresDataResources = Ringtoets.ClosingStructures.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -349,7 +349,7 @@ CollectionAssert.Contains(array, result); } Assert.AreEqual(originalNumberOfSectionResultAssignments - sectionResults.Length, failureMechanism.SectionResults.Count(sr => sr.Calculation != null), - "Other section results with a different calculation/structure should still have their association."); + "Other section results with a different calculation/structure should still have their association."); } private ClosingStructuresFailureMechanism CreateFullyConfiguredFailureMechanism() Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculation.cs =================================================================== diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculation.cs (.../ICalculation.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ICalculation.cs (.../ICalculation.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -32,13 +32,13 @@ bool HasOutput { get; } /// - /// Clears the calculated output. + /// Gets the comments associated with the calculation. /// - void ClearOutput(); + Comment Comments { get; } /// - /// Gets the comments associated with the calculation. + /// Clears the calculated output. /// - Comment Comments { get; } + void ClearOutput(); } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs =================================================================== diff -u -r0a5a1c7fad7e52c152e3ff34eebcccf7785b377d -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 0a5a1c7fad7e52c152e3ff34eebcccf7785b377d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -34,8 +34,8 @@ public class FailureMechanismContribution : Observable { private readonly ICollection distribution = new List(); - private double norm; private readonly OtherFailureMechanism otherFailureMechanism = new OtherFailureMechanism(); + private double norm; /// /// Creates a new instance of . Values are taken from the Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs =================================================================== diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -52,7 +52,7 @@ /// Gets the comments associated with the input of the data object. /// Comment InputComments { get; } - + /// /// Gets the comments associated with the output of the data object. /// Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs =================================================================== diff -u -r977a58268db81a93ad74f6079b41cf40d43fb1aa -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs (.../DesignVariable.cs) (revision 977a58268db81a93ad74f6079b41cf40d43fb1aa) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs (.../DesignVariable.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -25,7 +25,8 @@ namespace Ringtoets.Common.Data.Probabilistics { - public abstract class DesignVariable where TDistributionType : IDistribution { + public abstract class DesignVariable where TDistributionType : IDistribution + { private TDistributionType distribution; /// Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs =================================================================== diff -u -rc5505f73b4c053fbc8eb0a5e2f230e3daf3de940 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision c5505f73b4c053fbc8eb0a5e2f230e3daf3de940) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -43,8 +43,8 @@ /// section result. May be null if the section result does not have a calculation set. /// Thrown when is null. public static void SetAssessmentLayerTwoAError(DataGridViewCell dataGridViewCell, - AssessmentLayerOneState passedAssessmentLayerOne, double assessmentLayerTwoA, - ICalculation normativeCalculation) + AssessmentLayerOneState passedAssessmentLayerOne, double assessmentLayerTwoA, + ICalculation normativeCalculation) { if (dataGridViewCell == null) { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs =================================================================== diff -u -re60dbf2fd41434270cad4efba20446e19ede0d2e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision e60dbf2fd41434270cad4efba20446e19ede0d2e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -142,7 +142,7 @@ /// null or empty. public static MapFeature[] CreateFailureMechanismSectionFeatures(IEnumerable sections) { - return sections != null + return sections != null ? sections.Select(CreateFailureMechanismSectionMapFeature).ToArray() : new MapFeature[0]; } Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -171,8 +171,8 @@ } private static AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, - double norm, - string hydraulicBoundaryDatabaseFilePath) + double norm, + string hydraulicBoundaryDatabaseFilePath) { var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, norm); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs =================================================================== diff -u -r977a58268db81a93ad74f6079b41cf40d43fb1aa -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs (.../DesignVariableTest.cs) (revision 977a58268db81a93ad74f6079b41cf40d43fb1aa) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs (.../DesignVariableTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -86,7 +86,7 @@ private class SimpleDesignVariable : DesignVariable { - public SimpleDesignVariable(IDistribution distribution) : base(distribution) { } + public SimpleDesignVariable(IDistribution distribution) : base(distribution) {} public override RoundedDouble GetDesignValue() { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs =================================================================== diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -57,7 +57,7 @@ var distribution = new TruncatedNormalDistribution(numberOfDecimalPlaces); // Call - distribution.LowerBoundary = (RoundedDouble)value; + distribution.LowerBoundary = (RoundedDouble) value; // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.LowerBoundary.NumberOfDecimalPlaces); @@ -72,7 +72,7 @@ var distribution = new TruncatedNormalDistribution(numberOfDecimalPlaces); // Call - distribution.UpperBoundary = (RoundedDouble)value; + distribution.UpperBoundary = (RoundedDouble) value; // Assert Assert.AreEqual(numberOfDecimalPlaces, distribution.UpperBoundary.NumberOfDecimalPlaces); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/DistributionAssert.cs =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/DistributionAssert.cs (.../DistributionAssert.cs) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/DistributionAssert.cs (.../DistributionAssert.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -66,7 +66,7 @@ /// public static void AreEqual(LogNormalDistribution expectedDistribution, LogNormalDistribution actualDistribution) { - AreEqual((IDistribution)expectedDistribution, actualDistribution); + AreEqual((IDistribution) expectedDistribution, actualDistribution); AreEqualValue(expectedDistribution.Shift, actualDistribution.Shift); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs =================================================================== diff -u -re866d883e0603dc8613eebc581953a9b2a8f5986 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision e866d883e0603dc8613eebc581953a9b2a8f5986) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -56,12 +56,13 @@ /// The which needs to be set on the . public TestForeshoreProfile(BreakWater breakWater) : this(null, new Point2D(0, 0), breakWater) {} - private TestForeshoreProfile(string profileName, Point2D worldCoordinate, BreakWater breakWater) : base(worldCoordinate, - Enumerable.Empty(), - breakWater, - new ConstructionProperties - { - Name = profileName - }) {} + private TestForeshoreProfile(string profileName, Point2D worldCoordinate, BreakWater breakWater) + : base(worldCoordinate, + Enumerable.Empty(), + breakWater, + new ConstructionProperties + { + Name = profileName + }) {} } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/MapCalculationDataTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/MapCalculationDataTest.cs (.../MapCalculationDataTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/MapCalculationDataTest.cs (.../MapCalculationDataTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -40,14 +40,14 @@ // Call TestDelegate test = () => new MapCalculationData( - null, - calculationLocation, - hydraulicBoundaryLocation); + null, + calculationLocation, + hydraulicBoundaryLocation); // Assert const string expectedMessage = "A calculation name is required."; string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage) - .ParamName; + .ParamName; Assert.AreEqual("calculationName", paramName); } @@ -61,14 +61,14 @@ // Call TestDelegate test = () => new MapCalculationData( - calculationName, - null, - hydraulicBoundaryLocation); + calculationName, + null, + hydraulicBoundaryLocation); // Assert string expectedMessage = "A location for the calculation is required."; string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage) - .ParamName; + .ParamName; Assert.AreEqual("calculationLocation", paramName); } @@ -82,14 +82,14 @@ // Call TestDelegate test = () => new MapCalculationData( - calculationName, - calculationLocation, - null); + calculationName, + calculationLocation, + null); // Assert string expectedMessage = "A hydraulic boundary location is required."; string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage) - .ParamName; + .ParamName; Assert.AreEqual("hydraulicBoundaryLocation", paramName); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs =================================================================== diff -u -rb8efcaa5b85f05c70660fa2f291d093500c90d2b -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs (.../TruncatedNormalDistributionPropertiesTest.cs) (revision b8efcaa5b85f05c70660fa2f291d093500c90d2b) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs (.../TruncatedNormalDistributionPropertiesTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -110,7 +110,7 @@ "Misc", "Standaardafwijking", "De standaardafwijking van de afgekapte normale verdeling."); - + PropertyDescriptor lowerBoundaryProperty = dynamicProperties[3]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lowerBoundaryProperty, "Misc", Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs =================================================================== diff -u -r51c41f19c5b5ed0a0ad42b5dc3a969246d58a2d6 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs (.../StructureSelectionDialogTest.cs) (revision 51c41f19c5b5ed0a0ad42b5dc3a969246d58a2d6) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs (.../StructureSelectionDialogTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -141,7 +141,7 @@ private class TestStructure : StructureBase { - public TestStructure(ConstructionProperties constructionProperties) : base(constructionProperties) { } + public TestStructure(ConstructionProperties constructionProperties) : base(constructionProperties) {} } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/SelectableHydraulicBoundaryLocationTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/SelectableHydraulicBoundaryLocationTest.cs (.../SelectableHydraulicBoundaryLocationTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/SelectableHydraulicBoundaryLocationTest.cs (.../SelectableHydraulicBoundaryLocationTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -283,7 +283,9 @@ private static string GetStringRepresentation(HydraulicBoundaryLocation location, Point2D referencePoint) { if (referencePoint == null) + { return location.Name; + } var distance = location.Location.GetEuclideanDistanceTo(referencePoint); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision e38a7c2baca2872af6319d535c6468133ea31fbc) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -78,7 +78,7 @@ Assert.IsInstanceOf(dataGridView.Columns[nameColumnIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); - Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); + Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); Assert.AreEqual("Toetslaag 1", dataGridView.Columns[assessmentLayerOneIndex].HeaderText); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -208,7 +208,7 @@ // Setup var mapData = new MapPointData("test") { - Features = new [] + Features = new[] { new MapFeature(new[] { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs (.../MapDataTestHelper.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs (.../MapDataTestHelper.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -90,7 +90,7 @@ Assert.AreEqual(hydraulicBoundaryLocationsArray.Length, hydraulicLocationsMapData.Features.Length); CollectionAssert.AreEqual(hydraulicBoundaryLocationsArray.Select(hrp => hrp.Location), - hydraulicLocationsMapData.Features.SelectMany(f => f.MapGeometries.First().PointCollections.First())); + hydraulicLocationsMapData.Features.SelectMany(f => f.MapGeometries.First().PointCollections.First())); } Assert.AreEqual("Hydraulische randvoorwaarden", mapData.Name); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/DikeHeightAssessmentOutput.cs =================================================================== diff -u -r9798fd949a2e90dfe1750377f9757fc456571ed1 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/DikeHeightAssessmentOutput.cs (.../DikeHeightAssessmentOutput.cs) (revision 9798fd949a2e90dfe1750377f9757fc456571ed1) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/DikeHeightAssessmentOutput.cs (.../DikeHeightAssessmentOutput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -43,8 +43,8 @@ /// Thrown when /// or falls outside the [0.0, 1.0] range and is not . public DikeHeightAssessmentOutput(double dikeHeight, double targetProbability, double targetReliability, - double calculatedProbability, double calculatedReliability, - CalculationConvergence calculationConvergence) + double calculatedProbability, double calculatedReliability, + CalculationConvergence calculationConvergence) { if (!IsValidProbability(targetProbability)) { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsMapDataFeatureFactory.cs =================================================================== diff -u -r4838f004647741cf5409023313b884bd0a610c16 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsMapDataFeatureFactory.cs (.../GrassCoverErosionInwardsMapDataFeatureFactory.cs) (revision 4838f004647741cf5409023313b884bd0a610c16) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsMapDataFeatureFactory.cs (.../GrassCoverErosionInwardsMapDataFeatureFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -49,15 +49,15 @@ } var calculationsWithLocationAndHydraulicBoundaryLocation = calculations.Where(c => - c.InputParameters.DikeProfile != null && - c.InputParameters.HydraulicBoundaryLocation != null); + c.InputParameters.DikeProfile != null && + c.InputParameters.HydraulicBoundaryLocation != null); MapCalculationData[] calculationData = calculationsWithLocationAndHydraulicBoundaryLocation.Select( calculation => new MapCalculationData( - calculation.Name, - calculation.InputParameters.DikeProfile.WorldReferencePoint, - calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); + calculation.Name, + calculation.InputParameters.DikeProfile.WorldReferencePoint, + calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); return RingtoetsMapDataFeaturesFactory.CreateCalculationFeatures(calculationData); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightAssessmentOutput.cs =================================================================== diff -u -r9af643e1cd216ab64e604530f5ff8a3c945713bd -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightAssessmentOutput.cs (.../TestDikeHeightAssessmentOutput.cs) (revision 9af643e1cd216ab64e604530f5ff8a3c945713bd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightAssessmentOutput.cs (.../TestDikeHeightAssessmentOutput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -29,7 +29,7 @@ /// public class TestDikeHeightAssessmentOutput : DikeHeightAssessmentOutput { - /// + /// /// Creates a new instance of . /// /// The dike height to set to the output. Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r3d6119b921ede5e5eea3de083a17a26f12ffa447 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 3d6119b921ede5e5eea3de083a17a26f12ffa447) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -608,7 +608,7 @@ assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty(), 1, 1)); var initialOutput = new GrassCoverErosionInwardsOutput(0, true, - new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN), + new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN), new TestDikeHeightAssessmentOutput(double.NaN)); var calculation = new GrassCoverErosionInwardsCalculation { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -35,7 +35,6 @@ [TestFixture] public class GrassCoverErosionInwardsMapDataFeaturesFactoryTest { - [Test] public void CreateCalculationFeatures_CalculationsNull_ReturnsEmptyFeaturesArray() { @@ -70,21 +69,25 @@ calculationB.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8); // Call - MapFeature[] features = GrassCoverErosionInwardsMapDataFeaturesFactory.CreateCalculationFeatures(new[] { calculationA, calculationB }); + MapFeature[] features = GrassCoverErosionInwardsMapDataFeaturesFactory.CreateCalculationFeatures(new[] + { + calculationA, + calculationB + }); // Assert Assert.AreEqual(2, features.Length); Assert.AreEqual(1, features[0].MapGeometries.Count()); Assert.AreEqual(1, features[1].MapGeometries.Count()); AssertEqualPointCollections(new[] { - new Point2D(1.0, 3.0), - new Point2D(5.0, 4.0) + new Point2D(1.0, 3.0), + new Point2D(5.0, 4.0) }, features[0].MapGeometries.ElementAt(0)); AssertEqualPointCollections(new[] { - new Point2D(1.0, 4.0), - new Point2D(2.2, 3.8) + new Point2D(1.0, 4.0), + new Point2D(2.2, 3.8) }, features[1].MapGeometries.ElementAt(0)); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -51,15 +51,15 @@ } var calculationsWithLocationAndHydraulicBoundaryLocation = calculationInputs.Where(calculation => - calculation.InputParameters.ForeshoreProfile != null && - calculation.InputParameters.HydraulicBoundaryLocation != null); + calculation.InputParameters.ForeshoreProfile != null && + calculation.InputParameters.HydraulicBoundaryLocation != null); MapCalculationData[] calculationData = calculationsWithLocationAndHydraulicBoundaryLocation.Select( calculation => new MapCalculationData( - calculation.Name, - calculation.InputParameters.ForeshoreProfile.WorldReferencePoint, - calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); + calculation.Name, + calculation.InputParameters.ForeshoreProfile.WorldReferencePoint, + calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); return RingtoetsMapDataFeaturesFactory.CreateCalculationFeatures(calculationData); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -160,7 +160,7 @@ }, new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - DesignWaterLevelOutput = new TestHydraulicBoundaryLocationOutput(2.45) + DesignWaterLevelOutput = new TestHydraulicBoundaryLocationOutput(2.45) } }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -108,7 +108,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001) + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001) } }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs =================================================================== diff -u -rca77db5948e6c622ea1fb3092917341ba1234711 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision ca77db5948e6c622ea1fb3092917341ba1234711) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -151,8 +151,8 @@ Assert.AreEqual(3, viewInfos.Length); PluginTestHelper.AssertViewInfoDefined( - viewInfos, - typeof(HeightStructuresFailureMechanismContext), + viewInfos, + typeof(HeightStructuresFailureMechanismContext), typeof(HeightStructuresFailureMechanismView)); PluginTestHelper.AssertViewInfoDefined( @@ -162,7 +162,7 @@ typeof(HeightStructuresFailureMechanismResultView)); PluginTestHelper.AssertViewInfoDefined( - viewInfos, + viewInfos, typeof(HeightStructuresScenariosContext), typeof(CalculationGroup), typeof(HeightStructuresScenariosView)); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -373,7 +373,7 @@ [Test] [TestCaseSource("DistributionsWithInvalidCoefficient")] - public void Validate_DistributionVariationCoefficientInvalid_LogsErrorAndReturnsFalse( + public void Validate_DistributionVariationCoefficientInvalid_LogsErrorAndReturnsFalse( double coefficientOne, double coefficientTwo, double coefficientThree, double coefficientFour, string parameterName) { // Setup @@ -754,7 +754,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - mockRepository.ReplayAll(); + mockRepository.ReplayAll(); var calculation = new TestHeightStructuresCalculation { @@ -819,7 +819,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); mockRepository.ReplayAll(); - + var calculation = new TestHeightStructuresCalculation { InputParameters = @@ -882,7 +882,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); mockRepository.ReplayAll(); - + var calculation = new TestHeightStructuresCalculation { InputParameters = Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs =================================================================== diff -u -r484b07491e6cbb52ef2dc36bb236fb3b349d3141 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs (.../IWaveConditionsCosineCalculator.cs) (revision 484b07491e6cbb52ef2dc36bb236fb3b349d3141) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs (.../IWaveConditionsCosineCalculator.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -52,10 +52,10 @@ /// [s] /// double WavePeakPeriod { get; } - + /// /// Gets the calculated reliability index. - /// [-] + /// [-] /// double ReliabilityIndex { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs =================================================================== diff -u -r484b07491e6cbb52ef2dc36bb236fb3b349d3141 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs (.../WaveConditionsCosineCalculator.cs) (revision 484b07491e6cbb52ef2dc36bb236fb3b349d3141) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs (.../WaveConditionsCosineCalculator.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -78,7 +78,7 @@ { WaveHeight = waveConditionsCalculationParser.Output.WaveHeight; WaveAngle = waveConditionsCalculationParser.Output.WaveAngle; - WaveDirection = waveConditionsCalculationParser.Output.WaveDirection; + WaveDirection = waveConditionsCalculationParser.Output.WaveDirection; WavePeakPeriod = waveConditionsCalculationParser.Output.WavePeakPeriod; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs (.../DunesBoundaryConditionsCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs (.../DunesBoundaryConditionsCalculationInput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -51,4 +51,4 @@ } } } -} +} \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RayleighNHydraRingVariable.cs =================================================================== diff -u -r64ff18d2a822650da1a0e8a30656477c1c8cd58e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -35,7 +35,7 @@ /// The variance value of the variable. public RayleighNHydraRingVariable(int variableId, HydraRingDeviationType deviationType, double n, double variance) - : base(variableId, deviationType, variance, n) { } // Note: Pass the N as "variability" and the variance as "mean" + : base(variableId, deviationType, variance, n) {} // Note: Pass the N as "variability" and the variance as "mean" public override HydraRingDistributionType DistributionType { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingCalculationException.cs =================================================================== diff -u -rccda7c4eae626e537cf8497367664bef0095c19f -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingCalculationException.cs (.../HydraRingCalculationException.cs) (revision ccda7c4eae626e537cf8497367664bef0095c19f) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingCalculationException.cs (.../HydraRingCalculationException.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -52,6 +52,6 @@ /// or a null reference if no inner exception is specified. public HydraRingCalculationException(string message, Exception inner) : base(message, inner) {} - protected HydraRingCalculationException(SerializationInfo info, StreamingContext context) : base(info, context) { } + protected HydraRingCalculationException(SerializationInfo info, StreamingContext context) : base(info, context) {} } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraRingFileConstants.cs =================================================================== diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraRingFileConstants.cs (.../HydraRingFileConstants.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraRingFileConstants.cs (.../HydraRingFileConstants.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -30,7 +30,7 @@ /// The tail and extension of the file containing output generated during a calculation. /// internal const string OutputFileSuffix = "-output.txt"; - + /// /// The file name of the file containing the output of a calculation. /// Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs =================================================================== diff -u -r1e56b3a0272cbd173b118eb3bcc48a3adbe87e59 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 1e56b3a0272cbd173b118eb3bcc48a3adbe87e59) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -49,7 +49,7 @@ Assert.AreEqual(2, dunesBoundaryConditionsCalculationInput.CalculationTypeId); Assert.AreEqual(26, dunesBoundaryConditionsCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - Assert.IsNotNull(dunesBoundaryConditionsCalculationInput.Section); + Assert.IsNotNull(dunesBoundaryConditionsCalculationInput.Section); CollectionAssert.IsEmpty(dunesBoundaryConditionsCalculationInput.ProfilePoints); CollectionAssert.IsEmpty(dunesBoundaryConditionsCalculationInput.ForelandsPoints); Assert.IsNull(dunesBoundaryConditionsCalculationInput.BreakWater); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -r1e56b3a0272cbd173b118eb3bcc48a3adbe87e59 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 1e56b3a0272cbd173b118eb3bcc48a3adbe87e59) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -50,7 +50,7 @@ Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId); Assert.AreEqual(28, waveHeightCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, waveHeightCalculationInput.HydraulicBoundaryLocationId); - Assert.IsNotNull(waveHeightCalculationInput.Section); + Assert.IsNotNull(waveHeightCalculationInput.Section); CollectionAssert.IsEmpty(waveHeightCalculationInput.ProfilePoints); CollectionAssert.IsEmpty(waveHeightCalculationInput.ForelandsPoints); Assert.IsNull(waveHeightCalculationInput.BreakWater); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs (.../ReliabilityIndexCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs (.../ReliabilityIndexCalculationInputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -32,8 +32,8 @@ { [Test] [TestCase(2, 1.0/10000)] - [TestCase(-50, 1.0 / 1)] - [TestCase(0, 1.0 / -90)] + [TestCase(-50, 1.0/1)] + [TestCase(0, 1.0/-90)] [TestCase(200000, double.NaN)] public void Constructed_UsingDifferentReturnPeriodAndLocationId_ReturnDifferentBetaAndDefaultValues(int locationId, double norm) { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/WaveConditionsCalculationOutputTest.cs =================================================================== diff -u -r484b07491e6cbb52ef2dc36bb236fb3b349d3141 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/WaveConditionsCalculationOutputTest.cs (.../WaveConditionsCalculationOutputTest.cs) (revision 484b07491e6cbb52ef2dc36bb236fb3b349d3141) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/WaveConditionsCalculationOutputTest.cs (.../WaveConditionsCalculationOutputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -35,7 +35,7 @@ const double waveDirection = 5.0; const double waveHeight = 9.93; const double wavePeakPeriod = 18; - + // Call var output = new WaveConditionsCalculationOutput(waveHeight, wavePeakPeriod, waveAngle, waveDirection); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RandomHydraRingVariableTest.cs =================================================================== diff -u -r64ff18d2a822650da1a0e8a30656477c1c8cd58e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RandomHydraRingVariableTest.cs (.../RandomHydraRingVariableTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RandomHydraRingVariableTest.cs (.../RandomHydraRingVariableTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -50,7 +50,7 @@ private class TestRandomHydraRingVariable : RandomHydraRingVariable { - public TestRandomHydraRingVariable(int variableId, HydraRingDeviationType deviationType, double mean, double variance) + public TestRandomHydraRingVariable(int variableId, HydraRingDeviationType deviationType, double mean, double variance) : base(variableId, deviationType, mean, variance) {} public override HydraRingDistributionType DistributionType Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/WaveConditionsCalculationParserTest.cs =================================================================== diff -u -r484b07491e6cbb52ef2dc36bb236fb3b349d3141 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/WaveConditionsCalculationParserTest.cs (.../WaveConditionsCalculationParserTest.cs) (revision 484b07491e6cbb52ef2dc36bb236fb3b349d3141) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/WaveConditionsCalculationParserTest.cs (.../WaveConditionsCalculationParserTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -105,7 +105,6 @@ Assert.IsTrue(TestHelper.CanOpenFileForWrite(Path.Combine(workingDirectory, outputFileName))); } - [Test] public void Parse_InvalidHydraRingOutputFileWaveDirectionMissing_OutputNull() { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs =================================================================== diff -u -r1e56b3a0272cbd173b118eb3bcc48a3adbe87e59 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs (.../HydraRingDataEqualityHelperTest.cs) (revision 1e56b3a0272cbd173b118eb3bcc48a3adbe87e59) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs (.../HydraRingDataEqualityHelperTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -33,14 +33,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; HydraRingDataEqualityHelper.AreEqual(expected, actual); @@ -51,13 +51,13 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -68,14 +68,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(111, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(111, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -86,14 +86,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Deterministic, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Deterministic, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -104,14 +104,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 22.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 22.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -122,14 +122,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -140,14 +140,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.33, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.33, 4.4, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -158,14 +158,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.44, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.44, 5.5, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -176,14 +176,14 @@ { var expected = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), }; var actual = new HydraRingVariable[] { - new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), - new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.55, 6.6, 7.7), + new TestHydraRingVariable(1, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7), + new TestHydraRingVariable(11, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.55, 6.6, 7.7), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismContributionProperties.cs =================================================================== diff -u -r6a0d36b218ea1ebfa308960b3321bf4b7b099fac -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismContributionProperties.cs (.../FailureMechanismContributionProperties.cs) (revision 6a0d36b218ea1ebfa308960b3321bf4b7b099fac) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismContributionProperties.cs (.../FailureMechanismContributionProperties.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -149,9 +149,9 @@ public bool DynamicVisibleValidationMethod(string propertyName) { // Hide all the properties that are used to set the data - return propertyName != TypeUtils.GetMemberName(p => p.AssessmentSection) - && propertyName != TypeUtils.GetMemberName(p => p.NormChangeHandler) - && propertyName != TypeUtils.GetMemberName(p => p.CompositionChangeHandler); + return propertyName != TypeUtils.GetMemberName(p => p.AssessmentSection) + && propertyName != TypeUtils.GetMemberName(p => p.NormChangeHandler) + && propertyName != TypeUtils.GetMemberName(p => p.CompositionChangeHandler); } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r6fa1bd13de71a612bbb0abcee6df366e7a318943 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6fa1bd13de71a612bbb0abcee6df366e7a318943) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -279,7 +279,7 @@ properties.CompositionChangeHandler = new AssessmentSectionCompositionChangeHandler(); properties.AssessmentSection = context.Parent; } - }; + }; yield return new PropertyInfo, StandAloneFailureMechanismContextProperties>(); yield return new PropertyInfo, CalculationGroupContextProperties>(); yield return new PropertyInfo, CalculationContextProperties>(); @@ -309,10 +309,7 @@ Image = RingtoetsCommonFormsResources.FailureMechanismContributionIcon, CloseForData = CloseFailureMechanismContributionViewForData, CreateInstance = () => new FailureMechanismContributionView(Gui.ViewCommands), - AfterCreate = (view, context) => - { - view.AssessmentSection = context.Parent; - } + AfterCreate = (view, context) => { view.AssessmentSection = context.Parent; } }; yield return new ViewInfo, DesignWaterLevelLocationsView> Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs =================================================================== diff -u -r6fa1bd13de71a612bbb0abcee6df366e7a318943 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision 6fa1bd13de71a612bbb0abcee6df366e7a318943) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -77,15 +77,15 @@ Assert.AreNotEqual(assessmentSection.Composition, newComposition); bool dataGridInvalidated = false; - var contributionGridView = (DataGridView)new ControlTester(dataGridViewControlName).TheObject; + var contributionGridView = (DataGridView) new ControlTester(dataGridViewControlName).TheObject; contributionGridView.Invalidated += (sender, args) => dataGridInvalidated = true; // When assessmentSection.ChangeComposition(newComposition); assessmentSection.FailureMechanismContribution.NotifyObservers(); // Then - var compositionLabel = (Label)new ControlTester(assessmentSectionCompositionLabelName).TheObject; + var compositionLabel = (Label) new ControlTester(assessmentSectionCompositionLabelName).TheObject; string compositionDisplayName = new EnumDisplayWrapper(newComposition).DisplayName; string newCompositionValue = string.Format("Trajecttype: {0}", compositionDisplayName); @@ -114,4 +114,4 @@ } } } -} +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs =================================================================== diff -u -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs (.../ForeshoreProfileTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs (.../ForeshoreProfileTreeNodeInfoTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -417,7 +417,7 @@ Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); mocks.VerifyAll(); } - + [Test] public void OnNodeRemoved_ForeshoreProfileOfGrassCoverErosionOutwardsWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs =================================================================== diff -u -r4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -134,7 +134,7 @@ // Assert Assert.True(calculationsWithOutput.All(c => c.HasOutput), - "All calculations that had output still have them."); + "All calculations that had output still have them."); CollectionAssert.IsEmpty(affectedObjects); } Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs =================================================================== diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -149,6 +149,5 @@ } #endregion - } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingInput.cs =================================================================== diff -u -r124e30d6f914a8e154ae8de0827ca363c89bba64 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingInput.cs (.../DerivedPipingInput.cs) (revision 124e30d6f914a8e154ae8de0827ca363c89bba64) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingInput.cs (.../DerivedPipingInput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -286,7 +286,7 @@ var permeabilityDeviation = new RoundedDouble(numberOfDecimals, topMostAquiferLayer.PermeabilityDeviation); var permeabilityMean = new RoundedDouble(numberOfDecimals, topMostAquiferLayer.PermeabilityMean); - double deviationFraction = (permeabilityDeviation / permeabilityMean); + double deviationFraction = (permeabilityDeviation/permeabilityMean); var weightedMean = new RoundedDouble(numberOfDecimals, GetWeightedMeanForDarcyPermeabilityOfAquiferLayer(aquiferLayers, @@ -298,7 +298,7 @@ darcyPermeabilityDistribution.Mean = weightedMean; } - darcyPermeabilityDistribution.StandardDeviation = darcyPermeabilityDistribution.Mean * deviationFraction; + darcyPermeabilityDistribution.StandardDeviation = darcyPermeabilityDistribution.Mean*deviationFraction; } } @@ -423,8 +423,8 @@ private static bool AreDeviationAndMeanFractionEqual(LogNormalDistribution currentLayerDistribution, LogNormalDistribution baseLayerDistribution) { - var baseLayerDeviationFraction = (baseLayerDistribution.StandardDeviation / baseLayerDistribution.Mean); - var currentLayerDeviationFraction = (currentLayerDistribution.StandardDeviation / currentLayerDistribution.Mean); + var baseLayerDeviationFraction = (baseLayerDistribution.StandardDeviation/baseLayerDistribution.Mean); + var currentLayerDeviationFraction = (currentLayerDistribution.StandardDeviation/currentLayerDistribution.Mean); return Math.Abs(baseLayerDeviationFraction - currentLayerDeviationFraction) < 1e-6; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/GeneralPipingInput.cs =================================================================== diff -u -rc3a85c5842b82e538c80029f35ae3e7e58aadb1e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/GeneralPipingInput.cs (.../GeneralPipingInput.cs) (revision c3a85c5842b82e538c80029f35ae3e7e58aadb1e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/GeneralPipingInput.cs (.../GeneralPipingInput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -109,7 +109,7 @@ /// under water. /// [kN/m³] /// - public RoundedDouble SandParticlesVolumicWeight + public RoundedDouble SandParticlesVolumicWeight { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs =================================================================== diff -u -rb7f496624546731a31137ae48d73c92456b1fe1d -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs) (revision b7f496624546731a31137ae48d73c92456b1fe1d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -39,7 +39,7 @@ /// The result to get the result for. /// All calculations in the failure mechanism. public static double GetAssessmentLayerTwoA(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, - IEnumerable calculations) + IEnumerable calculations) { var calculationScenarios = pipingFailureMechanismSectionResult .GetCalculationScenarios(calculations) @@ -56,8 +56,8 @@ /// /// The result to get the result for. /// All calculations in the failure mechanism. - public static RoundedDouble GetTotalContribution(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, - IEnumerable calculations) + public static RoundedDouble GetTotalContribution(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) { return (RoundedDouble) pipingFailureMechanismSectionResult .GetCalculationScenarios(calculations) @@ -69,8 +69,8 @@ /// /// The result to get the result for. /// All calculations in the failure mechanism. - public static IEnumerable GetCalculationScenarios(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, - IEnumerable calculations) + public static IEnumerable GetCalculationScenarios(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) { var lineSegments = Math2D.ConvertLinePointsToLineSegments(pipingFailureMechanismSectionResult.Section.Points); @@ -85,8 +85,8 @@ /// All calculations in the failure mechanism. /// Thrown when any of the relevant calculations /// in has an invalid . - public static CalculationScenarioStatus GetCalculationScenarioStatus(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, - IEnumerable calculations) + public static CalculationScenarioStatus GetCalculationScenarioStatus(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) { bool failed = false; bool notCalculated = false; Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs =================================================================== diff -u -rc5cf6b665f7eeab37930451dfb0d7efeb5595c3d -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision c5cf6b665f7eeab37930451dfb0d7efeb5595c3d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -286,7 +286,7 @@ { throw new InvalidOperationException("UseAssessmentLevelManualInput is false"); } - + assessmentLevel = value.ToPrecision(assessmentLevel.NumberOfDecimalPlaces); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -28,7 +28,7 @@ /// /// A presentation layer object which wraps a and a . /// - public class PipingOutputContext: WrappedObjectContextBase + public class PipingOutputContext : WrappedObjectContextBase { /// /// Creates a new instance of . Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs =================================================================== diff -u -r7641c0e215cd2e90a9b1828778906cfee05ff592 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs (.../RingtoetsPipingSurfaceLinesContext.cs) (revision 7641c0e215cd2e90a9b1828778906cfee05ff592) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs (.../RingtoetsPipingSurfaceLinesContext.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -40,9 +40,9 @@ /// The failure mechanism /// The assessment section. /// Thrown when any input argument is null. - public RingtoetsPipingSurfaceLinesContext(ObservableList surfaceLines, - PipingFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + public RingtoetsPipingSurfaceLinesContext(ObservableList surfaceLines, + PipingFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) : base(surfaceLines) { if (assessmentSection == null) Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs =================================================================== diff -u -r18259e66145f5da6ade4866bee22627fc92b3d71 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs (.../PipingOutputContextProperties.cs) (revision 18259e66145f5da6ade4866bee22627fc92b3d71) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs (.../PipingOutputContextProperties.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -84,12 +84,12 @@ [ResourcesDisplayName(typeof(Resources), "PipingOutputContext_HeaveGradient_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingOutputContext_HeaveGradient_Description")] [PropertyOrder(11)] - public RoundedDouble HeaveGradient + public RoundedDouble HeaveGradient { get { return data.WrappedData.HeaveGradient; - } + } } [ResourcesCategory(typeof(Resources), "Categories_Heave", 2, 4)] @@ -127,7 +127,7 @@ return ProbabilityFormattingHelper.Format(data.SemiProbabilisticOutput.HeaveProbability); } } - + [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer", 3, 4)] [ResourcesDisplayName(typeof(Resources), "PipingOutputContext_SellmeijerCreepCoefficient_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingOutputContext_SellmeijerCreepCoefficient_Description")] Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs =================================================================== diff -u -r4838f004647741cf5409023313b884bd0a610c16 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs (.../PipingMapDataFeaturesFactory.cs) (revision 4838f004647741cf5409023313b884bd0a610c16) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs (.../PipingMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -120,15 +120,15 @@ } var calculationsWithLocationAndHydraulicBoundaryLocation = calculations.Where(c => - c.InputParameters.SurfaceLine != null && - c.InputParameters.HydraulicBoundaryLocation != null); + c.InputParameters.SurfaceLine != null && + c.InputParameters.HydraulicBoundaryLocation != null); - MapCalculationData[] calculationData = + MapCalculationData[] calculationData = calculationsWithLocationAndHydraulicBoundaryLocation.Select( calculation => new MapCalculationData( - calculation.Name, - calculation.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint, - calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); + calculation.Name, + calculation.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint, + calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); return RingtoetsMapDataFeaturesFactory.CreateCalculationFeatures(calculationData); } Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -r89208074af9e942166875097aa38aa77476a5a3a -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -73,7 +73,7 @@ var heaveResult = CalculateHeave(); var sellmeijerResult = CalculateSellmeijer(); - return new PipingCalculatorResult(new PipingCalculatorResult.ConstructionProperties + return new PipingCalculatorResult(new PipingCalculatorResult.ConstructionProperties { UpliftZValue = upliftResult.Zu, UpliftFactorOfSafety = upliftResult.FoSu, Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPipingProfilePropertyCalculator.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPipingProfilePropertyCalculator.cs (.../IPipingProfilePropertyCalculator.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPipingProfilePropertyCalculator.cs (.../IPipingProfilePropertyCalculator.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -33,7 +33,7 @@ /// Sets the soil profile. /// PipingProfile SoilProfile { set; } - + /// /// Sets the surface line. /// Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -649,8 +649,8 @@ if (pipingCalculationScenario.HasOutput) { childNodes.Add(new PipingOutputContext( - pipingCalculationScenario.Output, - pipingCalculationScenario.SemiProbabilisticOutput)); + pipingCalculationScenario.Output, + pipingCalculationScenario.SemiProbabilisticOutput)); } else { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs =================================================================== diff -u -r124e30d6f914a8e154ae8de0827ca363c89bba64 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision 124e30d6f914a8e154ae8de0827ca363c89bba64) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -1106,7 +1106,7 @@ IsAquifer = true, PermeabilityDeviation = 0.3, PermeabilityMean = 2.4 - }, + }, }, SoilProfileType.SoilProfile1D, 0); // Call @@ -1125,7 +1125,7 @@ var derivedInput = new DerivedPipingInput(input); var random = new Random(21); double mean = 0.1 + random.NextDouble(); - double deviation = mean / 2; + double deviation = mean/2; double mean2 = 0.1 + random.NextDouble(); double deviation2 = mean2/2; input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", 0.0, new[] @@ -1148,9 +1148,9 @@ var result = derivedInput.DarcyPermeability; // Assert - var weightedMean = (mean * 0.5 + mean2) / 1.5; + var weightedMean = (mean*0.5 + mean2)/1.5; Assert.AreEqual(weightedMean, result.Mean, result.Mean.GetAccuracy()); - Assert.AreEqual(weightedMean / 2, result.StandardDeviation, result.StandardDeviation.GetAccuracy()); + Assert.AreEqual(weightedMean/2, result.StandardDeviation, result.StandardDeviation.GetAccuracy()); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingSemiProbabilisticOutput.cs =================================================================== diff -u -r72bdda9f23b68227dd942903887c2b24d45fc370 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingSemiProbabilisticOutput.cs (.../TestPipingSemiProbabilisticOutput.cs) (revision 72bdda9f23b68227dd942903887c2b24d45fc370) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingSemiProbabilisticOutput.cs (.../TestPipingSemiProbabilisticOutput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -31,6 +31,6 @@ /// Creates a new instance of the class. /// /// The optional probability to set (set to 0 when not specified). - public TestPipingSemiProbabilisticOutput(double probability = 0) : base(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, probability, 0, 0) { } + public TestPipingSemiProbabilisticOutput(double probability = 0) : base(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, probability, 0, 0) {} } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs =================================================================== diff -u -r76095f14a847cd54fd958c5b326f7eb903dfd456 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 76095f14a847cd54fd958c5b326f7eb903dfd456) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -41,18 +41,18 @@ // Assert var paramName = Assert.Throws(test).ParamName; Assert.AreEqual("wrappedData", paramName); - } + } [Test] public void Constructor_WithoutSemiProbabilisticOutput_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new PipingOutputContext(new TestPipingOutput(),null); + TestDelegate test = () => new PipingOutputContext(new TestPipingOutput(), null); // Assert var paramName = Assert.Throws(test).ParamName; Assert.AreEqual("semiProbabilisticOutput", paramName); - } + } [Test] public void Constructor_WithOutputParameters_PropertiesSet() @@ -62,12 +62,12 @@ var semiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); // Call - var context = new PipingOutputContext(pipingOutput, semiProbabilisticOutput); + var context = new PipingOutputContext(pipingOutput, semiProbabilisticOutput); // Assert Assert.IsInstanceOf>(context); Assert.AreSame(pipingOutput, context.WrappedData); Assert.AreSame(semiProbabilisticOutput, context.SemiProbabilisticOutput); - } + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -rc3a85c5842b82e538c80029f35ae3e7e58aadb1e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision c3a85c5842b82e538c80029f35ae3e7e58aadb1e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -259,7 +259,7 @@ // Setup var mocks = new MockRepository(); var observerMock = mocks.StrictMock(); - observerMock.Expect(o => o.UpdateObserver()); + observerMock.Expect(o => o.UpdateObserver()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingFailureMechanismContextProperties @@ -287,7 +287,7 @@ // Setup var mocks = new MockRepository(); var observerMock = mocks.StrictMock(); - observerMock.Expect(o => o.UpdateObserver()); + observerMock.Expect(o => o.UpdateObserver()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingFailureMechanismContextProperties @@ -296,7 +296,7 @@ }; mocks.ReplayAll(); - failureMechanism.Attach(observerMock); + failureMechanism.Attach(observerMock); // Call properties.WaterVolumetricWeight = (RoundedDouble) newValue; @@ -324,9 +324,9 @@ Data = new PipingFailureMechanismContext(failureMechanism, mocks.Stub()) }; mocks.ReplayAll(); - + failureMechanism.Attach(observerMock); - + // Call TestDelegate test = () => properties.WaterVolumetricWeight = (RoundedDouble) newValue; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -rc9bc3ec71edfc189d0d9724627b15f1abdc7fc1d -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision c9bc3ec71edfc189d0d9724627b15f1abdc7fc1d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -66,7 +66,7 @@ private const int expectedDarcyPermeabilityPropertyIndex = 15; private const int expectedDiameter70PropertyIndex = 16; private const int expectedSaturatedVolumicWeightOfCoverageLayerPropertyIndex = 17; - + [Test] public void DefaultConstructor_ExpectedValues() { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -ra50f8fe4c13956d52e563e1f9e154f1bd186edad -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision a50f8fe4c13956d52e563e1f9e154f1bd186edad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -134,7 +134,7 @@ CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); CollectionAssert.AreEqual(pipingCalculationContext.AvailableStochasticSoilModels, pipingInputContext.AvailableStochasticSoilModels); - var pipingOutputContext = (PipingOutputContext)children[2]; + var pipingOutputContext = (PipingOutputContext) children[2]; Assert.AreSame(pipingCalculationContext.WrappedData.SemiProbabilisticOutput, pipingOutputContext.SemiProbabilisticOutput); Assert.AreSame(pipingCalculationContext.WrappedData.Output, pipingOutputContext.WrappedData); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r2a200c2d662366b037964ac9e780b27130cf0285 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 2a200c2d662366b037964ac9e780b27130cf0285) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -939,6 +939,7 @@ mocks.VerifyAll(); } + [Test] [TestCase(nameColumnIndex, "New name", true, false)] [TestCase(stochasticSoilProfilesColumnIndex, null, false, true)] [TestCase(hydraulicBoundaryLocationsColumnIndex, null, false, true)] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFeaturesFactoryTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -190,21 +190,25 @@ calculationB.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8); // Call - MapFeature[] features = PipingMapDataFeaturesFactory.CreateCalculationFeatures(new [] { calculationA, calculationB}); + MapFeature[] features = PipingMapDataFeaturesFactory.CreateCalculationFeatures(new[] + { + calculationA, + calculationB + }); // Assert Assert.AreEqual(2, features.Length); Assert.AreEqual(1, features[0].MapGeometries.Count()); Assert.AreEqual(1, features[1].MapGeometries.Count()); - AssertEqualPointCollections(new [] + AssertEqualPointCollections(new[] { - new Point2D(1.0, 3.0), - new Point2D(5.0, 4.0) + new Point2D(1.0, 3.0), + new Point2D(5.0, 4.0) }, features[0].MapGeometries.ElementAt(0)); - AssertEqualPointCollections(new [] + AssertEqualPointCollections(new[] { - new Point2D(1.0, 4.0), - new Point2D(2.2, 3.8) + new Point2D(1.0, 4.0), + new Point2D(2.2, 3.8) }, features[1].MapGeometries.ElementAt(0)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r8835dbef07a012e4e7e9f8aa8e21040bfea4e079 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 8835dbef07a012e4e7e9f8aa8e21040bfea4e079) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -60,10 +60,10 @@ // Call PipingInput input = invalidPipingCalculation.InputParameters; double result = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer(input.WaterVolumetricWeight, - PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), - input.ExitPointL, - input.SurfaceLine, - input.StochasticSoilProfile.SoilProfile); + PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), + input.ExitPointL, + input.SurfaceLine, + input.StochasticSoilProfile.SoilProfile); // Assert Assert.IsNaN(result); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs (.../PipingCalculatorResultTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs (.../PipingCalculatorResultTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -32,7 +32,7 @@ { // Call TestDelegate test = () => new PipingCalculatorResult(null); - + // Assert var paramName = Assert.Throws(test).ParamName; Assert.AreEqual("constructionProperties", paramName); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -rfd3c0659cda84afb46ac649ac86d7b71d7fc9f4d -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision fd3c0659cda84afb46ac649ac86d7b71d7fc9f4d) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -92,7 +92,7 @@ // Setup PipingCalculatorInput input = new TestPipingInput().AsRealInput(); var testPipingSubCalculatorFactory = new TestPipingSubCalculatorFactory(); - var bottomAquitardLayerAboveExitPointZ = new Random(21).NextDouble() * 10; + var bottomAquitardLayerAboveExitPointZ = new Random(21).NextDouble()*10; testPipingSubCalculatorFactory.LastCreatedPipingProfilePropertyCalculator.BottomAquitardLayerAboveExitPointZ = bottomAquitardLayerAboveExitPointZ; // Call @@ -350,9 +350,9 @@ } [Test] - [TestCase(0,2,1,3)] - [TestCase(0,3,2,1)] - [TestCase(3,2,1,0)] + [TestCase(0, 2, 1, 3)] + [TestCase(0, 3, 2, 1)] + [TestCase(3, 2, 1, 0)] public void Validate_SurfaceLineInvalidDitchPointsOrder_ValidationMessageForInvalidDitchPointsOrder( int ditchDikeSidePosition, int bottomDitchDikeSidePosition, Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -87,7 +87,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable effectiveThicknessCoverageLayer = + DesignVariable effectiveThicknessCoverageLayer = PipingSemiProbabilisticDesignValueFactory.GetEffectiveThicknessCoverageLayer(inputParameters); // Assert @@ -103,7 +103,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable freaticLevelExit = + DesignVariable freaticLevelExit = PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(inputParameters); // Assert @@ -137,7 +137,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable seepageLength = + DesignVariable seepageLength = PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(inputParameters); // Assert @@ -152,7 +152,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable d70 = + DesignVariable d70 = PipingSemiProbabilisticDesignValueFactory.GetDiameter70(inputParameters); // Assert @@ -167,7 +167,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable darcyPermeability = + DesignVariable darcyPermeability = PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(inputParameters); // Assert @@ -183,12 +183,12 @@ inputParameters.StochasticSoilProfile.SoilProfile.Layers.ElementAt(0).BelowPhreaticLevelMean = 3.2; // Call - DesignVariable saturatedVolumicWeightOfCoverageLayer = + DesignVariable saturatedVolumicWeightOfCoverageLayer = PipingSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters); // Assert DistributionAssert.AreEqual( - inputParameters.SaturatedVolumicWeightOfCoverageLayer, + inputParameters.SaturatedVolumicWeightOfCoverageLayer, saturatedVolumicWeightOfCoverageLayer.Distribution); AssertPercentile(0.05, saturatedVolumicWeightOfCoverageLayer); } @@ -200,7 +200,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable saturatedVolumicWeightOfCoverageLayer = + DesignVariable saturatedVolumicWeightOfCoverageLayer = PipingSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters); // Assert @@ -216,7 +216,7 @@ var inputParameters = new PipingInput(new GeneralPipingInput()); // Call - DesignVariable thicknessAquiferLayer = + DesignVariable thicknessAquiferLayer = PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(inputParameters); // Assert Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/TestPipingSubCalculatorFactory.cs =================================================================== diff -u -r603e8bd9a029ad240267e5aec4d89aab7709bb06 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/TestPipingSubCalculatorFactory.cs (.../TestPipingSubCalculatorFactory.cs) (revision 603e8bd9a029ad240267e5aec4d89aab7709bb06) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/TestPipingSubCalculatorFactory.cs (.../TestPipingSubCalculatorFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -29,13 +29,6 @@ /// public class TestPipingSubCalculatorFactory : IPipingSubCalculatorFactory { - public EffectiveThicknessCalculatorStub LastCreatedEffectiveThicknessCalculator { get; private set; } - public UpliftCalculatorStub LastCreatedUpliftCalculator { get; private set; } - public SellmeijerCalculatorStub LastCreatedSellmeijerCalculator { get; private set; } - public HeaveCalculatorStub LastCreatedHeaveCalculator { get; private set; } - public PiezoHeadCalculatorStub LastCreatedPiezometricHeadAtExitCalculator { get; private set; } - public PipingProfilePropertyCalculatorStub LastCreatedPipingProfilePropertyCalculator { get; private set; } - public TestPipingSubCalculatorFactory() { LastCreatedUpliftCalculator = new UpliftCalculatorStub(); @@ -46,6 +39,13 @@ LastCreatedPipingProfilePropertyCalculator = new PipingProfilePropertyCalculatorStub(); } + public EffectiveThicknessCalculatorStub LastCreatedEffectiveThicknessCalculator { get; private set; } + public UpliftCalculatorStub LastCreatedUpliftCalculator { get; private set; } + public SellmeijerCalculatorStub LastCreatedSellmeijerCalculator { get; private set; } + public HeaveCalculatorStub LastCreatedHeaveCalculator { get; private set; } + public PiezoHeadCalculatorStub LastCreatedPiezometricHeadAtExitCalculator { get; private set; } + public PipingProfilePropertyCalculatorStub LastCreatedPipingProfilePropertyCalculator { get; private set; } + public IUpliftCalculator CreateUpliftCalculator() { return LastCreatedUpliftCalculator; Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r89208074af9e942166875097aa38aa77476a5a3a -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 89208074af9e942166875097aa38aa77476a5a3a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -37,9 +37,9 @@ [TestFixture] public class PipingCalculationServiceTest { + private const string averagingSoilLayerPropertiesMessage = "Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn."; private double testSurfaceLineTopLevel; private PipingCalculationScenario testCalculation; - private const string averagingSoilLayerPropertiesMessage = "Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn."; [SetUp] public void Setup() @@ -154,7 +154,7 @@ testCalculation.InputParameters.UseAssessmentLevelManualInput = true; testCalculation.InputParameters.AssessmentLevel = (RoundedDouble) assessmentLevel; testCalculation.Name = name; - + // Call bool isValid = false; Action call = () => isValid = PipingCalculationService.Validate(testCalculation); @@ -384,7 +384,7 @@ aquiferLayer }, SoilProfileType.SoilProfile1D, -1); - + testCalculation.InputParameters.StochasticSoilProfile.SoilProfile = profile; testCalculation.Name = name; Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -rd7ac6da9fa00d17a03d6912000c889172bbf12ad -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision d7ac6da9fa00d17a03d6912000c889172bbf12ad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -172,7 +172,6 @@ UpliftFactorOfSafety = fosUplift, HeaveFactorOfSafety = fosHeave, SellmeijerFactorOfSafety = fosSellmeijer - }); var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { @@ -206,7 +205,6 @@ UpliftFactorOfSafety = fosUplift, HeaveFactorOfSafety = fosHeave, SellmeijerFactorOfSafety = fosSellmeijer - }); var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs =================================================================== diff -u -re0cdc94746640378e3d5b7966f204fdf961872c4 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs (.../WaveConditionsOutput.cs) (revision e0cdc94746640378e3d5b7966f204fdf961872c4) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs (.../WaveConditionsOutput.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -59,7 +59,7 @@ public WaveConditionsOutput(double waterLevel, double waveHeight, double wavePeakPeriod, double waveAngle, double waveDirection, double targetProbability, double targetReliability, - double calculatedProbability, double calculatedReliability, + double calculatedProbability, double calculatedReliability, CalculationConvergence calculationConvergence) { WaterLevel = new RoundedDouble(2, waterLevel); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsOutputProperties.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsOutputProperties.cs (.../WaveConditionsOutputProperties.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsOutputProperties.cs (.../WaveConditionsOutputProperties.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -118,7 +118,7 @@ get { return data.TargetReliability; - } + } } [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")] Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs =================================================================== diff -u -re0cdc94746640378e3d5b7966f204fdf961872c4 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs (.../WaveConditionsOutputTest.cs) (revision e0cdc94746640378e3d5b7966f204fdf961872c4) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs (.../WaveConditionsOutputTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -110,11 +110,11 @@ public void Constructor_WithInvalidCalculationConvergenceValue_ThrowsInvalidEnumArgumentException() { // Setup - var invalidEnumValue = (CalculationConvergence)9001; + var invalidEnumValue = (CalculationConvergence) 9001; // Call TestDelegate call = () => new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, double.NaN, invalidEnumValue); + double.NaN, double.NaN, double.NaN, invalidEnumValue); // Assert const string expectedMessage = "The value of argument 'value' (9001) is invalid for Enum type 'CalculationConvergence'."; Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -racf86909628278e511e07a2096f71664e6ef9ee8 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision acf86909628278e511e07a2096f71664e6ef9ee8) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -202,7 +202,7 @@ mockRepository.VerifyAll(); } - [Test] + [Test] public void Validate_UseBreakWaterInvalidBreakWaterHeight_LogErrorAndReturnFalse( [Values(StabilityPointStructureInflowModelType.FloodedCulvert, StabilityPointStructureInflowModelType.LowSill)] StabilityPointStructureInflowModelType inflowModelType, [Values(LoadSchematizationType.Quadratic, LoadSchematizationType.Linear)] LoadSchematizationType loadSchematizationType, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs =================================================================== diff -u -rdee01f6d6c15af0cc124816bfe99c7658af8995d -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs (.../StabilityPointStructuresDataSynchronizationServiceTest.cs) (revision dee01f6d6c15af0cc124816bfe99c7658af8995d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs (.../StabilityPointStructuresDataSynchronizationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -160,8 +160,8 @@ int originalNumberOfSectionResultAssignments = failureMechanism.SectionResults.Count(sr => sr.Calculation != null); StabilityPointStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults - .Where(sr => calculationsWithStructure.Contains(sr.Calculation)) - .ToArray(); + .Where(sr => calculationsWithStructure.Contains(sr.Calculation)) + .ToArray(); // Precondition CollectionAssert.IsNotEmpty(calculationsWithStructure); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs =================================================================== diff -u -r4838f004647741cf5409023313b884bd0a610c16 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs (.../StabilityStoneCoverMapDataFeaturesFactory.cs) (revision 4838f004647741cf5409023313b884bd0a610c16) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs (.../StabilityStoneCoverMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -49,15 +49,15 @@ } var calculationsWithLocationAndHydraulicBoundaryLocation = calculationInputs.Where(calculation => - calculation.InputParameters.ForeshoreProfile != null && - calculation.InputParameters.HydraulicBoundaryLocation != null); + calculation.InputParameters.ForeshoreProfile != null && + calculation.InputParameters.HydraulicBoundaryLocation != null); MapCalculationData[] calculationData = calculationsWithLocationAndHydraulicBoundaryLocation.Select( calculation => new MapCalculationData( - calculation.Name, - calculation.InputParameters.ForeshoreProfile.WorldReferencePoint, - calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); + calculation.Name, + calculation.InputParameters.ForeshoreProfile.WorldReferencePoint, + calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); return RingtoetsMapDataFeaturesFactory.CreateCalculationFeatures(calculationData); } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs =================================================================== diff -u -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs (.../WaveImpactAsphaltCoverFailureMechanismResultView.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -61,10 +61,10 @@ base.AddDataGridColumns(); EnumDisplayWrapper[] twoAResultDataSource = - Enum.GetValues(typeof(AssessmentLayerTwoAResult)) - .OfType() - .Select(el => new EnumDisplayWrapper(el)) - .ToArray(); + Enum.GetValues(typeof(AssessmentLayerTwoAResult)) + .OfType() + .Select(el => new EnumDisplayWrapper(el)) + .ToArray(); DataGridViewControl.AddComboBoxColumn( TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs =================================================================== diff -u -r4838f004647741cf5409023313b884bd0a610c16 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactory.cs) (revision 4838f004647741cf5409023313b884bd0a610c16) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -49,15 +49,15 @@ } var calculationsWithLocationAndHydraulicBoundaryLocation = calculationInputs.Where(calculation => - calculation.InputParameters.ForeshoreProfile != null && - calculation.InputParameters.HydraulicBoundaryLocation != null); + calculation.InputParameters.ForeshoreProfile != null && + calculation.InputParameters.HydraulicBoundaryLocation != null); MapCalculationData[] calculationData = calculationsWithLocationAndHydraulicBoundaryLocation.Select( calculation => new MapCalculationData( - calculation.Name, - calculation.InputParameters.ForeshoreProfile.WorldReferencePoint, - calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); + calculation.Name, + calculation.InputParameters.ForeshoreProfile.WorldReferencePoint, + calculation.InputParameters.HydraulicBoundaryLocation)).ToArray(); return RingtoetsMapDataFeaturesFactory.CreateCalculationFeatures(calculationData); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -35,7 +35,6 @@ [TestFixture] public class WaveImpactAsphaltCoverMapDataFeaturesFactoryTest { - [Test] public void CreateCalculationFeatures_CalculationsNull_ReturnsEmptyFeaturesArray() { @@ -70,21 +69,25 @@ calculationB.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8); // Call - MapFeature[] features = WaveImpactAsphaltCoverMapDataFeaturesFactory.CreateCalculationFeatures(new[] { calculationA, calculationB }); + MapFeature[] features = WaveImpactAsphaltCoverMapDataFeaturesFactory.CreateCalculationFeatures(new[] + { + calculationA, + calculationB + }); // Assert Assert.AreEqual(2, features.Length); Assert.AreEqual(1, features[0].MapGeometries.Count()); Assert.AreEqual(1, features[1].MapGeometries.Count()); AssertEqualPointCollections(new[] { - new Point2D(1.0, 3.0), - new Point2D(5.0, 4.0) + new Point2D(1.0, 3.0), + new Point2D(5.0, 4.0) }, features[0].MapGeometries.ElementAt(0)); AssertEqualPointCollections(new[] { - new Point2D(1.0, 4.0), - new Point2D(2.2, 3.8) + new Point2D(1.0, 4.0), + new Point2D(2.2, 3.8) }, features[1].MapGeometries.ElementAt(0)); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -rca77db5948e6c622ea1fb3092917341ba1234711 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision ca77db5948e6c622ea1fb3092917341ba1234711) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -96,7 +96,7 @@ // Assert Assert.AreEqual(2, viewInfos.Length); - + PluginTestHelper.AssertViewInfoDefined( viewInfos, typeof(WaveImpactAsphaltCoverFailureMechanismContext), Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8905298103eb01ce13dd5c1a2f267f879d4fda3e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) @@ -113,7 +113,6 @@ .Cast() .ToArray(); - // Call IEnumerable affectedItems = WaveImpactAsphaltCoverDataSynchronizationService.ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);