Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs =================================================================== diff -u -r3852 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 3852) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 3854) @@ -96,7 +96,7 @@ break; } } - return (foundUpliftFactor == true) ? upliftLocationAndResult : null; + return foundUpliftFactor ? upliftLocationAndResult : null; } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Routines2D.cs =================================================================== diff -u -r3850 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Routines2D.cs (.../Routines2D.cs) (revision 3850) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Routines2D.cs (.../Routines2D.cs) (revision 3854) @@ -429,7 +429,7 @@ /// /// Determines angle between 2 lines. - /// Clockwise Input: point1, commonpoint, point2, commonpoint, normalvect(ex <0,0,-1>), validate + /// Clockwise Input: point1, commonpoint, point2, commonpoint, normalvect(ex [0,0,-1]), validate /// /// /// @@ -619,8 +619,8 @@ if (result == LineIntersection.Intersects) { //check if lies on the line and is not somewhere outside ! - if ((DoesPointExistInLine(point1X, point1Z, point2X, point2Z, intersectionPoint.X, intersectionPoint.Z, tolerance) && - DoesPointExistInLine(point3X, point3Z, point4X, point4Z, intersectionPoint.X, intersectionPoint.Z, tolerance)) == false) + if (!(DoesPointExistInLine(point1X, point1Z, point2X, point2Z, intersectionPoint.X, intersectionPoint.Z, tolerance) && + DoesPointExistInLine(point3X, point3Z, point4X, point4Z, intersectionPoint.X, intersectionPoint.Z, tolerance))) { intersectionPoint = null; result = LineIntersection.NoIntersection; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Standard/ObjectCopier.cs =================================================================== diff -u -r3853 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Standard/ObjectCopier.cs (.../ObjectCopier.cs) (revision 3853) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Standard/ObjectCopier.cs (.../ObjectCopier.cs) (revision 3854) @@ -93,7 +93,7 @@ if (typeToReflect.IsArray) { var arrayType = typeToReflect.GetElementType(); - if (IsPrimitive(arrayType) == false) + if (!IsPrimitive(arrayType)) { var clonedArray = (Array)cloneObject; clonedArray.ForEach((array, indices) => array.SetValue(InternalCopy(clonedArray.GetValue(indices), visited), indices)); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r3849 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 3849) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 3854) @@ -1554,7 +1554,7 @@ // Enter failsave to raise exception when this occurs int cMaxIterations = Math.Max(100, phreaticLine.Points.Count * SurfaceLine.Geometry.Points.Count); int iterationCount = 0; - while (stopIteration == false) + while (!stopIteration) { iterationCount++; bool foundIntersect = false; @@ -1626,7 +1626,7 @@ } } } - if (foundIntersect == false) + if (!foundIntersect) stopIteration = true; if (iterationCount > cMaxIterations) throw new PlLinesCreatorException("PlLinesCreator.ValidatePhreaticBelowDike() cannot succeed"); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs =================================================================== diff -u -r3522 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs (.../GeometryGenerator.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs (.../GeometryGenerator.cs) (revision 3854) @@ -84,7 +84,7 @@ if (result < 0) { - if (firstRegeneration == false) + if (!firstRegeneration) { break; } @@ -149,7 +149,7 @@ /// private int FindCurveIndex(GeometryLoop aGeometryLoop, GeometryCurve aCurve, CurveDirection aDirection) { - if (aGeometryLoop.CurveList.Contains(aCurve) == false) + if (!aGeometryLoop.CurveList.Contains(aCurve)) { return -1; } @@ -373,12 +373,12 @@ SetIsUsed(currentCurve, currentCurveDirection, true); // add the current curve to new loop - if (AddCurve(currentCurve, currentCurveDirection, newLoop) == false) + if (!AddCurve(currentCurve, currentCurveDirection, newLoop)) { // the curve wasn't added bcos the curve-direction pair was already present in loop. // problem case - break here, else we'd get aValue1 hang! // Todo: Solve this problem - if (aFirstRegeneration == false) + if (!aFirstRegeneration) { //TODO:Show error message box break; @@ -417,7 +417,7 @@ { CurveDirection oppCurrentDirection = currentCurveDirection == CurveDirection.Forward ? CurveDirection.Reverse : CurveDirection.Forward; // if the current curve is not used in the opposite direction, it is considered in the opposite direction - if (GetIsUsed(currentCurve, oppCurrentDirection) == false) + if (!GetIsUsed(currentCurve, oppCurrentDirection)) { currentCurveDirection = oppCurrentDirection; continue; @@ -605,7 +605,7 @@ } } - if (foundOppDirection == false) + if (!foundOppDirection) { return false; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs =================================================================== diff -u -r3522 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs (.../GeometryData.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs (.../GeometryData.cs) (revision 3854) @@ -559,7 +559,7 @@ if (CheckIfIntersectStricktly(beginPoint1, endPoint1, beginPoint2, endPoint2, ref referencePoint)) { - if (referencePoint.Z > aZCoord && intersections.Contains(referencePoint.Z) == false) + if (referencePoint.Z > aZCoord && !intersections.Contains(referencePoint.Z)) { intersections.Add(referencePoint.Z); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/LayerDetector.cs =================================================================== diff -u -r3849 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/LayerDetector.cs (.../LayerDetector.cs) (revision 3849) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/LayerDetector.cs (.../LayerDetector.cs) (revision 3854) @@ -116,7 +116,7 @@ { foreach (var surface in soilSurfaces) { - if (intersectionSurfacesList.Contains(surface) == false) + if (!intersectionSurfacesList.Contains(surface)) { if (surface.GeometrySurface.OuterLoop.CurveList.Count == 0) { @@ -198,7 +198,7 @@ (LayerIntersectionPoint) point1).IntersectionPoint.X)) && (pointList[index].IntersectionPoint.Z.IsNearEqual(( (LayerIntersectionPoint) point1).IntersectionPoint.Z))); - if (notSameCondition == false) + if (!notSameCondition) { object point2 = pointList[index]; FindLayer((LayerIntersectionPoint) point1, (LayerIntersectionPoint) point2); @@ -258,7 +258,7 @@ isPresentInInnerLoop = true; } } - if (isPresentInInnerLoop == false) + if (!isPresentInInnerLoop) { var layerCurve = new Layer(startPoint, endPoint, soil) { @@ -295,7 +295,7 @@ break; } } - if (isAdded == false) + if (!isAdded) { layerList.Add(aLayer); } @@ -305,7 +305,7 @@ // Adds the LayerIntersectionPoints (ignores duplicates when found within same surface) private void AddPointToList(LayerIntersectionPoint aPoint) { - if (intersectionSurfacesList.Contains(aPoint.SurfaceRefKey) == false) + if (!intersectionSurfacesList.Contains(aPoint.SurfaceRefKey)) { intersectionSurfacesList.Add(aPoint.SurfaceRefKey); } @@ -324,7 +324,7 @@ break; } } - if (isPointFound == false) // to be added in the sorted order Z greater at the top + if (!isPointFound) // to be added in the sorted order Z greater at the top { bool isAdded = false; for (int index = 0; index < count; index++) @@ -337,7 +337,7 @@ } } - if (isAdded == false) + if (!isAdded) { pointList.Add(aPoint); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometrySurface.cs =================================================================== diff -u -r3522 -r3854 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometrySurface.cs (.../GeometrySurface.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometrySurface.cs (.../GeometrySurface.cs) (revision 3854) @@ -81,7 +81,7 @@ /// public void AddInnerLoop(GeometryLoop aLoop) { - if (InnerLoops.Contains(aLoop) == false) + if (!InnerLoops.Contains(aLoop)) { InnerLoops.Add(aLoop); }