Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs =================================================================== diff -u -r1050 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs (.../HydraulicShortcutEvaluator.cs) (revision 1050) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs (.../HydraulicShortcutEvaluator.cs) (revision 1116) @@ -225,7 +225,7 @@ /// private PLLines CreatePlLines() { - PLLinesCreator plLinesCreator = new PLLinesCreator + PlLinesCreator.PlLinesCreator plLinesCreator = new PlLinesCreator.PlLinesCreator { WaterLevelRiverHigh = GetBoezemLevel(), HeadInPLLine2 = location.HeadPl2, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r927 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 927) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1116) @@ -496,7 +496,7 @@ { // Create PL lines var location = new Location {DamType = DamType.Regional}; - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = soilProfile1; plLineCreator.SurfaceLine = surfaceLine1; plLineCreator.WaterLevelRiverHigh = 4.0; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs =================================================================== diff -u -r1007 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs (.../PLLinesCreator.cs) (revision 1007) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs (.../PlLinesCreator.cs) (revision 1116) @@ -34,39 +34,15 @@ namespace Deltares.DamEngine.Calculators.PlLinesCreator { - [Serializable] - public class PLLinesCreatorException : Exception - { - public PLLinesCreatorException() - { - } - - public PLLinesCreatorException(string message) - : base(message) - { - } - - public PLLinesCreatorException(string message, Exception inner) - : base(message, inner) - { - } - - protected PLLinesCreatorException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } - - /// - /// + /// Creator for Piezometric level lines /// - public class PLLinesCreator + public class PlLinesCreator { protected readonly Dictionary cachedSoilProfiles1D = new Dictionary(); private const double cUpliftFactorEquilibrium = 1.0; private const double cOffsetPhreaticLineBelowSurface = 0.01; - private ModelParametersForPLLines modelParametersForPLLines = new ModelParametersForPLLines(); + private ModelParametersForPlLines modelParametersForPLLines = new ModelParametersForPlLines(); public bool IsUseOvenDryUnitWeight { get; set; } public SoilProfileType SoilProfileType { get; set; } public SoilProfile1D SoilProfile { get; set; } @@ -207,7 +183,7 @@ /// /// Constructor /// - public PLLinesCreator() + public PlLinesCreator() { SoilProfileType = SoilProfileType.ProfileType1D; PlLineOffsetBelowDikeTopAtRiver = 0.5; // Default value @@ -250,7 +226,7 @@ } } - public ModelParametersForPLLines ModelParametersForPLLines + public ModelParametersForPlLines ModelParametersForPLLines { get { return modelParametersForPLLines; } set { modelParametersForPLLines = value; } @@ -272,7 +248,7 @@ ((SoilProfileType == SoilProfileType.ProfileType2D) && (SoilProfile2D == null || DikeEmbankmentMaterial == null)); if (hasNoGeometry1DData && hasNoGeometry2DData) { - throw new PLLinesCreatorException("PLLinesCreator contains not enough soil geometry information (SoilProfile1D, FullStiFileName, dikeEmbankmentMaterial or soilBase)"); + throw new PlLinesCreatorException("PLLinesCreator contains not enough soil geometry information (SoilProfile1D, FullStiFileName, dikeEmbankmentMaterial or soilBase)"); } } @@ -286,7 +262,7 @@ if (penetrationLength < 0.0) { - throw new PLLinesCreatorException("Negative penetration length."); + throw new PlLinesCreatorException("Negative penetration length."); } if ((penetrationLength.AlmostEquals(0.0)) || (headInPLLine2 == null)) { @@ -320,12 +296,12 @@ /// Length of the penetration. /// The head in pl line2. /// - /// Head PL2 not defined + /// Head PL2 not defined private PLLine CreatePlLine2ByExpertKnowledgeFor2DGeometry(double penetrationLength, double? headInPLLine2) { if (headInPLLine2 == null) { - throw new PLLinesCreatorException("Head PL2 not defined"); + throw new PlLinesCreatorException("Head PL2 not defined"); } PLLine plLine = new PLLine(); plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.First().X, headInPLLine2.Value)); @@ -343,15 +319,15 @@ { if (headInPLLine2 == null) { - throw new PLLinesCreatorException("Head PL2 not defined"); + throw new PlLinesCreatorException("Head PL2 not defined"); } PLLine plLine = new PLLine(); if (SoilProfile != null) { IList aquiferLayers = this.SoilProfile.GetAquiferLayers(); if (aquiferLayers.Count == 0) { - throw new PLLinesCreatorException("Soil profile contains no aquifer layers."); + throw new PlLinesCreatorException("Soil profile contains no aquifer layers."); } if (penetrationLength > 0 && aquiferLayers.Count > 0) @@ -399,7 +375,7 @@ { if (this.surfaceLine.Geometry.Count < 1) { - throw new PLLinesCreatorException("Surface line contains no points."); + throw new PlLinesCreatorException("Surface line contains no points."); } } @@ -410,7 +386,7 @@ { if (this.surfaceLine == null) { - throw new PLLinesCreatorException("PLLinesCreator contains no surface line."); + throw new PlLinesCreatorException("PLLinesCreator contains no surface line."); } } @@ -449,11 +425,11 @@ SoilProfile1D actualSoilProfile = GetSoilProfileBelowPoint(this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X + offset); if (this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver) == null) { - throw new PLLinesCreatorException("Characteristic point \"dike toe at river\" is not defined."); + throw new PlLinesCreatorException("Characteristic point \"dike toe at river\" is not defined."); } if (dampingFactor < 0.0) { - throw new PLLinesCreatorException("Damping factor < 0.0"); + throw new PlLinesCreatorException("Damping factor < 0.0"); } var relevantAquiferLayer = GetRelevantAquiferLayer(plLineType, actualSoilProfile); @@ -531,7 +507,7 @@ if (aquiferLayers.Count == 0) { string message = "Soil profile (" + actualSoilProfile.Name + ") contains no aquifer layers at all."; - throw new PLLinesCreatorException(message); + throw new PlLinesCreatorException(message); } SoilLayer1D relevantAquiferLayer; switch (type) @@ -543,14 +519,14 @@ relevantAquiferLayer = actualSoilProfile.InBetweenAquiferLayer; // Intermediate sand layer break; default: - throw new PLLinesCreatorException(String.Format("Invalid PL line type:{0} for creation of PL Line 3 or 4", type)); + throw new PlLinesCreatorException(String.Format("Invalid PL line type:{0} for creation of PL Line 3 or 4", type)); } // Note : DAM already handles a missing (null) InBetweenAquiferLayer itself so do not throw for that. if (relevantAquiferLayer == null && type == PLLineType.PL3) { string message = "Soil profile (" + actualSoilProfile.Name + ") contains no relevant aquifer layer."; - throw new PLLinesCreatorException(message); + throw new PlLinesCreatorException(message); } return relevantAquiferLayer; } @@ -755,7 +731,7 @@ int indexOfFixedPlPoint = FindIndexOfPointInPLLineWithXCoordinate(plLine, this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X); if (indexOfFixedPlPoint < 0) { - throw new PLLinesCreatorException("Could not find fixed point for PLLine"); + throw new PlLinesCreatorException("Could not find fixed point for PLLine"); } // Adjust PL3/4 for all surface points from toe of dike to end of profile to, so no uplift will occur in that surface point @@ -1394,7 +1370,7 @@ if (!plLines.Lines[PLLineType.PL1].IsXAscending()) { - throw new PLLinesCreatorException("PLLine 1 not an X-ascending polyline"); + throw new PlLinesCreatorException("PLLine 1 not an X-ascending polyline"); } return plLines; @@ -1470,7 +1446,7 @@ localX = gauge.LocalX; else { - throw new PLLinesCreatorException(String.Format("Gauge PL line {0} refers to an unknown gauge named '{1}' at X coordinate #{2}.", + throw new PlLinesCreatorException(String.Format("Gauge PL line {0} refers to an unknown gauge named '{1}' at X coordinate #{2}.", gaugePLLine.PLLineType.ToString(), gaugePLLinePoint.GaugeIDX, pointIndex)); } } @@ -1480,22 +1456,22 @@ if (gauge != null) { if ((!gauge.Value.HasValue) || (gauge.Value == GaugeMissVal)) - throw new PLLinesCreatorException(String.Format("Value of gauge {0} at location {1} in gauge PL line of type {2} is undefined.", + throw new PlLinesCreatorException(String.Format("Value of gauge {0} at location {1} in gauge PL line of type {2} is undefined.", gauge.Name, location.Name, gaugePLLine.PLLineType.ToString())); localZ = gauge.Value; } else { - throw new PLLinesCreatorException(String.Format("Gauge PL line {0} refers to an unknown gauge named '{1}' at Z coordinate #{2}.", + throw new PlLinesCreatorException(String.Format("Gauge PL line {0} refers to an unknown gauge named '{1}' at Z coordinate #{2}.", gaugePLLine.PLLineType.ToString(), gaugePLLinePoint.GaugeIDZ, pointIndex)); } } } if (!localX.HasValue) - throw new PLLinesCreatorException(String.Format("Gauge PL line {0}'s X coordinate #{1} is undefined.", gaugePLLine.PLLineType.ToString(), pointIndex)); + throw new PlLinesCreatorException(String.Format("Gauge PL line {0}'s X coordinate #{1} is undefined.", gaugePLLine.PLLineType.ToString(), pointIndex)); else if (!localZ.HasValue) - throw new PLLinesCreatorException(String.Format("Gauge PL line {0}'s value #{1} is undefined.", gaugePLLine.PLLineType.ToString(), pointIndex)); + throw new PlLinesCreatorException(String.Format("Gauge PL line {0}'s value #{1} is undefined.", gaugePLLine.PLLineType.ToString(), pointIndex)); else { if (!leftMostXAtRiverLevel.HasValue || localX > leftMostXAtRiverLevel) @@ -1550,17 +1526,17 @@ { if (!SurfaceLine.HasAnnotation(CharacteristicPointType.DikeTopAtRiver)) { - throw new PLLinesCreatorException("Required characteristic point DikeTopAtRiver not found. "); + throw new PlLinesCreatorException("Required characteristic point DikeTopAtRiver not found. "); } if (!SurfaceLine.HasAnnotation(CharacteristicPointType.DikeTopAtPolder)) { - throw new PLLinesCreatorException("Required characteristic point DikeTopAtPolder not found. "); + throw new PlLinesCreatorException("Required characteristic point DikeTopAtPolder not found. "); } if (!SurfaceLine.HasAnnotation(CharacteristicPointType.DikeToeAtPolder)) { - throw new PLLinesCreatorException("Required characteristic point DikeToeAtPolder not found. "); + throw new PlLinesCreatorException("Required characteristic point DikeToeAtPolder not found. "); } } @@ -1865,7 +1841,7 @@ } } else - throw new PLLinesCreatorException("DitchPolderSide should be part of a line segment"); + throw new PlLinesCreatorException("DitchPolderSide should be part of a line segment"); } } @@ -1898,7 +1874,7 @@ } else - throw new PLLinesCreatorException("Could not create DikeSementPolderLevel"); + throw new PlLinesCreatorException("Could not create DikeSementPolderLevel"); } /// @@ -2040,7 +2016,7 @@ if (foundIntersect == false) StopIteration = true; if (iterationCount > cMaxIterations) - throw new PLLinesCreatorException("PLLinesCreator.ValidatePhreaticBelowDike() cannot succeed"); + throw new PlLinesCreatorException("PLLinesCreator.ValidatePhreaticBelowDike() cannot succeed"); } } @@ -2073,7 +2049,7 @@ intersectionPhreaticDike = DetermineIntersectionBetweenWaterLevelAndDike(waterLevel.Value); if (intersectionPhreaticDike == null) { - throw new PLLinesCreatorException("DetermineIntersectionBetweenWaterLevelAndDike failed"); + throw new PlLinesCreatorException("DetermineIntersectionBetweenWaterLevelAndDike failed"); } //Add intersectioncoordinate to phreatic line list if not already in list. @@ -2113,12 +2089,12 @@ { if (SurfaceLine == null) { - throw new PLLinesCreatorException("Surfaceline should be initialized"); + throw new PlLinesCreatorException("Surfaceline should be initialized"); } if (SurfaceLine.Geometry.Points.Count < 2) { - throw new PLLinesCreatorException("More surfaceline points are required"); + throw new PlLinesCreatorException("More surfaceline points are required"); } } /// @@ -2145,7 +2121,7 @@ var dikeTopAtRiverHeight = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z; if (waterLevelRiver > dikeTopAtRiverHeight) { - throw new PLLinesCreatorException(String.Format("Phreatic water level should have an intersection with the dike at least once (phreatic line higher ({0:F2} m) than surface line ({1:F2}))", waterLevelRiver, dikeTopAtRiverHeight)); + throw new PlLinesCreatorException(String.Format("Phreatic water level should have an intersection with the dike at least once (phreatic line higher ({0:F2} m) than surface line ({1:F2}))", waterLevelRiver, dikeTopAtRiverHeight)); } } @@ -2156,7 +2132,7 @@ { if (waterLevelPolder > surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z) { - throw new PLLinesCreatorException(String.Format("Waterlevel ({0:0.00}) in polder higher than dike top at polder ({1:0.00}) in surfaceline {2}", waterLevelPolder, SurfaceLine.GetDikeToeInward().Z, SurfaceLine.Name)); + throw new PlLinesCreatorException(String.Format("Waterlevel ({0:0.00}) in polder higher than dike top at polder ({1:0.00}) in surfaceline {2}", waterLevelPolder, SurfaceLine.GetDikeToeInward().Z, SurfaceLine.Name)); } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r1082 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1116) @@ -60,6 +60,7 @@ + @@ -135,7 +136,7 @@ True Resources.resx - + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r1011 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 1011) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 1116) @@ -14,7 +14,7 @@ { private static PLLines CreatePLLines(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, double riverLevel, bool isUseOvenDryUnitWeight) { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.IsUseOvenDryUnitWeight = isUseOvenDryUnitWeight; plLineCreator.SoilProfile = soilProfile; plLineCreator.SurfaceLine = surfaceLine; @@ -44,7 +44,7 @@ var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var upliftLocationDeterminator = new UpliftLocationDeterminator(); upliftLocationDeterminator.SurfaceLine = surfaceLineTutorial1; - upliftLocationDeterminator.PLLines = FactoryForPLLines.CreatePLLinesForUpliftLocationDeterminatorTests(); + upliftLocationDeterminator.PLLines = FactoryForPlLines.CreatePLLinesForUpliftLocationDeterminatorTests(); UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); } @@ -65,7 +65,7 @@ { var upliftLocationDeterminator = new UpliftLocationDeterminator(); upliftLocationDeterminator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); - upliftLocationDeterminator.PLLines = FactoryForPLLines.CreatePLLinesForUpliftLocationDeterminatorTests(); + upliftLocationDeterminator.PLLines = FactoryForPlLines.CreatePLLinesForUpliftLocationDeterminatorTests(); UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); } @@ -75,7 +75,7 @@ var surfaceLineForPipingBligh = FactoryForSurfaceLines.CreateSurfaceLineForPipingBligh(); var upliftLocationDeterminator = new UpliftLocationDeterminator(); upliftLocationDeterminator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfileForPipingBligh(); - upliftLocationDeterminator.PLLines = FactoryForPLLines.CreatePLLinesForUpliftLocationDeterminatorTests(); + upliftLocationDeterminator.PLLines = FactoryForPlLines.CreatePLLinesForUpliftLocationDeterminatorTests(); upliftLocationDeterminator.SurfaceLine = surfaceLineForPipingBligh; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r929 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 929) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1116) @@ -51,7 +51,7 @@ private double boezemLevelLbp = BoezemLevelNotSetValue; private double boezemLevelTp = BoezemLevelNotSetValue; - private ModelParametersForPLLines modelParametersForPLLines = new ModelParametersForPLLines(); + private ModelParametersForPlLines modelParametersForPLLines = new ModelParametersForPlLines(); private DamType damType = DamType.Primary; private string description = ""; private double detrimentFactor = 0.95; @@ -1885,7 +1885,7 @@ } } - public ModelParametersForPLLines ModelParametersForPLLines + public ModelParametersForPlLines ModelParametersForPLLines { get { Fisheye: Tag 1116 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs =================================================================== diff -u -r1050 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs (.../UpliftEvaluator.cs) (revision 1050) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs (.../UpliftEvaluator.cs) (revision 1116) @@ -80,7 +80,7 @@ /// private PLLines CreatePlLines() { - var plLinesCreator = new PLLinesCreator(); + var plLinesCreator = new PlLinesCreator.PlLinesCreator(); double waterLevel = GetBoezemLevel(); plLinesCreator.WaterLevelRiverHigh = waterLevel; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs =================================================================== diff -u -r1082 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1116) @@ -42,7 +42,7 @@ public static PLLines CreatePlLinesForStability(Location location, SoilGeometryProbability subSoilScenario, double waterLevel, string soilGeometry2DName, double? waterLevelRiverLow, out UpliftSituation upliftSituation) { - var plLinesCreator = new PLLinesCreator + var plLinesCreator = new PlLinesCreator.PlLinesCreator { WaterLevelRiverLow = waterLevelRiverLow, IsUseLowWaterLevel = (waterLevelRiverLow != null), @@ -89,7 +89,7 @@ /// public static PLLines CreatePlLinesForPiping(Location location, SoilProfile1D soilProfile, double waterLevel, out UpliftSituation upliftSituation) { - var plLinesCreator = new PLLinesCreator + var plLinesCreator = new PlLinesCreator.PlLinesCreator { WaterLevelRiverHigh = waterLevel, SurfaceLine = location.SurfaceLine, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreatorException.cs =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreatorException.cs (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreatorException.cs (revision 1116) @@ -0,0 +1,34 @@ +using System; +using System.Runtime.Serialization; + +namespace Deltares.DamEngine.Calculators.PlLinesCreator +{ + /// + /// Exception class for Creator for Piezometric level lines + /// + /// + [Serializable] + public class PlLinesCreatorException : Exception + { + public PlLinesCreatorException() + { + } + + public PlLinesCreatorException(string message) + : base(message) + { + } + + public PlLinesCreatorException(string message, Exception inner) + : base(message, inner) + { + } + + protected PlLinesCreatorException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + +} Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs =================================================================== diff -u -r1011 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1011) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1116) @@ -3,7 +3,7 @@ namespace Deltares.DamEngine.TestHelpers.Factories { - public class FactoryForPLLines + public class FactoryForPlLines { /// /// Create simple PLline Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs =================================================================== diff -u -r877 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs (.../ModelParameters.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs (.../ModelParameters.cs) (revision 1116) @@ -30,14 +30,14 @@ public double LevelReductionInside { get; set; } // not used yet; to be moved to location public double LevelReductionOutside { get; set; } // not used yet; to be moved to location public string MapForSoilGeometries2D { get; set; } // ??? - public ModelParametersForPLLines ModelParametersForPLLines { get; set; } // to be moved to location + public ModelParametersForPlLines ModelParametersForPLLines { get; set; } // to be moved to location public ModelFactors ModelFactors { get; set; } // to be moved to location public DistributionType LayerHeightDistribution { get; set; } // to be moved to location public double LayerHeightDeviation { get; set; } // to be moved to location public ModelParameters() { - ModelParametersForPLLines = new ModelParametersForPLLines(); + ModelParametersForPLLines = new ModelParametersForPlLines(); ModelFactors = new ModelFactors { // Default values for ModelFactors in ModelParameters @@ -65,7 +65,7 @@ } } - public class ModelParametersForPLLines + public class ModelParametersForPlLines { public virtual double PenetrationLength { get; set; } public virtual double DampingFactorPL3 { get; set; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r1115 -r1116 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1115) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1116) @@ -55,7 +55,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -105,7 +105,7 @@ const double cTolerance = 0.0001; var surfacelineDikeWithSlopingShoulder = FactoryForSurfaceLines.CreateSurfacelineDikeWithSlopingShoulder(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -145,7 +145,7 @@ const double cTolerance = 0.0001; var surfacelineDikeWithSlopingShoulder = FactoryForSurfaceLines.CreateSurfacelineDikeWithSlopingShoulder(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.5; @@ -210,12 +210,12 @@ /// Test if exception thrown if PolderLevel above top of dike /// [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void ThrowsWhenPolderLevelHigherDikeTopAtPolder() { var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -238,7 +238,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -270,7 +270,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -307,7 +307,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -343,7 +343,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -386,7 +386,7 @@ } }; { - PLLinesCreator plLineCreator = new PLLinesCreator{SurfaceLine = surfaceLine}; + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator{SurfaceLine = surfaceLine}; Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -437,7 +437,7 @@ CharacteristicPoints = { GeometryMustContainPoint = true } }; { - PLLinesCreator plLineCreator = new PLLinesCreator { SurfaceLine = surfaceLine }; + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator { SurfaceLine = surfaceLine }; Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -486,7 +486,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -523,7 +523,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; @@ -559,7 +559,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - var plLineCreator = new PLLinesCreator + var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator { SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), WaterLevelRiverHigh = 2.5, @@ -601,7 +601,7 @@ } }; { - var plLineCreator = new PLLinesCreator + var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator { SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), @@ -654,7 +654,7 @@ } }; { - var plLineCreator = new PLLinesCreator + var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator { SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), @@ -713,7 +713,7 @@ } }; { - var plLineCreator = new PLLinesCreator + var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator { SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), @@ -773,7 +773,7 @@ } }; { - var plLineCreator = new PLLinesCreator + var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator { SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), @@ -823,7 +823,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -860,7 +860,7 @@ const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; @@ -902,7 +902,7 @@ /// Test if exception is thrown when creating PL2 with no soilprofile /// [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePL2WithExpertKnowledgeRRDThrowsExceptionIfNoSoilProfile() { var surfaceLine = new SurfaceLine2 @@ -914,7 +914,7 @@ } }; { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SurfaceLine = surfaceLine; plLineCreator.ModelParametersForPLLines.PenetrationLength = 6.0; plLineCreator.HeadInPLLine2 = 4.0; @@ -926,10 +926,10 @@ /// Test if exception is thrown when creating PL2 with no surface line /// [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePL2WithExpertKnowledgeRRDThrowsExceptionIfNoSurfaceLine() { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.SurfaceLine = null; plLineCreator.ModelParametersForPLLines.PenetrationLength = 6.0; @@ -941,7 +941,7 @@ /// Test if exception is thrown when creating PL2 if no aquifer present /// [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePL2For1DGeometryWithExpertKnowledgeRRDThrowsExceptionIfNoAquiferLayerAtAll() { var surfaceLine = new SurfaceLine2 @@ -953,7 +953,7 @@ } }; { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.SurfaceLine = surfaceLine; plLineCreator.ModelParametersForPLLines.PenetrationLength = 6.0; @@ -979,7 +979,7 @@ } }; { - PLLinesCreator plLineCreator = new PLLinesCreator{SurfaceLine = surfaceLine}; + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator{SurfaceLine = surfaceLine}; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(1.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); @@ -993,12 +993,12 @@ } [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePL2WithExpertKnowledgeRRDThrowsExceptionIfPenetrationLengthNegative() { const double cHeadPL2 = 3.0; const double cPenetrationLength = -1.0; - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPLLine2 = cHeadPL2; @@ -1022,7 +1022,7 @@ } }; { - PLLinesCreator plLineCreator = new PLLinesCreator{SurfaceLine = surfaceLine}; + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator{SurfaceLine = surfaceLine}; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(1.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); @@ -1055,7 +1055,7 @@ } }; { - PLLinesCreator plLineCreator = new PLLinesCreator{SurfaceLine = surfaceLine}; + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator{SurfaceLine = surfaceLine}; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(1.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); @@ -1078,7 +1078,7 @@ const double cHeadPL2 = 3.0; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.HeadInPLLine2 = cHeadPL2; plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1102,7 +1102,7 @@ const double cHeadInPLLine2 = 3.0; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.HeadInPLLine2 = cHeadInPLLine2; plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1157,7 +1157,7 @@ }; surfaceLine.Geometry.SyncCalcPoints(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); int orgLayerCount = plLineCreator.SoilProfile.Layers.Count; @@ -1299,13 +1299,13 @@ //} [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePL3For1DGeometryWithExpertKnowledgeRRDThrowsExceptionIfNoAquiferLayers() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1322,7 +1322,7 @@ const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1390,7 +1390,7 @@ const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1455,7 +1455,7 @@ const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1496,7 +1496,7 @@ const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); // Lower profile for 5 m so upper layer is no longer completely above surface for (var i = 0; i < plLineCreator.SoilProfile.Layers.Count; ++i) @@ -1545,7 +1545,7 @@ const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); // Lower profile for 5m so upper layer is no longer completely above surface plLineCreator.SoilProfile.BottomLevel -= 5.0; @@ -1592,7 +1592,7 @@ const double cDampingFactor = 0.4; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1629,13 +1629,13 @@ } [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePL4For1DGeometryWithExpertKnowledgeRRDThrowsExceptionIfNoAquifers() { const double cDampingFactor = 0.4; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; @@ -1647,7 +1647,7 @@ } [Test] - [ExpectedException(typeof(PLLinesCreatorException))] + [ExpectedException(typeof(PlLinesCreatorException))] public void CreatePLLinesFromGaugesWithNonExistentGauge() { var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1656,7 +1656,7 @@ Name = "Location1" }; { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SurfaceLine = surfaceLineTutorial1; var locations = new List @@ -1695,7 +1695,7 @@ Name = "Location1" }; { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; @@ -1756,7 +1756,7 @@ Name = "Location1" }; { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; plLineCreator.SurfaceLine = surfaceLineTutorial1; @@ -1818,7 +1818,7 @@ Name = "Location1" }; { - PLLinesCreator plLineCreator = new PLLinesCreator(); + Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; plLineCreator.SurfaceLine = surfaceLineTutorial1;