Fisheye: Tag 2508 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DesignPointCalculation.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2508)
@@ -82,24 +82,6 @@
public const string HeadPl4AttributeId = CsvColumnNames.HeadPl4ColumnName;
///
- /// grass_quality
- /// CustomShape
- /// GrassQuality.shp
- /// GrassQlty
- /// double
- ///
- public const string GrassQualityAttributeId = CsvColumnNames.GrassQualityColumnName;
-
- ///
- /// direction
- /// CustomShape
- /// Direction.shp
- /// Direction
- /// double
- ///
- public const string DirectionAttributeId = CsvColumnNames.DirectionColumnName;
-
- ///
/// x_soilgeometry2D_origin
/// CustomShape
/// XSoilGeometry2DOrigin.shp
@@ -144,11 +126,6 @@
public const string DampingFactorPl4AttributeId = CsvColumnNames.DampingFactorPl4ColumnName;
///
- /// use_original_plline_assignments CustomShape use_original_plline_assignments.shp IsOrgPLs bool
- ///
- public const string UseOriginalPlLineAssignmentsAttributeId = CsvColumnNames.UseOriginalPlLineAssignmentsColumnName;
-
- ///
/// PenetrationLength
/// CustomShape
/// PenetrationLength.shp
@@ -174,7 +151,7 @@
/// TL_DegOfCo
/// double
///
- public const string TL_DegreeOfConsolidationAttributeId = CsvColumnNames.TL_DegreeOfConsolidationColumnName;
+ public const string TL_DegreeOfConsolidationAttributeId = CsvColumnNames.TlDegreeOfConsolidationColumnName;
///
@@ -303,45 +280,8 @@
/// double
///
public const string MinimalCircleDepthAtrributeId = CsvColumnNames.MinimalCircleDepthColumnName;
-
+
///
- /// level_reduction_inside
- /// CustomShape
- /// level_reduction_inside.shp
- /// lvlrinside
- /// double
- ///
- public const string LevelReductionInsideAttributeId = CsvColumnNames.LevelReductionInsideColumnName;
-
- ///
- /// level_reduction_outside
- /// CustomShape
- /// level_reduction_outside.shp
- /// lvlroutside
- /// double
- ///
- public const string LevelReductionOutsideAttributeId = CsvColumnNames.LevelReductionOutsideColumnName;
-
- ///
- /// layer_height_distribution
- /// CustomShape
- /// layer_height_distribution.shp
- /// layerhdist
- /// double
- ///
- public const string LayerHeightDistributionAttributeId = CsvColumnNames.LayerHeightDistributionColumnName;
-
- ///
- /// layer_height_deviation
- /// CustomShape
- /// layer_height_deviation.shp
- /// layerhdev
- /// double
- ///
- public const string LayerHeightDeviationAttributeId = CsvColumnNames.LayerHeightDeviationColumnName;
-
-
- ///
/// safety_factor_piping
/// CustomShape
/// safety_factor_piping.shp
@@ -683,16 +623,10 @@
createItem(DampingFactorPl3AttributeId, "DampingFactoPL3.shp", "DampingPL3", (t, value) => t.DampingFactorPL3 = value.ToType() ),
createItem(DampingFactorPl4AttributeId, "DampingFactoPL4.shp", "DampingPL4", (t, value) => t.DampingFactorPL4 = value.ToType() ),
createItem(DikeEmbankmentMaterialAttributeId, "Dikematerial.shp", "DikeMtrl", (t, value) => t.DikeEmbankmentMaterial = value.ToType() ),
- createItem(DirectionAttributeId, "Direction.shp", "Direction", (t, value) => t.Direction = value.ToType()),
createItem(DistanceToEntryPointAttributeId, "distance_to_entry_point.shp", "dist_entry", (t, value) => t.DistanceToEntryPoint = value.ToType()),
- createItem(GrassQualityAttributeId, "GrassQuality.shp", "GrassQlty", (t, value) => t.GrassQuality = value.ToType()),
createItem(HeadPl2AttributeId, "HeadPL2.shp", "HeadPL2", (t, value) => t.HeadPL2 = value.ToType() ),
createItem(HeadPl3AttributeId, "HeadPL3.shp", "HeadPL3", (t, value) => t.HeadPl3 = value.ToType() ),
createItem(HeadPl4AttributeId, "HeadPL4.shp", "HeadPL4", (t, value) => t.HeadPl4 = value.ToType() ),
- createItem(LayerHeightDistributionAttributeId, "layer_height_distribution.shp", "layerhdist", (t, value) => t.LayerHeightDistribution = LocationImportHelper.ToDistribution(value)),
- createItem(LayerHeightDeviationAttributeId, "layer_height_deviation.shp", "layerhdev", (t, value) => t.LayerHeightDeviation = value.ToType()),
- createItem(LevelReductionInsideAttributeId, "level_reduction_inside.shp", "lvlrinside", (t, value) => t.LevelReductionInside = value.ToType()),
- createItem(LevelReductionOutsideAttributeId, "level_reduction_outside.shp", "lvlroutside", (t, value) => t.LevelReductionOutside = value.ToType()),
createItem(MinimalCircleDepthAtrributeId, "minimal_circle_depth.shp", "mincrcldepth", (t, value) => t.MinimalCircleDepth = value.ToType()),
createItem(PenetrationLengthAttributeId, "PenetrationLength.shp", "PenLength", (t, value) => t.PenetrationLength = value.ToType()),
createItem(PolderLevelAttributeId, PolderLevelShapeFileName, "PLHigh", (t, value) => t.PolderLevel = value.ToType()),
@@ -720,7 +654,6 @@
createItem(StabilitySlopeAdaptionDeltaXAttributeId, "StabilitySlopeAdaptionDeltaX.shp", "StSlAdaptDX", (t, value) => t.StabilitySlopeAdaptionDeltaX = value.ToType()),
createItem(UpliftCriterionPipingAttributeId, "uplift_criterion_piping.shp", "uplpiping", (t, value) => t.ModelFactors.UpliftCriterionPiping = value.ToType()),
createItem(UpliftCriterionStabilityAttributeId, "uplift_criterion_stability.shp", "uplstab", (t, value) => t.ModelFactors.UpliftCriterionStability = value.ToType()),
- createItem(UseOriginalPlLineAssignmentsAttributeId, "use_original_plline_assignments.shp", "IsOrgPLs", (t, value) => t.IsUseOriginalPLLineAssignments = value.ToType()),
createItem(XSoilGeometry2DOriginAttributeId, "XSoilGeometry2DOrigin.shp", "XG2DOrg", (t, value) => t.XSoilGeometry2DOrigin = value.ToType()),
createItem(SlopeDampingPiezometricHeightPolderSideAttributeId, "SlopeDampingPiezometricHeightPolderSide.shp", "SlopeDampingPiezometricHeightPolderSide", (t, value) => t.SlopeDampingPiezometricHeightPolderSide = value.ToType() ),
createItem(DikeTableHeightAttributeId, "DikeTableHeight.shp", "DikeTableHeight", (t, value) => t.DikeTableHeight = value.ToType() ),
Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs
===================================================================
diff -u -r2490 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2490)
+++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2508)
@@ -29,7 +29,6 @@
using Deltares.Dam.Data.IO;
using Deltares.Geotechnics.GeotechnicalGeometry;
using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Probabilistic;
using Deltares.Standard.EventPublisher;
using Deltares.Standard.Logging;
using Deltares.Standard.TestUtils;
@@ -205,22 +204,15 @@
Assert.AreEqual(0.8727, location.HeadPL2.Value, tolerance);
Assert.AreEqual(-0.25, location.HeadPl3.Value, tolerance);
Assert.AreEqual(-0.25, location.HeadPl4.Value, tolerance);
- Assert.AreEqual(1.0, location.GrassQuality, tolerance);
- Assert.AreEqual(1.0, location.Direction, tolerance);
Assert.AreEqual("klei", location.DikeEmbankmentMaterial);
Assert.AreEqual("klei2", location.ShoulderEmbankmentMaterial);
- Assert.AreEqual(false, location.IsUseOriginalPLLineAssignments);
Assert.AreEqual(1.3, location.PenetrationLength, tolerance);
Assert.AreEqual(10, location.TrafficLoad, tolerance);
Assert.AreEqual(22.44, location.TL_DegreeOfConsolidation, tolerance);
Assert.AreEqual(1.5, location.MinimalCircleDepth, tolerance);
Assert.AreEqual(0.3, location.DampingFactorPL3, tolerance);
Assert.AreEqual(0.4, location.DampingFactorPL4, tolerance);
Assert.AreEqual(PLLineCreationMethod.ExpertKnowledgeRRD, location.PLLineCreationMethod);
- Assert.AreEqual(1.0, location.LevelReductionInside, tolerance);
- Assert.AreEqual(2.0, location.LevelReductionOutside, tolerance);
- Assert.AreEqual(DistributionType.Uniform, location.LayerHeightDistribution);
- Assert.AreEqual(0.1, location.LayerHeightDeviation, tolerance);
Assert.AreEqual(1.2, location.ModelFactors.RequiredSafetyFactorPiping.Value, tolerance);
Assert.AreEqual(1.3, location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value, tolerance);
Assert.AreEqual(1.4, location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope.Value, tolerance);
Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r2253 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2253)
+++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2508)
@@ -22,11 +22,8 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Deltares.Standard;
using NUnit.Framework;
using Deltares.Geometry;
-using Deltares.Geotechnics;
-using Deltares.Probabilistic;
using Deltares.Dam.Data;
using Deltares.Dam.Data.DataPlugins;
using Deltares.Dam.Data.DataPlugins.Configuration;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r2454 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 2454)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 2508)
@@ -33,7 +33,6 @@
using Deltares.Maps;
using Deltares.Standard;
using Deltares.Standard.Logging;
-using Deltares.Standard.Validation;
using GeoAPI.Geometries;
namespace Deltares.Dam.Data.DataPlugins
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2508)
@@ -25,7 +25,6 @@
using System.Linq;
using System.Threading;
using Deltares.Dam.Data.Importers;
-using Deltares.Probabilistic;
using Deltares.Standard.IO;
using Deltares.Standard.Language;
using LumenWorks.Framework.IO.Csv;
@@ -53,22 +52,15 @@
public double? HeadPl2 { get; set; }
public double? HeadPl3 { get; set; }
public double? HeadPl4 { get; set; }
- public double? GrassQuality { get; set; }
- public double? Direction { get; set; }
public string Ophoogmateriaaldijk { get; set; }
public string Ophoogmateriaalberm { get; set; }
- public bool? UseOriginalPllineAssignments { get; set; }
public double? PenetrationLength { get; set; }
public double? TrafficLoad { get; set; }
public double? TL_DegreeOfConsolidation { get; set; }
public double? MinimalCircleDepth { get; set; }
public double? DempingsfactorPl3 { get; set; }
public double? DempingsfactorPl4 { get; set; }
public PLLineCreationMethod? PLLineCreationMethod { get; set; }
- public double? LevelReductionInside { get; set; }
- public double? LevelReductionOutside { get; set; }
- public DistributionType? LayerHeightDistribution { get; set; }
- public double? LayerHeightDeviation { get; set; }
public double? SafetyFactorPiping { get; set; }
public double? SafetyFactorStabilityInnerSlope { get; set; }
public double? SafetyFactorStabilityOuterSlope { get; set; }
@@ -146,27 +138,19 @@
int colIndexGeoX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XValueColumnName);
int colIndexGeoY = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.YValueColumnName);
int colIndexXSoilgeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XSoilGeometry2DOriginColumnName);
- int colIndexPl1Id = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.Pl1ColumnName);
int colIndexPolderlevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PolderLevelColumnName);
int colIndexHeadPl2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl2ColumnName);
int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl3ColumnName);
int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl4ColumnName);
- int colIndexGrassQuality = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.GrassQualityColumnName);
- int colIndexDirection = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DirectionColumnName);
int colIndexOphoogmateriaaldijk = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeEmbankmentMaterialColumnName);
int colIndexOphoogmateriaalberm = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ShoulderEmbankmentMaterialColumnName);
- int colIndexUseOriginalPllineAssignments = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseOriginalPlLineAssignmentsColumnName);
int colIndexPenetrationLength = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PenetrationLengthColumnName);
int colIndexTrafficLoad = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TrafficLoadColumnName);
- int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TL_DegreeOfConsolidationColumnName);
+ int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TlDegreeOfConsolidationColumnName);
int colIndexMinimalCircleDepth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MinimalCircleDepthColumnName);
int colIndexDempingsfactorPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl3ColumnName);
int colIndexDempingsfactorPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl4ColumnName);
int colIndexPLLineCreationMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineCreationMethodColumnName);
- int colIndexLevelReductionInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LevelReductionInsideColumnName);
- int colIndexLevelReductionOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LevelReductionOutsideColumnName);
- int colIndexLayerHeightDistribution = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LayerHeightDistributionColumnName);
- int colIndexLayerHeightDeviation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LayerHeightDeviationColumnName);
int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorPipingColumnName);
int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName);
int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName);
@@ -254,11 +238,6 @@
colIndex = colIndexXSoilgeometry2DOrigin;
locationRecord.XSoilgeometry2DOrigin = Convert.ToDouble(csv[colIndexXSoilgeometry2DOrigin]);
}
- if (colIndexPl1Id > -1)
- {
- colIndex = colIndexPl1Id;
- locationRecord.Pl1Id = csv[colIndexPl1Id];
- }
if (colIndexPolderlevel > -1)
{
colIndex = colIndexPolderlevel;
@@ -279,16 +258,6 @@
colIndex = colIndexHeadPl4;
locationRecord.HeadPl4 = Convert.ToDouble(csv[colIndexHeadPl4]);
}
- if (colIndexGrassQuality > -1)
- {
- colIndex = colIndexGrassQuality;
- locationRecord.GrassQuality = Convert.ToDouble(csv[colIndexGrassQuality]);
- }
- if (colIndexDirection > -1)
- {
- colIndex = colIndexDirection;
- locationRecord.Direction = Convert.ToDouble(csv[colIndexDirection]);
- }
if (colIndexOphoogmateriaaldijk > -1)
{
colIndex = colIndexOphoogmateriaaldijk;
@@ -299,11 +268,6 @@
colIndex = colIndexOphoogmateriaalberm;
locationRecord.Ophoogmateriaalberm = csv[colIndexOphoogmateriaalberm];
}
- if (colIndexUseOriginalPllineAssignments > -1)
- {
- colIndex = colIndexUseOriginalPllineAssignments;
- locationRecord.UseOriginalPllineAssignments = Convert.ToBoolean(csv[colIndexUseOriginalPllineAssignments]);
- }
if (colIndexPenetrationLength > -1)
{
colIndex = colIndexPenetrationLength;
@@ -339,26 +303,6 @@
colIndex = colIndexPLLineCreationMethod;
locationRecord.PLLineCreationMethod = LocationImportHelper.ToPLLineCreationMethod(csv[colIndexPLLineCreationMethod]);
}
- if (colIndexLevelReductionInside > -1)
- {
- colIndex = colIndexLevelReductionInside;
- locationRecord.LevelReductionInside = Convert.ToDouble(csv[colIndexLevelReductionInside]);
- }
- if (colIndexLevelReductionOutside > -1)
- {
- colIndex =colIndexLevelReductionOutside;
- locationRecord.LevelReductionOutside = Convert.ToDouble(csv[colIndexLevelReductionOutside]);
- }
- if (colIndexLayerHeightDistribution > -1)
- {
- colIndex = colIndexLayerHeightDistribution;
- locationRecord.LayerHeightDistribution = LocationImportHelper.ToDistribution(csv[colIndexLayerHeightDistribution]);
- }
- if (colIndexLayerHeightDeviation > -1)
- {
- colIndex = colIndexLayerHeightDeviation;
- locationRecord.LayerHeightDeviation = Convert.ToDouble(csv[colIndexLayerHeightDeviation]);
- }
if (colIndexSafetyFactorPiping > -1)
{
colIndex = colIndexSafetyFactorPiping;
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/ProjectLoader.cs
===================================================================
diff -u -r2251 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 2251)
+++ DamClients/DamUI/trunk/src/Dam/Tests/TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 2508)
@@ -24,11 +24,6 @@
using Deltares.Dam.Data;
using Deltares.Dam.Data.DataPlugins.Configuration;
-using Deltares.Dam.Data.Importers;
-using Deltares.Geotechnics;
-using Deltares.Geotechnics.IO;
-using Deltares.Standard;
-using Deltares.Standard.IO.Xml;
namespace Deltares.Dam.TestHelper
{
@@ -94,7 +89,6 @@
}
};
DamProjectCalculationSpecification.SelectedAnalysisType = AnalysisType.AdaptGeometry;
- damProjectData.DamProjectCalculationSpecification.SelectedProbabilisticType = ProbabilisticType.Deterministic;
return damCalculationSpecification;
}
}
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r2466 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 2466)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 2508)
@@ -136,7 +136,6 @@
-
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2495 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2495)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2508)
@@ -34,7 +34,6 @@
using Deltares.Geotechnics.Soils;
using Deltares.Geotechnics.SurfaceLines;
using Deltares.Geotechnics.Validation;
-using Deltares.Probabilistic;
using Deltares.Soilbase;
using Deltares.Standard;
using Deltares.Standard.Attributes;
@@ -58,14 +57,11 @@
public const string HeadPL2 = "HeadPL2";
public const string HeadPL3 = "HeadPL3";
public const string HeadPL4 = "HeadPL4";
- public const string GrassQuality = "GrassQuality";
- public const string Direction = "Direction";
public const string XSoilGeometry2DOrigin = "XSoilGeometry2DOrigin";
public const string DikeEmbankmentMaterial = "DikeEmbankmentMaterial";
public const string ShoulderEmbankmentMaterial = "ShoulderEmbankmentMaterial";
public const string DampingFactorPL3 = "DampingFactorPL3";
public const string DampingFactorPL4 = "DampingFactorPL4";
- public const string IsUseOriginalPLLineAssignments = "IsUseOriginalPLLineAssignments";
public const string PenetrationLength = "PenetrationLength";
public const string TrafficLoad = "TrafficLoad";
public const string TL_DegreeOfConsolidation = "TL_DegreeOfConsolidation";
@@ -82,10 +78,6 @@
public const string StabilityShoulderGrowDeltaX = "StabilityShoulderGrowDeltaX";
public const string StabilitySlopeAdaptionDeltaX = "StabilitySlopeAdaptionDeltaX";
public const string MinimalCircleDepth = "MinimalCircleDepth";
- public const string LevelReductionInside = "LevelReductionInside";
- public const string LevelReductionOutside = "LevelReductionOutside";
- public const string LayerHeightDistribution = "LayerHeightDistribution";
- public const string LayerHeightDeviation = "LayerHeightDeviation";
public const string DistanceToEntryPoint = "DistanceToEntryPoint";
public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope";
public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope";
@@ -150,21 +142,14 @@
private string description = "";
private string dikeEmbankmentMaterial = "";
private string dikeRingId = "";
- private double direction = 0;
private double distanceToEntryPoint = 0;
private double forbiddenZoneFactor = 1.0;
private IList gaugePLLines = new List();
private IList gauges = new List();
- private double grassQuality = 0;
private double? headPL2 = null;
private double? headPL3 = null;
private double? headPL4 = null;
- private bool isUseOriginalPLLineAssignments = false;
- private double layerHeightDeviation = 0;
- private DistributionType layerHeightDistribution = 0;
// Start of parameters that are also defined in modelparameters
- private double levelReductionInside = 0;
- private double levelReductionOutside = 0;
private PL1Line localXZPL1Line;
private SurfaceLine2 localXzSurfaceLine;
private string mapForSoilGeometries2D = "";
@@ -376,36 +361,6 @@
}
[Browsable(false)]
- public virtual double GrassQuality
- {
- get
- {
- return grassQuality;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "GrassQuality");
- grassQuality = value;
- DataEventPublisher.AfterChange(this, "GrassQuality");
- }
- }
-
- [Browsable(false)]
- public virtual double Direction
- {
- get
- {
- return direction;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "Direction");
- direction = value;
- DataEventPublisher.AfterChange(this, "Direction");
- }
- }
-
- [Browsable(false)]
public virtual double XSoilGeometry2DOrigin
{
get
@@ -459,21 +414,6 @@
}
[Browsable(false)]
- public virtual bool IsUseOriginalPLLineAssignments
- {
- get
- {
- return isUseOriginalPLLineAssignments;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "IsUseOriginalPLLineAssignments");
- isUseOriginalPLLineAssignments = value;
- DataEventPublisher.AfterChange(this, "IsUseOriginalPLLineAssignments");
- }
- }
-
- [Browsable(false)]
public virtual PL1Line PL1Line
{
get
@@ -587,44 +527,6 @@
}
}
- [Unit(UnitType.Length)]
- [Label("Level reduction inside")]
- [Format("F2")]
- [PropertyOrder(4, 5)]
- [Category(WaterCategory)]
- public virtual double LevelReductionInside
- {
- get
- {
- return levelReductionInside;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "LevelReductionInside");
- levelReductionInside = value;
- DataEventPublisher.AfterChange(this, "LevelReductionInside");
- }
- }
-
- [Unit(UnitType.Length)]
- [Label("Level reduction outside")]
- [Format("F2")]
- [PropertyOrder(4, 6)]
- [Category(WaterCategory)]
- public virtual double LevelReductionOutside
- {
- get
- {
- return levelReductionOutside;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "LevelReductionOutside");
- levelReductionOutside = value;
- DataEventPublisher.AfterChange(this, "LevelReductionOutside");
- }
- }
-
[Browsable(false)]
public virtual ModelFactors ModelFactors
{
@@ -678,41 +580,6 @@
}
}
- [Label("Layer height distribution")]
- [Category(AllCategory)]
- [PropertyOrder(4, 7)]
- public virtual DistributionType LayerHeightDistribution
- {
- get
- {
- return layerHeightDistribution;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "LayerHeightDistribution");
- layerHeightDistribution = value;
- DataEventPublisher.AfterChange(this, "LayerHeightDistribution");
- }
- }
-
- [Label("Layer height deviation")]
- [Category(AllCategory)]
- [PropertyOrder(4, 8)]
- [Format("F2")]
- public virtual double LayerHeightDeviation
- {
- get
- {
- return layerHeightDeviation;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "LayerHeightDeviation");
- layerHeightDeviation = value;
- DataEventPublisher.AfterChange(this, "LayerHeightDeviation");
- }
- }
-
[Unit(UnitType.Length)]
[Label("Distance to Entrypoint")]
[Description("Distance from toe of dike to entry point of river in deep sandlayer")]
@@ -2297,8 +2164,6 @@
{
nameValuePairs.Add(LocationParameterNames.HeadPL4, HeadPl4.Value.ToString(numberFormatInfo));
}
- nameValuePairs.Add(LocationParameterNames.GrassQuality, GrassQuality.ToString(numberFormatInfo));
- nameValuePairs.Add(LocationParameterNames.Direction, Direction.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.XSoilGeometry2DOrigin, XSoilGeometry2DOrigin.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.DikeEmbankmentMaterial, DikeEmbankmentMaterial);
nameValuePairs.Add(LocationParameterNames.ShoulderEmbankmentMaterial, ShoulderEmbankmentMaterial);
@@ -2338,14 +2203,9 @@
nameValuePairs.Add(LocationParameterNames.StabilityShoulderGrowSlope, StabilityShoulderGrowSlope.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.StabilityShoulderGrowDeltaX, StabilityShoulderGrowDeltaX.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.StabilitySlopeAdaptionDeltaX, StabilitySlopeAdaptionDeltaX.ToString(numberFormatInfo));
- nameValuePairs.Add(LocationParameterNames.IsUseOriginalPLLineAssignments, IsUseOriginalPLLineAssignments.ToString());
nameValuePairs.Add(LocationParameterNames.TrafficLoad, TrafficLoad.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.MinimalCircleDepth, MinimalCircleDepth.ToString(numberFormatInfo));
- nameValuePairs.Add(LocationParameterNames.LevelReductionInside, LevelReductionInside.ToString(numberFormatInfo));
- nameValuePairs.Add(LocationParameterNames.LevelReductionOutside, LevelReductionOutside.ToString(numberFormatInfo));
- nameValuePairs.Add(LocationParameterNames.LayerHeightDistribution, LayerHeightDistribution.ToString());
- nameValuePairs.Add(LocationParameterNames.LayerHeightDeviation, LayerHeightDeviation.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.DistanceToEntryPoint, DistanceToEntryPoint.ToString(numberFormatInfo));
if (ModelFactors.RequiredSafetyFactorStabilityInnerSlope != null)
{
@@ -2659,14 +2519,6 @@
{
HeadPl4 = Convert.ToDouble(parameterValue, numberFormatInfo);
}
- if (parameterName.Equals(LocationParameterNames.GrassQuality))
- {
- GrassQuality = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
- if (parameterName.Equals(LocationParameterNames.Direction))
- {
- Direction = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
if (parameterName.Equals(LocationParameterNames.XSoilGeometry2DOrigin))
{
XSoilGeometry2DOrigin = Convert.ToDouble(parameterValue, numberFormatInfo);
@@ -2746,10 +2598,6 @@
{
StabilitySlopeAdaptionDeltaX = Convert.ToDouble(parameterValue, numberFormatInfo);
}
- if (parameterName.Equals(LocationParameterNames.IsUseOriginalPLLineAssignments))
- {
- IsUseOriginalPLLineAssignments = Convert.ToBoolean(parameterValue, numberFormatInfo);
- }
if (parameterName.Equals(LocationParameterNames.TrafficLoad))
{
TrafficLoad = Convert.ToDouble(parameterValue, numberFormatInfo);
@@ -2762,27 +2610,10 @@
{
MinimalCircleDepth = Convert.ToDouble(parameterValue, numberFormatInfo);
}
- if (parameterName.Equals(LocationParameterNames.LevelReductionInside))
- {
- LevelReductionInside = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
- if (parameterName.Equals(LocationParameterNames.LevelReductionOutside))
- {
- LevelReductionOutside = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
- if (parameterName.Equals(LocationParameterNames.LayerHeightDistribution))
- {
- LayerHeightDistribution = (DistributionType) Enum.Parse(typeof(DistributionType), parameterValue);
- }
- if (parameterName.Equals(LocationParameterNames.LayerHeightDeviation))
- {
- LayerHeightDeviation = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
if (parameterName.Equals(LocationParameterNames.DistanceToEntryPoint))
{
DistanceToEntryPoint = Convert.ToDouble(parameterValue, numberFormatInfo);
}
-
if (parameterName.Equals(LocationParameterNames.RequiredSafetyFactorStabilityInnerSlope))
{
ModelFactors.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs
===================================================================
diff -u -r2088 -r2508
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs (.../DamProjectCalculationSpecificationPropertyControl.Designer.cs) (revision 2088)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs (.../DamProjectCalculationSpecificationPropertyControl.Designer.cs) (revision 2508)
@@ -52,25 +52,18 @@
private void InitializeComponent()
{
this.CalculationSpecificationsGroupControl = new DevExpress.XtraEditors.GroupControl();
- this.ProbabilisticGroupControl = new DevExpress.XtraEditors.GroupControl();
- this.ProbabilisticTypeComboBox = new DevExpress.XtraEditors.ComboBoxEdit();
- this.ProbabilisticTypeLabel = new DevExpress.XtraEditors.LabelControl();
- this.Grid = new Deltares.Standard.Forms.DExpress.GridViewControl();
this.damProjectCalculationOptionsPropertyControl1 = new Deltares.Dam.Forms.DamProjectCalculationOptionsPropertyControl();
+ this.Grid = new Deltares.Standard.Forms.DExpress.GridViewControl();
this.stabilityKernelTypeSpecificationsControl1 = new Deltares.Dam.Forms.StabilityKernelTypeSpecificationsControl();
((System.ComponentModel.ISupportInitialize)(this.CalculationSpecificationsGroupControl)).BeginInit();
this.CalculationSpecificationsGroupControl.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.ProbabilisticGroupControl)).BeginInit();
- this.ProbabilisticGroupControl.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.ProbabilisticTypeComboBox.Properties)).BeginInit();
this.SuspendLayout();
//
// CalculationSpecificationsGroupControl
//
this.CalculationSpecificationsGroupControl.Controls.Add(this.damProjectCalculationOptionsPropertyControl1);
this.CalculationSpecificationsGroupControl.Controls.Add(this.Grid);
this.CalculationSpecificationsGroupControl.Controls.Add(this.stabilityKernelTypeSpecificationsControl1);
- this.CalculationSpecificationsGroupControl.Controls.Add(this.ProbabilisticGroupControl);
this.CalculationSpecificationsGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
this.CalculationSpecificationsGroupControl.Location = new System.Drawing.Point(0, 0);
this.CalculationSpecificationsGroupControl.Margin = new System.Windows.Forms.Padding(4);
@@ -79,71 +72,41 @@
this.CalculationSpecificationsGroupControl.TabIndex = 4;
this.CalculationSpecificationsGroupControl.Text = "Calculation specifications";
//
- // ProbabilisticGroupControl
+ // damProjectCalculationOptionsPropertyControl1
//
- this.ProbabilisticGroupControl.Controls.Add(this.ProbabilisticTypeComboBox);
- this.ProbabilisticGroupControl.Controls.Add(this.ProbabilisticTypeLabel);
- this.ProbabilisticGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
- this.ProbabilisticGroupControl.Location = new System.Drawing.Point(2, 24);
- this.ProbabilisticGroupControl.Margin = new System.Windows.Forms.Padding(4);
- this.ProbabilisticGroupControl.Name = "ProbabilisticGroupControl";
- this.ProbabilisticGroupControl.ShowCaption = false;
- this.ProbabilisticGroupControl.Size = new System.Drawing.Size(324, 38);
- this.ProbabilisticGroupControl.TabIndex = 11;
- this.ProbabilisticGroupControl.Text = "groupControl1";
+ this.damProjectCalculationOptionsPropertyControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.damProjectCalculationOptionsPropertyControl1.Location = new System.Drawing.Point(2, 282);
+ this.damProjectCalculationOptionsPropertyControl1.Name = "damProjectCalculationOptionsPropertyControl1";
+ this.damProjectCalculationOptionsPropertyControl1.SelectedObject = null;
+ this.damProjectCalculationOptionsPropertyControl1.Size = new System.Drawing.Size(324, 625);
+ this.damProjectCalculationOptionsPropertyControl1.TabIndex = 14;
//
- // ProbabilisticTypeComboBox
- //
- this.ProbabilisticTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.ProbabilisticTypeComboBox.Location = new System.Drawing.Point(184, 6);
- this.ProbabilisticTypeComboBox.Margin = new System.Windows.Forms.Padding(4);
- this.ProbabilisticTypeComboBox.Name = "ProbabilisticTypeComboBox";
- this.ProbabilisticTypeComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.ProbabilisticTypeComboBox.Size = new System.Drawing.Size(133, 22);
- this.ProbabilisticTypeComboBox.TabIndex = 9;
- //
- // ProbabilisticTypeLabel
- //
- this.ProbabilisticTypeLabel.Location = new System.Drawing.Point(9, 10);
- this.ProbabilisticTypeLabel.Margin = new System.Windows.Forms.Padding(4);
- this.ProbabilisticTypeLabel.Name = "ProbabilisticTypeLabel";
- this.ProbabilisticTypeLabel.Size = new System.Drawing.Size(100, 16);
- this.ProbabilisticTypeLabel.TabIndex = 8;
- this.ProbabilisticTypeLabel.Text = "Probabilistic Type";
- //
// Grid
//
this.Grid.AdjustHeightToFit = false;
this.Grid.AllowAddDeleteOnly = false;
this.Grid.AllowedUserColumnFilters = null;
this.Grid.AllowInserts = true;
+ this.Grid.AllowUserColumnFilterEdit = true;
+ this.Grid.CurrentContext = null;
this.Grid.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.Grid.EnableMasterViewMode = true;
this.Grid.HideUnusedColumns = false;
- this.Grid.Location = new System.Drawing.Point(2, 132);
+ this.Grid.Location = new System.Drawing.Point(2, 65);
this.Grid.Margin = new System.Windows.Forms.Padding(4);
this.Grid.Name = "Grid";
this.Grid.SendSelectionChanged = true;
this.Grid.ShowToolbar = true;
- this.Grid.Size = new System.Drawing.Size(324, 775);
+ this.Grid.Size = new System.Drawing.Size(324, 842);
this.Grid.TabIndex = 13;
//
- // damProjectCalculationOptionsPropertyControl1
- //
- this.damProjectCalculationOptionsPropertyControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.damProjectCalculationOptionsPropertyControl1.Location = new System.Drawing.Point(2, 282);
- this.damProjectCalculationOptionsPropertyControl1.Name = "damProjectCalculationOptionsPropertyControl1";
- this.damProjectCalculationOptionsPropertyControl1.SelectedObject = null;
- this.damProjectCalculationOptionsPropertyControl1.Size = new System.Drawing.Size(324, 625);
- this.damProjectCalculationOptionsPropertyControl1.TabIndex = 14;
- //
// stabilityKernelTypeSpecificationsControl1
//
this.stabilityKernelTypeSpecificationsControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.stabilityKernelTypeSpecificationsControl1.Location = new System.Drawing.Point(2, 62);
+ this.stabilityKernelTypeSpecificationsControl1.Location = new System.Drawing.Point(2, 24);
this.stabilityKernelTypeSpecificationsControl1.Name = "stabilityKernelTypeSpecificationsControl1";
this.stabilityKernelTypeSpecificationsControl1.SelectedObject = null;
- this.stabilityKernelTypeSpecificationsControl1.Size = new System.Drawing.Size(324, 70);
+ this.stabilityKernelTypeSpecificationsControl1.Size = new System.Drawing.Size(324, 41);
this.stabilityKernelTypeSpecificationsControl1.TabIndex = 12;
//
// DamProjectCalculationSpecificationPropertyControl
@@ -156,20 +119,13 @@
this.Size = new System.Drawing.Size(328, 880);
((System.ComponentModel.ISupportInitialize)(this.CalculationSpecificationsGroupControl)).EndInit();
this.CalculationSpecificationsGroupControl.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.ProbabilisticGroupControl)).EndInit();
- this.ProbabilisticGroupControl.ResumeLayout(false);
- this.ProbabilisticGroupControl.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.ProbabilisticTypeComboBox.Properties)).EndInit();
this.ResumeLayout(false);
}
#endregion
private DevExpress.XtraEditors.GroupControl CalculationSpecificationsGroupControl;
- private DevExpress.XtraEditors.GroupControl ProbabilisticGroupControl;
- private DevExpress.XtraEditors.ComboBoxEdit ProbabilisticTypeComboBox;
- private DevExpress.XtraEditors.LabelControl ProbabilisticTypeLabel;
private StabilityKernelTypeSpecificationsControl stabilityKernelTypeSpecificationsControl1;
protected Standard.Forms.DExpress.GridViewControl Grid;
private DamProjectCalculationOptionsPropertyControl damProjectCalculationOptionsPropertyControl1;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2508)
@@ -771,12 +771,9 @@
location.XRd = locationRecord.GeoX.GetValueOrDefault(location.XRd);
location.YRd = locationRecord.GeoY.GetValueOrDefault(location.YRd);
location.PolderLevel = locationRecord.Polderlevel.GetValueOrDefault(location.PolderLevel);
- location.GrassQuality = locationRecord.GrassQuality.GetValueOrDefault(location.GrassQuality);
- location.Direction = locationRecord.Direction.GetValueOrDefault(location.Direction);
location.XSoilGeometry2DOrigin = locationRecord.XSoilgeometry2DOrigin.GetValueOrDefault(location.XSoilGeometry2DOrigin);
location.DampingFactorPL3 = locationRecord.DempingsfactorPl3.GetValueOrDefault(location.DampingFactorPL3);
location.DampingFactorPL4 = locationRecord.DempingsfactorPl4.GetValueOrDefault(location.DampingFactorPL4);
- location.IsUseOriginalPLLineAssignments = locationRecord.UseOriginalPllineAssignments.GetValueOrDefault(location.IsUseOriginalPLLineAssignments);
location.PenetrationLength = locationRecord.PenetrationLength.GetValueOrDefault(location.PenetrationLength);
location.TrafficLoad = locationRecord.TrafficLoad.GetValueOrDefault(location.TrafficLoad);
location.TL_DegreeOfConsolidation = locationRecord.TL_DegreeOfConsolidation.GetValueOrDefault(location.TL_DegreeOfConsolidation);
@@ -811,10 +808,6 @@
location.StabilityShoulderGrowDeltaX = locationRecord.StabilityShoulderGrowDeltaX.GetValueOrDefault(location.StabilityShoulderGrowDeltaX);
location.StabilitySlopeAdaptionDeltaX = locationRecord.StabilitySlopeAdaptionDeltaX.GetValueOrDefault(location.StabilitySlopeAdaptionDeltaX);
location.MinimalCircleDepth = locationRecord.MinimalCircleDepth.GetValueOrDefault(location.MinimalCircleDepth);
- location.LevelReductionInside = locationRecord.LevelReductionInside.GetValueOrDefault(location.LevelReductionInside);
- location.LevelReductionOutside = locationRecord.LevelReductionOutside.GetValueOrDefault(location.LevelReductionOutside);
- location.LayerHeightDeviation = locationRecord.LayerHeightDeviation.GetValueOrDefault(location.LayerHeightDeviation);
- location.LayerHeightDistribution = locationRecord.LayerHeightDistribution.GetValueOrDefault(location.LayerHeightDistribution);
location.DistanceToEntryPoint = locationRecord.DistanceToEntryPoint.GetValueOrDefault(location.DistanceToEntryPoint);
location.SlopeDampingPiezometricHeightPolderSide = locationRecord.SlopeDampingPiezometricHeightPolderSide.GetValueOrDefault(location.SlopeDampingPiezometricHeightPolderSide);
location.StabilityDesignMethod = locationRecord.StabilityDesignMethod.GetValueOrDefault(location.StabilityDesignMethod);
Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2508)
@@ -26,7 +26,6 @@
using Deltares.Dam.Data;
using Deltares.Dam.Data.Importers;
using Deltares.Maps;
-using Deltares.Probabilistic;
using GeoAPI.Geometries;
using NetTopologySuite.Geometries;
using NUnit.Framework;
@@ -112,13 +111,11 @@
const string stringInitialValue = "someValue";
const double doubleInitialValue = 99.9;
const bool boolInitialValue = false;
- const DistributionType distributionInitialValue = DistributionType.Weibull;
const PLLineCreationMethod plLineCreationMethodInitialValue = PLLineCreationMethod.ExpertKnowledgeRRD;
const string stringTestValue = "testValue";
const double doubleTestValue = 111.1;
const bool boolTestValue = true;
- const DistributionType distributionTestValue = DistributionType.Uniform;
const PLLineCreationMethod plLineCreationMethodTestValue = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD;
const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ZoneAreas;
const StabilityDesignMethod stabilityDesignMethodTestValue = StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption;
@@ -157,14 +154,6 @@
{
geom.AddAttribute(mapping.Name, plLineCreationMethodTestValue);
}
- else if (key.Equals(LocationShapeFileAttributeMap.LayerHeightDistributionAttributeId, StringComparison.InvariantCultureIgnoreCase))
- {
- geom.AddAttribute(mapping.Name, distributionTestValue);
- }
- else if (key.Equals(LocationShapeFileAttributeMap.UseOriginalPlLineAssignmentsAttributeId, StringComparison.InvariantCultureIgnoreCase))
- {
- geom.AddAttribute(mapping.Name, boolTestValue);
- }
else if (key.Equals(LocationShapeFileAttributeMap.ZoneTypeAttributeId, StringComparison.InvariantCultureIgnoreCase))
{
geom.AddAttribute(mapping.Name, mstabZonesTypeTestValue);
@@ -195,16 +184,10 @@
DampingFactorPL3 = doubleInitialValue,
DampingFactorPL4 = doubleInitialValue,
DikeEmbankmentMaterial = stringInitialValue,
- Direction = doubleInitialValue,
DistanceToEntryPoint = doubleInitialValue,
- GrassQuality = doubleInitialValue,
HeadPL2 = doubleInitialValue,
HeadPl3 = doubleInitialValue,
HeadPl4 = doubleInitialValue,
- LayerHeightDistribution = distributionInitialValue,
- LayerHeightDeviation = doubleInitialValue,
- LevelReductionInside = doubleInitialValue,
- LevelReductionOutside = doubleInitialValue,
MinimalCircleDepth = doubleInitialValue,
PenetrationLength = doubleInitialValue,
PolderLevel = doubleInitialValue,
@@ -227,7 +210,6 @@
StabilityShoulderGrowSlope = doubleInitialValue,
StabilityShoulderGrowDeltaX = doubleInitialValue,
StabilitySlopeAdaptionDeltaX = doubleInitialValue,
- IsUseOriginalPLLineAssignments = boolInitialValue,
XSoilGeometry2DOrigin = doubleInitialValue,
StabilityZoneType = MStabZonesType.NoZones,
ForbiddenZoneFactor = doubleInitialValue,
@@ -277,16 +259,10 @@
Assert.AreEqual(doubleTestValue, location.DampingFactorPL3);
Assert.AreEqual(doubleTestValue, location.DampingFactorPL4);
Assert.AreEqual(stringTestValue, location.DikeEmbankmentMaterial);
- Assert.AreEqual(doubleTestValue, location.Direction);
Assert.AreEqual(doubleTestValue, location.DistanceToEntryPoint);
- Assert.AreEqual(doubleTestValue, location.GrassQuality);
Assert.AreEqual(doubleTestValue, location.HeadPL2);
Assert.AreEqual(doubleTestValue, location.HeadPl3);
Assert.AreEqual(doubleTestValue, location.HeadPl4);
- Assert.AreEqual(distributionTestValue, location.LayerHeightDistribution);
- Assert.AreEqual(doubleTestValue, location.LayerHeightDeviation);
- Assert.AreEqual(doubleTestValue, location.LevelReductionInside);
- Assert.AreEqual(doubleTestValue, location.LevelReductionOutside);
Assert.AreEqual(doubleTestValue, location.MinimalCircleDepth);
Assert.AreEqual(doubleTestValue, location.PenetrationLength);
Assert.AreEqual(doubleTestValue, location.PolderLevel);
@@ -306,7 +282,6 @@
Assert.AreEqual(doubleTestValue, location.StabilitySlopeAdaptionDeltaX);
Assert.AreEqual(doubleTestValue, location.ModelFactors.UpliftCriterionPiping);
Assert.AreEqual(doubleTestValue, location.ModelFactors.UpliftCriterionStability);
- Assert.AreEqual(boolTestValue, location.IsUseOriginalPLLineAssignments);
Assert.AreEqual(doubleTestValue, location.XSoilGeometry2DOrigin);
Assert.AreEqual(mstabZonesTypeTestValue, location.StabilityZoneType);
Assert.AreEqual(doubleTestValue, location.ForbiddenZoneFactor);
@@ -347,17 +322,13 @@
{
const string stringInitialValue = "someValue";
const double doubleInitialValue = 99.9;
- const bool boolInitialValue = false;
- const DistributionType distributionInitialValue = DistributionType.Weibull;
const PLLineCreationMethod plLineCreationMethodInitialValue = PLLineCreationMethod.ExpertKnowledgeRRD;
const MStabZonesType mstabZonesTypeTestValue = MStabZonesType.ZoneAreas;
const StabilityDesignMethod stabilityDesignMethodTestValue = StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption;
const IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureTestValue = IntrusionVerticalWaterPressureType.Standard;
const string stringTestValue = "testValue";
const double doubleTestValue = 111.1;
const double dampingPl3Value = 0.34;
- const bool boolTestValue = true;
- const DistributionType distributionTestValue = DistributionType.Uniform;
const PLLineCreationMethod plLineCreationMethodTestValue = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD;
var mocks = new MockRepository();
@@ -395,14 +366,6 @@
{
attributeLine.AddAttribute(mapping.Name, plLineCreationMethodTestValue);
}
- else if (key.Equals(LocationShapeFileAttributeMap.LayerHeightDistributionAttributeId, StringComparison.InvariantCultureIgnoreCase))
- {
- attributeLine.AddAttribute(mapping.Name, distributionTestValue);
- }
- else if (key.Equals(LocationShapeFileAttributeMap.UseOriginalPlLineAssignmentsAttributeId, StringComparison.InvariantCultureIgnoreCase))
- {
- attributeLine.AddAttribute(mapping.Name, boolTestValue);
- }
else if (key.Equals(LocationShapeFileAttributeMap.ZoneTypeAttributeId, StringComparison.InvariantCultureIgnoreCase))
{
attributeLine.AddAttribute(mapping.Name, mstabZonesTypeTestValue);
@@ -438,16 +401,10 @@
DampingFactorPL3 = doubleInitialValue,
DampingFactorPL4 = doubleInitialValue,
DikeEmbankmentMaterial = stringInitialValue,
- Direction = doubleInitialValue,
DistanceToEntryPoint = doubleInitialValue,
- GrassQuality = doubleInitialValue,
HeadPL2 = doubleInitialValue,
HeadPl3 = dampingPl3Value,
HeadPl4 = doubleInitialValue,
- LayerHeightDistribution = distributionInitialValue,
- LayerHeightDeviation = doubleInitialValue,
- LevelReductionInside = doubleInitialValue,
- LevelReductionOutside = doubleInitialValue,
MinimalCircleDepth = doubleInitialValue,
PenetrationLength = doubleInitialValue,
PolderLevel = doubleInitialValue,
@@ -470,7 +427,6 @@
StabilityShoulderGrowSlope = doubleInitialValue,
StabilityShoulderGrowDeltaX = doubleInitialValue,
StabilitySlopeAdaptionDeltaX = doubleInitialValue,
- IsUseOriginalPLLineAssignments = boolInitialValue,
XSoilGeometry2DOrigin = doubleInitialValue,
StabilityZoneType = MStabZonesType.NoZones,
SlopeDampingPiezometricHeightPolderSide = doubleInitialValue,
@@ -517,16 +473,10 @@
Assert.AreEqual(dampingPl3Value, location.DampingFactorPL3);
Assert.AreEqual(0, location.DampingFactorPL4); // as testvalue is beyond the limits, its reset to 0
Assert.AreEqual(stringTestValue, location.DikeEmbankmentMaterial);
- Assert.AreEqual(doubleTestValue, location.Direction);
Assert.AreEqual(doubleTestValue, location.DistanceToEntryPoint);
- Assert.AreEqual(doubleTestValue, location.GrassQuality);
Assert.AreEqual(doubleTestValue, location.HeadPL2);
Assert.AreEqual(doubleTestValue, location.HeadPl3);
Assert.AreEqual(doubleTestValue, location.HeadPl4);
- Assert.AreEqual(distributionTestValue, location.LayerHeightDistribution);
- Assert.AreEqual(doubleTestValue, location.LayerHeightDeviation);
- Assert.AreEqual(doubleTestValue, location.LevelReductionInside);
- Assert.AreEqual(doubleTestValue, location.LevelReductionOutside);
Assert.AreEqual(doubleTestValue, location.MinimalCircleDepth);
Assert.AreEqual(doubleTestValue, location.PenetrationLength);
Assert.AreEqual(doubleTestValue, location.PolderLevel);
@@ -546,7 +496,6 @@
Assert.AreEqual(doubleTestValue, location.StabilitySlopeAdaptionDeltaX);
Assert.AreEqual(doubleTestValue, location.ModelFactors.UpliftCriterionPiping);
Assert.AreEqual(doubleTestValue, location.ModelFactors.UpliftCriterionStability);
- Assert.AreEqual(boolTestValue, location.IsUseOriginalPLLineAssignments);
Assert.AreEqual(doubleTestValue, location.XSoilGeometry2DOrigin);
Assert.AreEqual(mstabZonesTypeTestValue, location.StabilityZoneType);
Assert.AreEqual(doubleTestValue, location.SlopeDampingPiezometricHeightPolderSide);
Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2508)
@@ -25,13 +25,9 @@
using System.Linq;
using Deltares.Dam.Data;
-using Deltares.Dam.Data.IO;
-using Deltares.Dam.Forms;
using Deltares.Dam.TestHelper;
using Deltares.Geotechnics.Soils;
using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard;
-using Deltares.Standard.IO.Xml;
using Deltares.Standard.TestUtils;
using KellermanSoftware.CompareNetObjects;
@@ -99,14 +95,11 @@
HeadPL2 = -1.3,
HeadPl3 = -1.6,
HeadPl4 = null,
- GrassQuality = 1.0,
- Direction = 1.0,
XSoilGeometry2DOrigin = 0.0, // actual value
DikeEmbankmentMaterial = "HHNK1_Bfg",
ShoulderEmbankmentMaterial = "HHNK1_Bfl",
DampingFactorPL3 = 0.0, // actual value
DampingFactorPL4 = 0.0, // actual value
- IsUseOriginalPLLineAssignments = false,
PenetrationLength = 0.0, // actual value
TrafficLoad = 5.0,
PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD,
@@ -118,10 +111,6 @@
StabilityShoulderGrowDeltaX = 2.0,
StabilitySlopeAdaptionDeltaX = 2.0,
MinimalCircleDepth = 1.5,
- LevelReductionInside = 0.5,
- LevelReductionOutside = 0.6,
- LayerHeightDistribution = 0.0,
- LayerHeightDeviation = 0.0,
DistanceToEntryPoint = 0.0, // actual value
StabilityZoneType = MStabZonesType.NoZones,
DikeTableHeight = 0.0,
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2508)
@@ -21,7 +21,6 @@
using Deltares.Geometry;
using Deltares.Geotechnics.GeotechnicalGeometry;
-using Deltares.Probabilistic;
using Deltares.Standard.Extensions;
using System;
using System.Collections.Generic;
@@ -308,9 +307,6 @@
location1.HeadPL2 = 4.0;
location1.HeadPl3 = 3.0;
location1.HeadPl4 = 2.5;
- location1.GrassQuality = 3.7;
- location1.Direction = 2.5;
- location1.IsUseOriginalPLLineAssignments = true;
location1.DikeEmbankmentMaterial = "clay";
location1.ShoulderEmbankmentMaterial = "sand";
location1.StabilityShoulderGrowSlope = 3.1;
@@ -327,10 +323,6 @@
location1.TrafficLoad = 3.7;
location1.TL_DegreeOfConsolidation = 3.8;
location1.MinimalCircleDepth = 1.11;
- location1.LevelReductionInside = 1.12;
- location1.LevelReductionOutside = 1.13;
- location1.LayerHeightDistribution = DistributionType.LogNormal;
- location1.LayerHeightDeviation = 1.15;
location1.DistanceToEntryPoint = 1.16;
location1.ModelFactors.RequiredSafetyFactorPiping = 1.11;
location1.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.12;
@@ -388,14 +380,6 @@
soilClay1.WhitesConstant = 1.0;
soilClay1.BeddingAngle = 1.0;
soilClay1.PermeabKx = 1.0;
- soilClay1.DiameterD70Stochast.DistributionType = DistributionType.Beta;
- soilClay1.DiameterD70Stochast.Deviation = 1e-6;
- soilClay1.PermeabKxStochast.DistributionType = DistributionType.Uniform;
- soilClay1.PermeabKxStochast.Deviation = 1.0;
- soilClay1.WhitesConstantStochast.DistributionType = DistributionType.Exponential;
- soilClay1.WhitesConstantStochast.Deviation = 1.0;
- soilClay1.BeddingAngleStochast.DistributionType = DistributionType.Weibull;
- soilClay1.BeddingAngleStochast.Deviation = 0.5;
soilClay1.ExcessPorePressure = 21.0;
soilClay1.PorePressureFactor = 0.8;
soilClay1.Cohesion = 12.7;
@@ -406,27 +390,8 @@
//soilClay1.BondStressTableNr = 2;
soilClay1.ShearStrengthModel = ShearStrengthModel.CPhi;
soilClay1.UseDefaultProbabilisticValues = false;
- soilClay1.CohesionStochast.Deviation = 1.0;
- soilClay1.FrictionAngleStochast.Deviation = 1.0;
- soilClay1.PnStochast.Deviation = 0.7;
- soilClay1.POPStochast.Deviation = 1.0;
- soilClay1.CohesionStochast.DistributionType = DistributionType.Deterministic;
- soilClay1.FrictionAngleStochast.DistributionType = DistributionType.Uniform;
- soilClay1.StressTableStochast.DistributionType = DistributionType.LogNormal;
- soilClay1.PnStochast.DistributionType = DistributionType.Gamma;
- soilClay1.POPStochast.DistributionType = DistributionType.Frechet;
soilClay1.CorrelationCPhi = 0.5;
soilClay1.POP = 4.2;
- soilClay1.CohesionStochast.DesignFactor = 2.1;
- soilClay1.CohesionStochast.DesignDeviation = 0.3;
- soilClay1.FrictionAngleStochast.DesignFactor = 1.3;
- soilClay1.FrictionAngleStochast.DesignDeviation = 0.67;
- soilClay1.StressTableStochast.DesignFactor = 4.21;
- soilClay1.StressTableStochast.DesignDeviation = 3.1;
- soilClay1.POPStochast.DesignFactor = 1.1;
- soilClay1.POPStochast.DesignDeviation = 2.2;
- soilClay1.RRatioStochast.DesignFactor = 3.3;
- soilClay1.RRatioStochast.DesignDeviation = 4.4;
soilClay1.SoilGroup = 11;
soilClay1.UseSoilType = true;
soilClay1.RRatio = 5.5;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs (.../ModelParameters.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs (.../ModelParameters.cs) (revision 2508)
@@ -19,22 +19,16 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using Deltares.Probabilistic;
-
namespace Deltares.Dam.Data
{
public class ModelParameters
{
public double TrafficLoad { get; set; } // moved to location
public double MinimalCircleDepth { get; set; } // to be moved to location
- 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 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();
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2508)
@@ -107,9 +107,6 @@
False
..\..\..\lib\DSL-Core\Deltares.Mathematics.dll
-
- ..\..\..\lib\DSL-Probabilistic\Deltares.Probabilistic.dll
-
False
..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll
@@ -194,7 +191,6 @@
-
Fisheye: Tag 2508 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/DesignPointCalculationTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs
===================================================================
diff -u -r2466 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2466)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs (.../LocationImportHelper.cs) (revision 2508)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using Deltares.Geotechnics.Soils;
-using Deltares.Probabilistic;
using Deltares.Standard.Extensions;
namespace Deltares.Dam.Data.Importers
@@ -61,36 +60,6 @@
return key.ToEnumType(soilTypeTranslationTable);
}
- internal static DistributionType ToDistribution(object value)
- {
- if (value == null)
- throw new ArgumentNullException("value");
-
- return ToDistribution(value.ToString());
- }
-
- internal static DistributionType ToDistribution(string value)
- {
- if (string.IsNullOrEmpty(value) || value.Trim() == "")
- throw new ArgumentException("value");
-
- var distributionTranslationTable = new Dictionary()
- {
- {"none", DistributionType.Deterministic},
- {"uniform", DistributionType.Uniform},
- {"normal", DistributionType.Normal},
- {"lognormal", DistributionType.LogNormal},
- {"exponential", DistributionType.Exponential},
- {"gamma", DistributionType.Gamma},
- {"beta", DistributionType.Beta},
- {"frechet", DistributionType.Frechet},
- {"weibull", DistributionType.Weibull}
- };
-
- var key = value.ToLowerInvariant();
- return key.ToEnumType(distributionTranslationTable);
- }
-
internal static PLLineCreationMethod ToPLLineCreationMethod(object value)
{
if (value == null)
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs
===================================================================
diff -u -r2468 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2508)
@@ -237,14 +237,11 @@
Assert.AreEqual(0.1, dike.Locations[0].PolderLevel);
Assert.AreEqual(4.0, dike.Locations[0].HeadPL2);
Assert.AreEqual(3.0, dike.Locations[0].HeadPl3);
- Assert.AreEqual(4.3, dike.Locations[0].GrassQuality);
- Assert.AreEqual(1.0, dike.Locations[0].Direction);
Assert.AreEqual(14.0, dike.Locations[0].XSoilGeometry2DOrigin);
Assert.AreEqual("ophoogmateriaaldijk", dike.Locations[0].DikeEmbankmentMaterial);
Assert.AreEqual("ophoogmateriaalberm", dike.Locations[0].ShoulderEmbankmentMaterial);
Assert.AreEqual(0.31, dike.Locations[0].DampingFactorPL3);
Assert.AreEqual(0.41, dike.Locations[0].DampingFactorPL4);
- Assert.AreEqual(true, dike.Locations[0].IsUseOriginalPLLineAssignments, "dike.Locations[0].IsUseOriginalPLLineAssignments");
Assert.AreEqual(13, dike.SurfaceLines2[0].CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None));
Assert.IsNotNull(dike.SurfaceLines2[0].CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide));
Assert.AreEqual(null, dike.Locations[0].DikeTableHeight);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2508)
@@ -86,16 +86,6 @@
public const string HeadPl4ColumnName = "head_pl4";
///
- /// grass_quality
- ///
- public const string GrassQualityColumnName = "grass_quality";
-
- ///
- /// direction
- ///
- public const string DirectionColumnName = "direction";
-
- ///
/// x_soilgeometry2D_origin
///
public const string XSoilGeometry2DOriginColumnName = "x_soilgeometry2D_origin";
@@ -121,16 +111,6 @@
public const string DampingFactorPl4ColumnName = "dempingsfactor_pl4";
///
- /// use_original_plline_assignments
- ///
- public const string UseOriginalPlLineAssignmentsColumnName = "use_original_plline_assignments";
-
- ///
- /// Pl1_id
- ///
- public const string Pl1ColumnName = "Pl1_id";
-
- ///
/// PenetrationLength
///
public const string PenetrationLengthColumnName = "PenetrationLength";
@@ -143,7 +123,7 @@
///
/// TL_DegreeOfConsolidation
///
- public const string TL_DegreeOfConsolidationColumnName = "TL_DegreeOfConsolidation";
+ public const string TlDegreeOfConsolidationColumnName = "TL_DegreeOfConsolidation";
///
/// PLLineCreationMethod
@@ -216,26 +196,6 @@
public const string MinimalCircleDepthColumnName = "minimal_circle_depth";
///
- /// level_reduction_inside
- ///
- public const string LevelReductionInsideColumnName = "level_reduction_inside";
-
- ///
- /// level_reduction_outside
- ///
- public const string LevelReductionOutsideColumnName = "level_reduction_outside";
-
- ///
- /// layer_height_deviation
- ///
- public const string LayerHeightDeviationColumnName = "layer_height_deviation";
-
- ///
- /// layer_height_distribution
- ///
- public const string LayerHeightDistributionColumnName = "layer_height_distribution";
-
- ///
/// distance_to_entry_point
///
public const string DistanceToEntryPointColumnName = "distance_to_entry_point";
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 2508)
@@ -33,7 +33,6 @@
using Deltares.Standard.Logging;
using Deltares.Standard.Project;
using Deltares.Standard.Validation;
-using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage;
namespace Deltares.Dam.Data
{
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
===================================================================
diff -u -r2472 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 2508)
@@ -21,7 +21,6 @@
using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
using Deltares.Geographic;
using Deltares.Standard.Attributes;
using Deltares.Standard.EventPublisher;
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs
===================================================================
diff -u -r2135 -r2508
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 2135)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 2508)
@@ -21,7 +21,6 @@
using System.Windows.Forms;
using Deltares.Dam.Data;
-using Deltares.Standard;
using Deltares.Standard.EventPublisher;
using Deltares.Standard.EventPublisher.Enum;
using Deltares.Standard.Forms;
@@ -42,8 +41,6 @@
Grid.PropertyEditorReactionType = PropertyEditorReactionType.Ignore;
Name = "Calculation";
- BindSupport.BindTextAndValue(this, ProbabilisticTypeLabel,
- ProbabilisticTypeComboBox, p => p.SelectedProbabilisticType);
BindSupport.Bind(this, Grid, p => p.DamCalculationSpecifications);
DataEventPublisher.OnSelectionChanged += DataEventPublisher_OnSubSelectionChanged;
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2473 -r2508
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2473)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2508)
@@ -24,7 +24,6 @@
using System.IO;
using Deltares.Dam.Data;
using Deltares.Dam.Data.CsvImporters;
-using Deltares.Probabilistic;
using Deltares.Standard.EventPublisher;
using NUnit.Framework;
@@ -685,17 +684,12 @@
Assert.AreEqual(66586.0, locationRecords[1].GeoX, tolerance);
Assert.AreEqual(424173.0, locationRecords[1].GeoY, tolerance);
Assert.AreEqual(2.0, locationRecords[1].XSoilgeometry2DOrigin, tolerance);
- Assert.AreEqual("25-2-2-A-1-A", locationRecords[1].Pl1Id);
Assert.AreEqual(-0.25, locationRecords[1].Polderlevel, tolerance);
Assert.AreEqual(0.8727, locationRecords[1].HeadPl2.Value, tolerance);
Assert.AreEqual(0.9, locationRecords[0].HeadPl3.Value, tolerance);
Assert.AreEqual(0.8, locationRecords[0].HeadPl4.Value, tolerance);
- Assert.AreEqual(1.0, locationRecords[1].GrassQuality, tolerance);
- Assert.AreEqual(1.0, locationRecords[1].Direction, tolerance);
Assert.AreEqual("klei", locationRecords[1].Ophoogmateriaaldijk);
Assert.AreEqual("klei2", locationRecords[1].Ophoogmateriaalberm);
- Assert.AreEqual(true, locationRecords[0].UseOriginalPllineAssignments);
- Assert.AreEqual(false, locationRecords[1].UseOriginalPllineAssignments);
Assert.AreEqual(1.3, locationRecords[1].PenetrationLength, tolerance);
Assert.AreEqual(10, locationRecords[1].TrafficLoad, tolerance);
Assert.AreEqual(10.1, locationRecords[0].TL_DegreeOfConsolidation, tolerance);
@@ -704,10 +698,6 @@
Assert.AreEqual(30.0, locationRecords[1].DempingsfactorPl3, tolerance);
Assert.AreEqual(40.0, locationRecords[1].DempingsfactorPl4, tolerance);
Assert.AreEqual(PLLineCreationMethod.ExpertKnowledgeRRD, locationRecords[1].PLLineCreationMethod);
- Assert.AreEqual(1.0, locationRecords[1].LevelReductionInside, tolerance);
- Assert.AreEqual(2.0, locationRecords[1].LevelReductionOutside, tolerance);
- Assert.AreEqual(DistributionType.Uniform, locationRecords[1].LayerHeightDistribution);
- Assert.AreEqual(0.1, locationRecords[1].LayerHeightDeviation, tolerance);
Assert.AreEqual(1.2, locationRecords[1].SafetyFactorPiping, tolerance);
Assert.AreEqual(1.3, locationRecords[1].SafetyFactorStabilityInnerSlope, tolerance);
Assert.AreEqual(1.4, locationRecords[1].SafetyFactorStabilityOuterSlope, tolerance);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs
===================================================================
diff -u -r2089 -r2508
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 2508)
@@ -42,7 +42,6 @@
private readonly List damCalculationSpecifications;
private static AnalysisType selectedAnalysisType = AnalysisType.AdaptGeometry;
- private ProbabilisticType selectedProbabilisticType;
private DamFailureMechanismeCalculationSpecification currentSpecification = null;
private StabilityKernelType selectedStabilityKernelType;
private IVisibleEnabledProvider visibleEnabledProvider;
@@ -69,11 +68,6 @@
{
get
{
-
- if (currentSpecification != null && currentSpecification.FailureMechanismSystemType != FailureMechanismSystemType.Piping)
- {
- selectedProbabilisticType = ProbabilisticType.Deterministic;
- }
return damCalculationSpecifications;
}
}
@@ -119,19 +113,6 @@
}
}
- [Label("Probabilistic type")]
- public ProbabilisticType SelectedProbabilisticType
- {
- get { return selectedProbabilisticType; }
- set
- {
- DataEventPublisher.BeforeChange(this, "SelectedProbabilisticType");
- selectedProbabilisticType = value;
- DamFailureMechanismeCalculationSpecification.ProbabilisticType = selectedProbabilisticType;
- DataEventPublisher.AfterChange(this, "SelectedProbabilisticType");
- }
- }
-
[XmlIgnore]
public DamFailureMechanismeCalculationSpecification CurrentSpecification
{
Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs
===================================================================
diff -u -r2135 -r2508
--- DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs (.../LocationJobSymbol.cs) (revision 2135)
+++ DamClients/DamUI/trunk/src/Dam/Forms/LocationJobSymbol.cs (.../LocationJobSymbol.cs) (revision 2508)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
using System.Xml.Serialization;
using Deltares.Dam.Data;
using Deltares.Standard;
@@ -69,12 +68,6 @@
{
if (sender == this.damProjectData)
{
- if (LocationJob.ProbabilisticType != this.damProjectData.DamProjectCalculationSpecification.SelectedProbabilisticType)
- {
- LocationJob.ProbabilisticType = this.damProjectData.DamProjectCalculationSpecification.SelectedProbabilisticType;
- DataEventPublisher.DataListModified(this.DamProjectData.LocationJobs);
- }
-
DataEventPublisher.AfterChange(this);
}
}
Index: DamClients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx
===================================================================
diff -u -r1340 -r2508
--- DamClients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx (.../licenses.licx) (revision 1340)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx (.../licenses.licx) (revision 2508)
@@ -1 +1,2 @@
+DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a