Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs (.../SurfaceLine2Validator.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs (.../SurfaceLine2Validator.cs) (revision 4000) @@ -42,8 +42,8 @@ public IEnumerable Validate(SurfaceLine2 surfaceline) { return ValidateGeometryPointsAreOrdered(surfaceline) - .Concat(ValidateCharacteristicPointsAreOrdered(surfaceline)) - .Concat(ValidateDikeShape(surfaceline)); + .Concat(ValidateCharacteristicPointsAreOrdered(surfaceline)) + .Concat(ValidateDikeShape(surfaceline)); } /// @@ -83,25 +83,11 @@ /// public static bool AreAllCharacteristicPointsXCoordinatesAscending(SurfaceLine2 line) { - var points = line.GetCharacteristicPointsRequiringAscendingX().ToArray(); + CharacteristicPoint[] points = line.GetCharacteristicPointsRequiringAscendingX().ToArray(); return AreGeometryPointsXCoordinatesAscending(points); } /// - /// Checks if the shape of the dike is proper. - /// - /// The surfaceline being evaluated. - /// The collection of validation results. - private IEnumerable ValidateDikeShape(SurfaceLine2 surfaceline) - { - if (!AreAllCharacteristicPointsInCorrectShape(surfaceline)) - { - yield return new ValidationResult(ValidationResultType.Error, - this.Translate("ImproperDikeShape"), surfaceline); - } - } - - /// /// Determines whether all characteristic points are in correct shape. /// /// true if all characteristic are in correct shape, otherwise false @@ -123,14 +109,28 @@ return result; } + /// + /// Checks if the shape of the dike is proper. + /// + /// The surfaceline being evaluated. + /// The collection of validation results. + private IEnumerable ValidateDikeShape(SurfaceLine2 surfaceline) + { + if (!AreAllCharacteristicPointsInCorrectShape(surfaceline)) + { + yield return new ValidationResult(ValidationResultType.Error, + this.Translate("ImproperDikeShape"), surfaceline); + } + } + private bool ArePointsAscending(SurfaceLine2 line) { return AreGeometryPointsXCoordinatesAscending(line.Geometry.Points); } private static bool AreGeometryPointsXCoordinatesAscending(IList points) { - for (int i = 1; i < points.Count; i++) + for (var i = 1; i < points.Count; i++) { if (points[i].X < points[i - 1].X + GeometryConstants.Accuracy) { @@ -148,10 +148,11 @@ } else { - return false; - } + return false; + } } } + return true; } }