Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -rd0996c2eb38e607698ffe7f57e6e1847f8550a8f -r4faae1433690b9b06b40c18ff322140aa16df739 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs (.../IHydraulicLocationOutputEntityReadExtensionsTest.cs) (revision d0996c2eb38e607698ffe7f57e6e1847f8550a8f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IHydraulicLocationOutputEntityReadExtensionsTest.cs (.../IHydraulicLocationOutputEntityReadExtensionsTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -70,8 +70,8 @@ [Test] public void Read_NaNParameters_ReturnsHydraulicBoundaryLocationOutputWithNaN( - [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged, - CalculationConvergence.NotCalculated)] CalculationConvergence convergence) + [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged, + CalculationConvergence.NotCalculated)] CalculationConvergence convergence) { // Setup var entity = new TestHydraulicLocationOutputEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -ra50f8fe4c13956d52e563e1f9e154f1bd186edad -r4faae1433690b9b06b40c18ff322140aa16df739 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision a50f8fe4c13956d52e563e1f9e154f1bd186edad) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -382,7 +382,7 @@ private static double? GetRandomNullableDoubleInRange(Random random, double lowerLimit, double upperLimit) { var difference = upperLimit - lowerLimit; - return lowerLimit + random.NextDouble()*difference; + return lowerLimit + random.NextDouble() * difference; } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Base/Data/RoundedPoint2DCollection.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Base/Data/RoundedPoint2DCollection.cs (.../RoundedPoint2DCollection.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Core/Common/src/Core.Common.Base/Data/RoundedPoint2DCollection.cs (.../RoundedPoint2DCollection.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -57,9 +57,9 @@ } points = originalPoints.Select(p => - new Point2D( - new RoundedDouble(numberOfDecimalPlaces, p.X), - new RoundedDouble(numberOfDecimalPlaces, p.Y))); + new Point2D( + new RoundedDouble(numberOfDecimalPlaces, p.X), + new RoundedDouble(numberOfDecimalPlaces, p.Y))); this.numberOfDecimalPlaces = numberOfDecimalPlaces; } Index: Core/Common/src/Core.Common.Base/Geometry/Math2D.cs =================================================================== diff -u -r7a9b83110a9c9b09eb2d904a2f0ea25d8f6e5602 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision 7a9b83110a9c9b09eb2d904a2f0ea25d8f6e5602) +++ Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -136,20 +136,20 @@ var aLine = line1Point2.Y - line1Point1.Y; var bLine = line1Point1.X - line1Point2.X; - var cLine = aLine*line1Point1.X + bLine*line1Point1.Y; + var cLine = aLine * line1Point1.X + bLine * line1Point1.Y; var aOtherLine = line2Point2.Y - line2Point1.Y; var bOtherLine = line2Point1.X - line2Point2.X; - var cOtherLine = aOtherLine*line2Point1.X + bOtherLine*line2Point1.Y; + var cOtherLine = aOtherLine * line2Point1.X + bOtherLine * line2Point1.Y; - var determinant = aLine*bOtherLine - aOtherLine*bLine; + var determinant = aLine * bOtherLine - aOtherLine * bLine; if (Math.Abs(determinant) < epsilonForComparisons) { return null; } - var x = (bOtherLine*cLine - bLine*cOtherLine)/determinant; - var y = (aLine*cOtherLine - aOtherLine*cLine)/determinant; + var x = (bOtherLine * cLine - bLine * cOtherLine) / determinant; + var y = (aLine * cOtherLine - aOtherLine * cLine) / determinant; return new Point2D(x, y); } @@ -283,13 +283,13 @@ else { // Segments are at an angle and may intersect: - double sI = PerpDotProduct(v, w)/d; + double sI = PerpDotProduct(v, w) / d; if (sI < 0.0 || sI > 1.0) { return Segment2DIntersectSegment2DResult.CreateNoIntersectResult(); } - double tI = PerpDotProduct(u, w)/d; + double tI = PerpDotProduct(u, w) / d; if (tI < 0.0 || tI > 1.0) { return Segment2DIntersectSegment2DResult.CreateNoIntersectResult(); @@ -343,13 +343,13 @@ Vector w2 = segment1.SecondPoint - segment2.FirstPoint; if (v[0] != 0.0) { - t0 = w[0]/v[0]; - t1 = w2[0]/v[0]; + t0 = w[0] / v[0]; + t1 = w2[0] / v[0]; } else { - t0 = w[1]/v[1]; - t1 = w2[1]/v[1]; + t0 = w[1] / v[1]; + t1 = w2[1] / v[1]; } // Require t0 to be smaller than t1, swapping if needed: if (t0 > t1) @@ -517,7 +517,7 @@ private static Point2D GetInterpolatedPoint(Segment2D lineSegment, double splitDistance) { - var interpolationFactor = splitDistance/lineSegment.Length; + var interpolationFactor = splitDistance / lineSegment.Length; return GetInterpolatedPointAtFraction(lineSegment, interpolationFactor); } Index: Core/Common/src/Core.Common.Base/Geometry/Point2D.cs =================================================================== diff -u -r7a9b83110a9c9b09eb2d904a2f0ea25d8f6e5602 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Base/Geometry/Point2D.cs (.../Point2D.cs) (revision 7a9b83110a9c9b09eb2d904a2f0ea25d8f6e5602) +++ Core/Common/src/Core.Common.Base/Geometry/Point2D.cs (.../Point2D.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -154,7 +154,7 @@ unchecked { var hashCode = X.GetHashCode(); - hashCode = (hashCode*397) ^ Y.GetHashCode(); + hashCode = (hashCode * 397) ^ Y.GetHashCode(); return hashCode; } } Index: Core/Common/src/Core.Common.Base/Geometry/Point3D.cs =================================================================== diff -u -r49c5da81f49a23dd6e66526d264a08bf510e6963 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Base/Geometry/Point3D.cs (.../Point3D.cs) (revision 49c5da81f49a23dd6e66526d264a08bf510e6963) +++ Core/Common/src/Core.Common.Base/Geometry/Point3D.cs (.../Point3D.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -78,8 +78,8 @@ unchecked { var hashCode = X.GetHashCode(); - hashCode = (hashCode*397) ^ Y.GetHashCode(); - hashCode = (hashCode*397) ^ Z.GetHashCode(); + hashCode = (hashCode * 397) ^ Y.GetHashCode(); + hashCode = (hashCode * 397) ^ Z.GetHashCode(); return hashCode; } } Index: Core/Common/src/Core.Common.Base/Geometry/Point3DExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Base/Geometry/Point3DExtensions.cs (.../Point3DExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Core/Common/src/Core.Common.Base/Geometry/Point3DExtensions.cs (.../Point3DExtensions.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -73,8 +73,8 @@ } // Project vector onto the 'spanning vector' to determine its X-coordinate in local coordinates: - double projectOnSpanningVectorFactor = vectorToPoint.DotProduct(spanningVector)/spanningVectorDotProduct; - double localCoordinateX = projectOnSpanningVectorFactor*length; + double projectOnSpanningVectorFactor = vectorToPoint.DotProduct(spanningVector) / spanningVectorDotProduct; + double localCoordinateX = projectOnSpanningVectorFactor * length; return new Point2D(localCoordinateX, worldCoordinate.Z); } Index: Core/Common/src/Core.Common.Base/Geometry/Segment2D.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Base/Geometry/Segment2D.cs (.../Segment2D.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Core/Common/src/Core.Common.Base/Geometry/Segment2D.cs (.../Segment2D.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -134,9 +134,9 @@ // 'point' falls within the perpendicular area defined by the segment (zone B). // 3. Use remainder of vector projection to determine point on segment for perpendicular line: - double projectionFactor = dotProductOrientationVector/dotProductSegmentVector; - double perpendicularOnSegmentX = FirstPoint.X + projectionFactor*segmentVector[0]; - double perpendicularOnSegmentY = FirstPoint.Y + projectionFactor*segmentVector[1]; + double projectionFactor = dotProductOrientationVector / dotProductSegmentVector; + double perpendicularOnSegmentX = FirstPoint.X + projectionFactor * segmentVector[0]; + double perpendicularOnSegmentY = FirstPoint.Y + projectionFactor * segmentVector[1]; var perpendicularLineIntersectionPoint = new Point2D(perpendicularOnSegmentX, perpendicularOnSegmentY); return point.GetEuclideanDistanceTo(perpendicularLineIntersectionPoint); @@ -184,7 +184,7 @@ { unchecked { - return ((FirstPoint.X + SecondPoint.X).GetHashCode()*397) ^ (FirstPoint.Y + SecondPoint.Y).GetHashCode(); + return ((FirstPoint.X + SecondPoint.X).GetHashCode() * 397) ^ (FirstPoint.Y + SecondPoint.Y).GetHashCode(); } } Index: Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs =================================================================== diff -u -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs (.../DragDropHandler.cs) (revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a) +++ Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs (.../DragDropHandler.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -259,7 +259,7 @@ private static void ScrollIntoView(Point point, TreeNode nodeOver, FormsTreeView treeView) { int delta = treeView.Height - point.Y; - double halfTreeViewHeight = treeView.Height/2.0; + double halfTreeViewHeight = treeView.Height / 2.0; if (delta < halfTreeViewHeight && delta > 0) { @@ -285,7 +285,7 @@ var placeholderLocation = PlaceholderLocation.None; int offsetY = treeView.PointToClient(Cursor.Position).Y - nodeOver.Bounds.Top; - if (offsetY < nodeOver.Bounds.Height/3 && nodeDragging.NextNode != nodeOver) + if (offsetY < nodeOver.Bounds.Height / 3 && nodeDragging.NextNode != nodeOver) { if (nodeOver.Parent != null) { @@ -311,7 +311,7 @@ } } else if (nodeOver.Parent != null && - offsetY > nodeOver.Bounds.Height - nodeOver.Bounds.Height/3 && + offsetY > nodeOver.Bounds.Height - nodeOver.Bounds.Height / 3 && nodeDragging.PrevNode != nodeOver) { TreeNodeInfo treeNodeInfo = getTreeNodeInfoForData(nodeOver.Parent.Tag); @@ -331,8 +331,8 @@ } } else if (nodeDragging != nodeOver && - offsetY < nodeOver.Bounds.Height - nodeOver.Bounds.Height/4 && - offsetY > nodeOver.Bounds.Height/4) + offsetY < nodeOver.Bounds.Height - nodeOver.Bounds.Height / 4 && + offsetY > nodeOver.Bounds.Height / 4) { nodeDropTarget = nodeOver; dropAtLocation = 0; @@ -392,7 +392,7 @@ yPos = bounds.Bottom; break; case PlaceholderLocation.Middle: - yPos = bounds.Top + bounds.Height/2; + yPos = bounds.Top + bounds.Height / 2; break; default: throw new InvalidEnumArgumentException("location", @@ -416,15 +416,15 @@ return new[] { new Point(bounds.Left, bounds.Top), - new Point(bounds.Right, bounds.Top + bounds.Height/2), + new Point(bounds.Right, bounds.Top + bounds.Height / 2), new Point(bounds.Left, bounds.Top + bounds.Height), new Point(bounds.Left, bounds.Top) }; case AnchorStyles.Right: return new[] { new Point(bounds.Right, bounds.Top), - new Point(bounds.Left, bounds.Top + bounds.Height/2), + new Point(bounds.Left, bounds.Top + bounds.Height / 2), new Point(bounds.Right, bounds.Top + bounds.Height), new Point(bounds.Right, bounds.Top) }; Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -686,7 +686,7 @@ { Size glyphSize = CheckBoxRenderer.GetGlyphSize(g, state); - CheckBoxRenderer.DrawCheckBox(g, new Point((result.Width - glyphSize.Width)/2, (result.Height - glyphSize.Height)/2), state); + CheckBoxRenderer.DrawCheckBox(g, new Point((result.Width - glyphSize.Width) / 2, (result.Height - glyphSize.Height) / 2), state); } return result; Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -118,7 +118,7 @@ progressReporter.ReportProgress(() => { // Update the progress bar - progressBar.Value = (int) Math.Round(100.0/activityCount*stepNumberForProgressNotification); + progressBar.Value = (int) Math.Round(100.0 / activityCount * stepNumberForProgressNotification); }); } }, cancellationToken); Index: Core/Common/test/Core.Common.Base.Test/Geometry/Math2DTest.cs =================================================================== diff -u -r9063c3c60f936760953c52185b72f0cb2dce9bf8 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Base.Test/Geometry/Math2DTest.cs (.../Math2DTest.cs) (revision 9063c3c60f936760953c52185b72f0cb2dce9bf8) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Math2DTest.cs (.../Math2DTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -120,7 +120,7 @@ var result = Math2D.LineIntersectionWithLine(new Point2D(start, y1), new Point2D(start + 1, y2), new Point2D(start + 0.5, 0), new Point2D(start + 0.5, 1)); // Assert - Assert.AreEqual((y1 + y2)/2, result.Y, 1e-6); + Assert.AreEqual((y1 + y2) / 2, result.Y, 1e-6); } [Test] @@ -490,7 +490,7 @@ double dx) { // Setup - Func getY = x => 1.1*x + 2.2; + Func getY = x => 1.1 * x + 2.2; const double x1 = 1.1; const double x2 = 3.3; var segment1 = new Segment2D(new Point2D(x1, getY(x1)), new Point2D(x2, getY(x2))); @@ -590,9 +590,9 @@ // Assert Assert.AreEqual(Intersection2DType.Intersects, result.IntersectionType); CollectionAssert.AreEqual(new[] - { - segmentCommonPoint - }, result.IntersectionPoints, + { + segmentCommonPoint + }, result.IntersectionPoints, new Point2DComparerWithTolerance(1e-6)); } @@ -605,7 +605,7 @@ int configurationNumber) { // Setup - Func getY = x => 3.3*x + 4.4; + Func getY = x => 3.3 * x + 4.4; const double x1 = 5.5; const double x2 = 6.6; @@ -791,7 +791,7 @@ public void GetIntersectionBetweenSegments_CollinearSegmentsWithFullOverlap_ReturnOverlap() { // Setup - Func getY = x => -12.34*x + 45.67; + Func getY = x => -12.34 * x + 45.67; const double x1 = 1.1; const double x2 = 2.2; const double x3 = -3.3; @@ -885,7 +885,7 @@ bool firstSegmentIsPointDegenerate) { // Setup - Func getY = x => 1.2*x + 3.4; + Func getY = x => 1.2 * x + 3.4; const double x1 = 1.1; const double x2 = 5.5; @@ -959,7 +959,7 @@ bool firstSegmentIsPointDegenerate) { // Setup - Func getY = x => -5.6*x + 7.8; + Func getY = x => -5.6 * x + 7.8; const double x1 = 1.1; const double x2 = 5.5; @@ -1146,7 +1146,7 @@ Point2D result = Math2D.GetInterpolatedPointAtFraction(segment, fraction); // Assert - Assert.AreEqual(new Point2D(2.8, (5.02 - 2.2)*fraction), result); + Assert.AreEqual(new Point2D(2.8, (5.02 - 2.2) * fraction), result); } [Test] @@ -1215,7 +1215,7 @@ private static double[] GetLengthsBasedOnRelative(double[] relativeLengths, IEnumerable lineGeometryPoints) { var lineLength = Math2D.ConvertLinePointsToLineSegments(lineGeometryPoints).Sum(s => s.Length); - return relativeLengths.Select(l => lineLength*l).ToArray(); + return relativeLengths.Select(l => lineLength * l).ToArray(); } #region testcases Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -163,7 +163,10 @@ Point2D second = new Point2D(0, 0); // Call - TestDelegate call = () => { Vector result = first - second; }; + TestDelegate call = () => + { + Vector result = first - second; + }; // Assert string paramName = Assert.Throws(call).ParamName; @@ -178,7 +181,10 @@ Point2D second = null; // Call - TestDelegate call = () => { Vector result = first - second; }; + TestDelegate call = () => + { + Vector result = first - second; + }; // Assert string paramName = Assert.Throws(call).ParamName; @@ -209,7 +215,10 @@ Vector vector = new DenseVector(2); // Call - TestDelegate call = () => { Point2D result = point + vector; }; + TestDelegate call = () => + { + Point2D result = point + vector; + }; // Assert string paramName = Assert.Throws(call).ParamName; @@ -224,7 +233,10 @@ Vector vector = null; // Call - TestDelegate call = () => { Point2D result = point + vector; }; + TestDelegate call = () => + { + Point2D result = point + vector; + }; // Assert string paramName = Assert.Throws(call).ParamName; @@ -295,7 +307,10 @@ }); // Call - TestDelegate call = () => { Point2D result = originalPoint + vector3D; }; + TestDelegate call = () => + { + Point2D result = originalPoint + vector3D; + }; // Assert const string expectedMessage = "Vector moet 2 dimensies hebben, maar heeft er 3."; Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point3DExtensionsTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Base.Test/Geometry/Point3DExtensionsTest.cs (.../Point3DExtensionsTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point3DExtensionsTest.cs (.../Point3DExtensionsTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -131,9 +131,9 @@ Point2D convertedPoint = pointToConvert.ProjectIntoLocalCoordinates(startPoint, endPoint); // Assert - var length = Math.Sqrt(2*2 + 3*3); - const double pointToConvertCoordinateFactor = (2.0*1.0 + 3.0*2.0)/(2.0*2.0 + 3.0*3.0); - double expectedX = pointToConvertCoordinateFactor*length; + var length = Math.Sqrt(2 * 2 + 3 * 3); + const double pointToConvertCoordinateFactor = (2.0 * 1.0 + 3.0 * 2.0) / (2.0 * 2.0 + 3.0 * 3.0); + double expectedX = pointToConvertCoordinateFactor * length; Assert.AreEqual(new Point2D(expectedX, pointToConvert.Z), convertedPoint); } Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs (.../Point3DTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs (.../Point3DTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -118,7 +118,7 @@ x + deltaX, y + deltaY, z + deltaZ - ); + ); // Call var result = point.Equals(otherPoint); Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs =================================================================== diff -u -r9b3d6b83f63ca12b07473d2668aa0f3cd85266c8 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 9b3d6b83f63ca12b07473d2668aa0f3cd85266c8) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs (.../DataGridViewControlTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -488,7 +488,7 @@ dataSource, TypeUtils.GetMemberName>(ds => ds.Value), TypeUtils.GetMemberName>(ds => ds.DisplayName) - ); + ); // Assert Assert.AreEqual(1, dataGridView.ColumnCount); Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs =================================================================== diff -u -rcf9cd9f3225c44880a5e966117e0f2c09fc2d4b0 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision cf9cd9f3225c44880a5e966117e0f2c09fc2d4b0) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs (.../AvalonDockViewHostTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -149,6 +149,11 @@ }, firedEvents); } + private class TestView : UserControl, IView + { + public object Data { get; set; } + } + #region Document views [Test] @@ -973,10 +978,5 @@ } #endregion - - private class TestView : UserControl, IView - { - public object Data { get; set; } - } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs =================================================================== diff -u -r203d0f03d922b6dac20080dad8e82fe92c7bec86 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs (.../PluginTestHelper.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) +++ Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs (.../PluginTestHelper.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -48,8 +48,8 @@ Assert.NotNull(propertyInfos, "The given collection of propertyInfos was undefined."); var propertyInfo = propertyInfos.FirstOrDefault( tni => - tni.DataType == dataObjectType && - tni.PropertyObjectType == propertyObjectType); + tni.DataType == dataObjectType && + tni.PropertyObjectType == propertyObjectType); Assert.NotNull(propertyInfo, $"The property info object was not found for the given dataType ({dataObjectType}) " + $"and propertyObjectType ({propertyObjectType})."); return propertyInfo; Index: Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs (.../RandomExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs (.../RandomExtensions.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -52,7 +52,7 @@ } double difference = upperLimit - lowerLimit; - double randomValue = lowerLimit + random.NextDouble()*difference; + double randomValue = lowerLimit + random.NextDouble() * difference; if (double.IsInfinity(randomValue) || double.IsNaN(randomValue)) { string message = string.Format("Creating a new random value with lower limit {0} " + Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs =================================================================== diff -u -r5e6189fbdb1d72d1ac13c1c5471315778f812561 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 5e6189fbdb1d72d1ac13c1c5471315778f812561) +++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -312,10 +312,10 @@ var userMessage = string.IsNullOrEmpty(message) ? "" : message + ". "; if (!rank.Equals(1.0f)) { - Assert.IsTrue(rank*actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}", - maxMilliseconds, actualMillisecond, actualMillisecond*rank); + Assert.IsTrue(rank * actualMillisecond < maxMilliseconds, userMessage + "Maximum of {0} milliseconds exceeded. Actual was {1}, machine performance weighted actual was {2}", + maxMilliseconds, actualMillisecond, actualMillisecond * rank); Console.WriteLine(userMessage + string.Format("Test took {1} milliseconds (machine performance weighted {2}). Maximum was {0}", - maxMilliseconds, actualMillisecond, actualMillisecond*rank)); + maxMilliseconds, actualMillisecond, actualMillisecond * rank)); } else { @@ -411,7 +411,7 @@ var bitmap = new Bitmap(image).Clone(new Rectangle(0, 0, image.Size.Width, image.Size.Height), PixelFormat.Format32bppArgb); var index = 0; - var imageColors = new Color[image.Size.Width*image.Size.Height]; + var imageColors = new Color[image.Size.Width * image.Size.Height]; for (int i = 0; i < bitmap.Height; i++) { for (int j = 0; j < bitmap.Width; j++) Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs =================================================================== diff -u -ra4da6760f40992a5db81766eb5c31e8586bad5ae -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision a4da6760f40992a5db81766eb5c31e8586bad5ae) +++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -612,7 +612,7 @@ /// private int PrivateMethod(int i) { - return i*2; + return i * 2; } } Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs =================================================================== diff -u -r6e008d39203d261ead7023eeab03f641915eab14 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs (.../MapControl.cs) (revision 6e008d39203d261ead7023eeab03f641915eab14) +++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs (.../MapControl.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -149,7 +149,7 @@ private static void AddPadding(Extent extent) { - var padding = Math.Min(extent.Height, extent.Width)*0.05; + var padding = Math.Min(extent.Height, extent.Width) * 0.05; if (Math.Max(extent.Height, extent.Width) + padding <= double.MaxValue) { extent.ExpandBy(padding); Index: Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleAreaSeriesTest.cs =================================================================== diff -u -re42bdf3dd379c46bab9212eb7b30f4754c9bc91c -r4faae1433690b9b06b40c18ff322140aa16df739 --- Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleAreaSeriesTest.cs (.../MultipleAreaSeriesTest.cs) (revision e42bdf3dd379c46bab9212eb7b30f4754c9bc91c) +++ Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleAreaSeriesTest.cs (.../MultipleAreaSeriesTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -115,13 +115,13 @@ renderContext.Stub(rc => rc.SetClip(OxyRect.Create(0, 0, 0, 0))).Return(true); renderContext.Stub(rc => rc.ResetClip()); renderContext.Expect(rc => rc.DrawPolygon( - Arg.Matches(sp => sp.Length == pointCount), - Arg.Is.Equal(series.ActualFill), - Arg.Is.Equal(series.ActualColor), - Arg.Is.Equal(series.StrokeThickness), - Arg.Is.Anything, - Arg.Is.Anything, - Arg.Is.Anything)); + Arg.Matches(sp => sp.Length == pointCount), + Arg.Is.Equal(series.ActualFill), + Arg.Is.Equal(series.ActualColor), + Arg.Is.Equal(series.StrokeThickness), + Arg.Is.Anything, + Arg.Is.Anything, + Arg.Is.Anything)); mocks.ReplayAll(); var area = new DataPoint[pointCount]; @@ -156,13 +156,13 @@ renderContext.Stub(rc => rc.SetClip(OxyRect.Create(0, 0, 0, 0))).Return(true); renderContext.Stub(rc => rc.ResetClip()); renderContext.Expect(rc => rc.DrawPolygon( - Arg.Matches(sp => sp.Length > 0), - Arg.Is.Equal(series.ActualFill), - Arg.Is.Equal(series.ActualColor), - Arg.Is.Equal(series.StrokeThickness), - Arg.Is.Anything, - Arg.Is.Anything, - Arg.Is.Anything)).Repeat.Times(areaCount); + Arg.Matches(sp => sp.Length > 0), + Arg.Is.Equal(series.ActualFill), + Arg.Is.Equal(series.ActualColor), + Arg.Is.Equal(series.StrokeThickness), + Arg.Is.Anything, + Arg.Is.Anything, + Arg.Is.Anything)).Repeat.Times(areaCount); mocks.ReplayAll(); Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs (.../StructuresParameterRowsValidator.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs (.../StructuresParameterRowsValidator.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -198,7 +198,7 @@ StructureFilesKeywords.StabilityPointStructureParameterKeyword21, ProbabilityRule }, { - StructureFilesKeywords.StabilityPointStructureParameterKeyword22, NormalDistributionRule + StructureFilesKeywords.StabilityPointStructureParameterKeyword22, NormalDistributionMeanRule }, { StructureFilesKeywords.StabilityPointStructureParameterKeyword23, VariationCoefficientLogNormalDistributionRule @@ -377,16 +377,15 @@ return ValidateStochasticVariableParameters(row, true, false); } + private static List NormalDistributionMeanRule(StructuresParameterRow row) + { + return ValidateStochasticVariableMeanParameter(row, false); + } + private static List ValidateStochasticVariableParameters(StructuresParameterRow row, bool meanMustBeGreaterThanZero, bool variationAsStandardDeviation) { - var messages = new List(); + List messages = ValidateStochasticVariableMeanParameter(row, meanMustBeGreaterThanZero); - double mean = row.NumericalValue; - var numericalValueColumn1 = StructureFilesKeywords.NumericalValueColumnName; - messages.AddRange(meanMustBeGreaterThanZero ? - ValidateGreaterThanZeroDoubleParameter(row, numericalValueColumn1) : - ValidateDoubleParameter(row, numericalValueColumn1)); - VarianceType type = row.VarianceType; if (type != VarianceType.StandardDeviation && type != VarianceType.CoefficientOfVariation) { @@ -396,6 +395,7 @@ messages.AddRange(ValidatePositiveDoubleParameter(row, StructureFilesKeywords.VariationValueColumnName)); + double mean = row.NumericalValue; double absoluteMean = Math.Abs(mean); if (variationAsStandardDeviation) { @@ -417,6 +417,17 @@ return messages; } + private static List ValidateStochasticVariableMeanParameter(StructuresParameterRow row, bool meanMustBeGreaterThanZero) + { + var messages = new List(); + + string numericalValueColumn = StructureFilesKeywords.NumericalValueColumnName; + messages.AddRange(meanMustBeGreaterThanZero ? + ValidateGreaterThanZeroDoubleParameter(row, numericalValueColumn) : + ValidateDoubleParameter(row, numericalValueColumn)); + return messages; + } + private static List StructureNormalOrientation(StructuresParameterRow row) { var messages = new List(); @@ -445,7 +456,7 @@ private static bool IsValueWholeNumber(double value) { - return (value%1) < double.Epsilon; + return (value % 1) < double.Epsilon; } private static List ClosingStructureInflowModelTypeRule(StructuresParameterRow row) Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresParameterRowsValidatorTest.cs =================================================================== diff -u -r019fe7ac9a0a440913c46f52b06d857be970315a -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresParameterRowsValidatorTest.cs (.../StructuresParameterRowsValidatorTest.cs) (revision 019fe7ac9a0a440913c46f52b06d857be970315a) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Structures/StructuresParameterRowsValidatorTest.cs (.../StructuresParameterRowsValidatorTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -994,7 +994,6 @@ "De waarde voor parameter 'KW_STERSTAB20' op regel 20, kolom 'Numeriekewaarde', moet een positief getal zijn.", "De waarde voor parameter 'KW_STERSTAB21' op regel 21, kolom 'Numeriekewaarde', moet in het bereik [0, 1] liggen.", "De waarde voor parameter 'KW_STERSTAB22' op regel 22, kolom 'Numeriekewaarde', is geen getal.", - "De waarde voor parameter 'KW_STERSTAB22' op regel 22, kolom 'Boolean', moet '0' (variatiecoëfficiënt) of '1' (standaardafwijking) zijn.", "De waarde voor parameter 'KW_STERSTAB23' op regel 23, kolom 'Numeriekewaarde', is te dicht op 0 waardoor een betrouwbare conversie tussen standaardafwijking en variatiecoëfficiënt niet mogelijk is.", "De waarde voor parameter 'KW_STERSTAB24' op regel 24, kolom 'Numeriekewaarde', is te dicht op 0 waardoor een betrouwbare conversie tussen standaardafwijking en variatiecoëfficiënt niet mogelijk is.", "De waarde voor parameter 'KW_STERSTAB25' op regel 25, kolom 'Numeriekewaarde', moet een getal zijn groter dan 0.", @@ -1073,7 +1072,7 @@ ParameterId = StructureFilesKeywords.StabilityPointStructureParameterKeyword22, NumericalValue = 1, VarianceValue = 1, - VarianceType = VarianceType.CoefficientOfVariation // Expected Standard Deviation for normal distribution + VarianceType = VarianceType.CoefficientOfVariation // Type is irrelevant }, #region Remaining valid parameters irrelevant to test: Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs (.../StabilityStoneCoverCalculationConfigurationHelper.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs (.../StabilityStoneCoverCalculationConfigurationHelper.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -44,7 +44,7 @@ public static void AddCalculationsFromLocations( IEnumerable locations, IList calculations - ) + ) { if (locations == null) { Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs (.../StabilityStoneCoverMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs (.../StabilityStoneCoverMapDataFeaturesFactory.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -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/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs =================================================================== diff -u -r66f8f4622c8742bfb8fc0501cf44c3c58fd35522 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 66f8f4622c8742bfb8fc0501cf44c3c58fd35522) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -121,7 +121,7 @@ var ringId = assessmentSection.Id; var norm = assessmentSection.FailureMechanismContribution.Norm; - TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count()*2; + TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count() * 2; try { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs =================================================================== diff -u -r5387346fe4a7aa93e72d71f86c1e4d0a22a73f91 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs (.../StabilityStoneCoverContextTest.cs) (revision 5387346fe4a7aa93e72d71f86c1e4d0a22a73f91) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs (.../StabilityStoneCoverContextTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -116,7 +116,7 @@ public SimpleStabilityStoneCoverContext(IObservable wrappedData, StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) : - base(wrappedData, failureMechanism, assessmentSection) {} + base(wrappedData, failureMechanism, assessmentSection) {} } } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs =================================================================== diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -66,7 +66,7 @@ Assert.IsTrue(TypeUtils.HasTypeConverter( - r => r.AssessmentLayerThree)); + r => r.AssessmentLayerThree)); } [Test] Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -128,10 +128,10 @@ // Assert var waterLevels = calculation.InputParameters.WaterLevels.ToArray(); - var totalSteps = waterLevels.Length*2; + var totalSteps = waterLevels.Length * 2; for (var i = 0; i < totalSteps; i++) { - var text = string.Format("Stap {0} van {1} | Waterstand '{2}' berekenen.", i + 1, totalSteps, waterLevels[i%waterLevels.Length]); + var text = string.Format("Stap {0} van {1} | Waterstand '{2}' berekenen.", i + 1, totalSteps, waterLevels[i % waterLevels.Length]); Assert.AreEqual(text, progessTexts[i]); } } @@ -173,7 +173,7 @@ Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); int waterLevelIndex = 0; - for (int i = 0; i < testWaveConditionsInputs.Length/2; i++) + for (int i = 0; i < testWaveConditionsInputs.Length / 2; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -190,7 +190,7 @@ } waterLevelIndex = 0; - for (int i = testWaveConditionsInputs.Length/2; i < testWaveConditionsInputs.Length; i++) + for (int i = testWaveConditionsInputs.Length / 2; i < testWaveConditionsInputs.Length; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactory.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactory.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -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.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r96c1ccdc59027cef75d66c29a1724d0652576bd5 -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 96c1ccdc59027cef75d66c29a1724d0652576bd5) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -232,7 +232,7 @@ Assert.AreEqual(2, outputsFolder.Contents.Count); var failureMechanismResultsContext = (FailureMechanismSectionResultContext) - outputsFolder.Contents[0]; + outputsFolder.Contents[0]; Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs =================================================================== diff -u -racfa9d23d1770ca3171668552ddbe6d63fdd0dcd -r4faae1433690b9b06b40c18ff322140aa16df739 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision acfa9d23d1770ca3171668552ddbe6d63fdd0dcd) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) @@ -93,7 +93,7 @@ { // Call TestDelegate call = () => - WaveImpactAsphaltCoverDataSynchronizationService.ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations(null); + WaveImpactAsphaltCoverDataSynchronizationService.ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations(null); // Assert var exception = Assert.Throws(call);