Fisheye: Tag 2472 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/SchematizationFactorPropertyControl.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2472)
@@ -90,9 +90,6 @@
public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope";
public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope";
public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping";
- public const string RequiredProbabilityOfFailureStabilityInnerslope = "RequiredProbabilityOfFailureStabilityInnerslope";
- public const string RequiredProbabilityOfFailureStabilityOuterslope = "RequiredProbabilityOfFailureStabilityOuterslope";
- public const string RequiredProbabilityOfFailurePiping = "RequiredProbabilityOfFailurePiping";
public const string StabilityZoneType = "StabilityZoneType";
public const string ForbiddenZoneFactor = "ForbiddenZoneFactor";
public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth";
@@ -1382,15 +1379,12 @@
{
foreach (var scenario in scenarios)
{
- if (scenario.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope == null)
+ return new[]
{
- return new[]
- {
- new ValidationResult(ValidationResultType.Error,
- LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesScenario"),
- scenario, "StabilityZoneType", "ZoneTypeSafety", null)
- };
- }
+ new ValidationResult(ValidationResultType.Error,
+ LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesScenario"),
+ scenario, "StabilityZoneType", "ZoneTypeSafety", null)
+ };
}
}
else
@@ -2325,18 +2319,6 @@
{
nameValuePairs.Add(LocationParameterNames.RequiredSafetyFactorPiping, ModelFactors.RequiredSafetyFactorPiping.Value.ToString(numberFormatInfo));
}
- if (ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope != null)
- {
- nameValuePairs.Add(LocationParameterNames.RequiredProbabilityOfFailureStabilityInnerslope, ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.Value.ToString(numberFormatInfo));
- }
- if (ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope != null)
- {
- nameValuePairs.Add(LocationParameterNames.RequiredProbabilityOfFailureStabilityOuterslope, ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope.Value.ToString(numberFormatInfo));
- }
- if (ModelFactors.RequiredProbabilityOfFailurePiping != null)
- {
- nameValuePairs.Add(LocationParameterNames.RequiredProbabilityOfFailurePiping, ModelFactors.RequiredProbabilityOfFailurePiping.Value.ToString(numberFormatInfo));
- }
nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString());
nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo));
@@ -2765,18 +2747,6 @@
{
ModelFactors.RequiredSafetyFactorPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
}
- if (parameterName.Equals(LocationParameterNames.RequiredProbabilityOfFailureStabilityInnerslope))
- {
- ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
- if (parameterName.Equals(LocationParameterNames.RequiredProbabilityOfFailureStabilityOuterslope))
- {
- ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
- if (parameterName.Equals(LocationParameterNames.RequiredProbabilityOfFailurePiping))
- {
- ModelFactors.RequiredProbabilityOfFailurePiping = Convert.ToDouble(parameterValue, numberFormatInfo);
- }
if (parameterName.Equals(LocationParameterNames.StabilityZoneType))
{
StabilityZoneType = (MStabZonesType) Enum.Parse(typeof(MStabZonesType), parameterValue);
@@ -2999,12 +2969,6 @@
return false;
case "LayerHeightDeviation":
return false;
- case "ModelFactorRequiredProbabilityOfFailurePiping":
- return false;
- case "RequiredProbabilityOfFailureStabilityInnerSlope":
- return false;
- case "RequiredProbabilityOfFailureStabilityOuterSlope":
- return false;
case "ModelFactorRequiredSafetyFactorPiping":
return false; // Probably obsolete, because it is defined in the scenario
case "ModelFactorRequiredSafetyFactorStabilityInnerSlope":
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2471 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2471)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2472)
@@ -72,9 +72,6 @@
public double? SafetyFactorPiping { get; set; }
public double? SafetyFactorStabilityInnerSlope { get; set; }
public double? SafetyFactorStabilityOuterSlope { get; set; }
- public double? ProbabilityOfFailureStabilityInnerslope { get; set; }
- public double? ProbabilityOfFailureStabilityOuterslope { get; set; }
- public double? ProbabilityOfFailurePiping { get; set; }
public double? UpliftCriterionPiping { get; set; }
public double? UpliftCriterionStability { get; set; }
public double? DistanceToEntryPoint { get; set; }
@@ -173,9 +170,6 @@
int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorPipingColumnName);
int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName);
int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName);
- int colIndexcolIndexProbabilityOfFailureStabilityInnerslope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ProbabilityOfFailureStabilityInnerslopeColumnName);
- int colIndexcolIndexProbabilityOfFailureStabilityOuterslope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ProbabilityOfFailureStabilityOuterslopeColumnName);
- int colIndexProbabilityOfFailurePiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ProbabilityOfFailurePipingColumnName);
int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UpliftCriterionPipingColumnName);
int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UpliftCriterionStabilityColumnName);
int colIndexDistanceToEntryPoint = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DistanceToEntryPointColumnName);
@@ -380,21 +374,6 @@
colIndex = colIndexSafetyFactorStabilityOuterSlope;
locationRecord.SafetyFactorStabilityOuterSlope = Convert.ToDouble(csv[colIndexSafetyFactorStabilityOuterSlope]);
}
- if (colIndexcolIndexProbabilityOfFailureStabilityInnerslope > -1)
- {
- colIndex = colIndexcolIndexProbabilityOfFailureStabilityInnerslope;
- locationRecord.ProbabilityOfFailureStabilityInnerslope = Convert.ToDouble(csv[colIndexcolIndexProbabilityOfFailureStabilityInnerslope]);
- }
- if (colIndexcolIndexProbabilityOfFailureStabilityOuterslope > -1)
- {
- colIndex = colIndexcolIndexProbabilityOfFailureStabilityOuterslope;
- locationRecord.ProbabilityOfFailureStabilityOuterslope = Convert.ToDouble(csv[colIndexcolIndexProbabilityOfFailureStabilityOuterslope]);
- }
- if (colIndexProbabilityOfFailurePiping > -1)
- {
- colIndex = colIndexProbabilityOfFailurePiping;
- locationRecord.ProbabilityOfFailurePiping = Convert.ToDouble(csv[colIndexProbabilityOfFailurePiping]);
- }
if (colIndexUpliftCriterionPiping > -1)
{
colIndex = colIndexUpliftCriterionPiping;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r2471 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs (.../CsvImporterScenarios.cs) (revision 2471)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs (.../CsvImporterScenarios.cs) (revision 2472)
@@ -62,9 +62,6 @@
public double? WaterHeight { get; set; } //v
public double? WaterHeightLow { get; set; } //o
public double? DikeTableHeight { get; set; } //v
- public double ProbabilityOfFailureStabilityInnerSlope { get; set; } //o
- public double ProbabilityOfFailureStabilityOuterSlope { get; set; } //o
- public double ProbabilityOfFailurePiping { get; set; } //o
public double? PlLineOffsetBelowDikeTopAtRiver { get; set; } //o
public double? PlLineOffsetBelowDikeTopAtPolder { get; set; } //o
public double? PlLineOffsetBelowShoulderBaseInside { get; set; } //o
@@ -151,9 +148,6 @@
int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorPiping);
int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityInnerslope);
int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityOuterslope);
- int colIndexProbabilityOfFailurePiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.ProbabilityOfFailurePiping);
- int colIndexProbabilityOfFailureStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.ProbabilityOfFailureStabilityInnerslope);
- int colIndexProbabilityOfFailureStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.ProbabilityOfFailureStabilityOuterslope);
int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.UpliftCriterionPiping);
int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.UpliftCriterionStability);
@@ -218,21 +212,6 @@
colIndex = colIndexSafetyFactorStabilityOuterSlope;
scenario.SafetyFactorStabilityOuterSlope = Convert.ToDouble(csv[colIndex]);
}
- if (colIndexProbabilityOfFailurePiping > -1)
- {
- colIndex = colIndexProbabilityOfFailurePiping;
- scenario.ProbabilityOfFailurePiping = Convert.ToDouble(csv[colIndex]);
- }
- if (colIndexProbabilityOfFailureStabilityInnerSlope > -1)
- {
- colIndex = colIndexProbabilityOfFailureStabilityInnerSlope;
- scenario.ProbabilityOfFailureStabilityInnerSlope = Convert.ToDouble(csv[colIndex]);
- }
- if (colIndexProbabilityOfFailureStabilityOuterSlope > -1)
- {
- colIndex = colIndexProbabilityOfFailureStabilityOuterSlope;
- scenario.ProbabilityOfFailureStabilityOuterSlope = Convert.ToDouble(csv[colIndex]);
- }
if (colIndexUpliftCriterionPiping > -1)
{
colIndex = colIndexUpliftCriterionPiping;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2472)
@@ -369,33 +369,6 @@
public const string SafetyFactorStabilityOuterSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName;
///
- /// probability_of_failure_stability_innerslope
- /// CustomShape
- /// probability_of_failure_stability_innerslope.shp
- /// probstabi
- /// double
- ///
- public const string ProbabilityOfFailureStabilityInnerSlopeAttributeId = CsvColumnNames.ProbabilityOfFailureStabilityInnerslopeColumnName;
-
- ///
- /// probability_of_failure_stability_outerslope
- /// CustomShape
- /// probability_of_failure_stability_outerslope.shp
- /// probstabo
- /// double
- ///
- public const string ProbabilityOfFailureStabilityOuterSlopeAttributeId = CsvColumnNames.ProbabilityOfFailureStabilityOuterslopeColumnName;
-
- ///
- /// probability_of_failure_piping
- /// CustomShape
- /// probability_of_failure_piping.shp
- /// probpiping
- /// double
- ///
- public const string ProbabilityOfFailurePipingAttributeId = CsvColumnNames.ProbabilityOfFailurePipingColumnName;
-
- ///
/// uplift_criterion_piping
/// CustomShape
/// uplift_criterion_piping.shp
@@ -736,9 +709,6 @@
createItem(UsePlLineOffsetBelowDikeCrestMiddleAttributeId, PlLineShapeFileName, "UPLBlDCM", (t, value) => t.UsePlLineOffsetBelowDikeCrestMiddle = value.ToType()),
createItem(UsePlLineOffsetFactorBelowShoulderCrestAttributeId, PlLineShapeFileName, "UPLFBlSC", (t, value) => t.UsePlLineOffsetFactorBelowShoulderCrest = value.ToType()),
createItem(IntrusionVerticalWaterPressureAttributeId, "IntrusionVerticalWaterPressure.shp", "IVWP", (t, value) => t.IntrusionVerticalWaterPressure = LocationImportHelper.ToIntrusionVerticalWaterPressure(value)),
- createItem(ProbabilityOfFailureStabilityInnerSlopeAttributeId, "probability_of_failure_stability_innerslope.shp", "probstabi", (t, value) => t.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope = value.ToType()),
- createItem(ProbabilityOfFailureStabilityOuterSlopeAttributeId, "probability_of_failure_stability_outerslope.shp", "probstabo", (t, value) => t.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = value.ToType()),
- createItem(ProbabilityOfFailurePipingAttributeId, "probability_of_failure_piping.shp", "probpiping", (t, value) => t.ModelFactors.RequiredProbabilityOfFailurePiping = value.ToType()),
createItem(TrafficLoadAttributeId, "trafficload.shp", "TrafLoad", (t, value) => t.TrafficLoad = value.ToType() ),
createItem(TL_DegreeOfConsolidationAttributeId, "TL_DegreeOfConsolidation.shp", "TL_DegOfCo", (t, value) => t.TL_DegreeOfConsolidation = value.ToType() ),
createItem(SafetyFactorPipingAttributeId, "safety_factor_piping.shp", "fpiping", (t, value) => t.ModelFactors.RequiredSafetyFactorPiping = value.ToType()),
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
===================================================================
diff -u -r2466 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs (.../FailureMechanismeParamatersMStab.cs) (revision 2466)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs (.../FailureMechanismeParamatersMStab.cs) (revision 2472)
@@ -45,7 +45,6 @@
public double DikeTableHeight { get; set; }
public double MaxWaterLevel { get; set; }
public double RiverLevelDecimateHeight { get; set; }
- public double RequiredProbabilityOfFailure { get; set; }
public double TrafficLoad { get; set; }
///
/// Indicates whether in stability calculation a check on uplift will be performed before performin UpliftVan calculation.
@@ -76,24 +75,23 @@
///
/// Performs the Assignment
///
- ///
- public void Assign(FailureMechanismeParamatersMStab failureMechanismeParamatersMStab)
+ ///
+ public void Assign(FailureMechanismeParamatersMStab failureMechanismeParametersMStab)
{
- this.Location = failureMechanismeParamatersMStab.Location;
- this.SurfaceLine = failureMechanismeParamatersMStab.SurfaceLine;
- this.SoilProfile = failureMechanismeParamatersMStab.SoilProfile;
- this.SoilGeometry2DName = failureMechanismeParamatersMStab.SoilGeometry2DName;
- this.PLLines = failureMechanismeParamatersMStab.PLLines;
+ this.Location = failureMechanismeParametersMStab.Location;
+ this.SurfaceLine = failureMechanismeParametersMStab.SurfaceLine;
+ this.SoilProfile = failureMechanismeParametersMStab.SoilProfile;
+ this.SoilGeometry2DName = failureMechanismeParametersMStab.SoilGeometry2DName;
+ this.PLLines = failureMechanismeParametersMStab.PLLines;
- this.RiverLevel = failureMechanismeParamatersMStab.RiverLevel;
- this.DikeTableHeight = failureMechanismeParamatersMStab.DikeTableHeight;
- this.MaxWaterLevel = failureMechanismeParamatersMStab.MaxWaterLevel;
- this.RiverLevelDecimateHeight = failureMechanismeParamatersMStab.RiverLevelDecimateHeight;
- this.RequiredProbabilityOfFailure = failureMechanismeParamatersMStab.RequiredProbabilityOfFailure;
- this.TrafficLoad = failureMechanismeParamatersMStab.TrafficLoad; ;
- this.Design = failureMechanismeParamatersMStab.Design;
+ this.RiverLevel = failureMechanismeParametersMStab.RiverLevel;
+ this.DikeTableHeight = failureMechanismeParametersMStab.DikeTableHeight;
+ this.MaxWaterLevel = failureMechanismeParametersMStab.MaxWaterLevel;
+ this.RiverLevelDecimateHeight = failureMechanismeParametersMStab.RiverLevelDecimateHeight;
+ this.TrafficLoad = failureMechanismeParametersMStab.TrafficLoad; ;
+ this.Design = failureMechanismeParametersMStab.Design;
- this.MStabParameters.Assign(failureMechanismeParamatersMStab.MStabParameters);
+ this.MStabParameters.Assign(failureMechanismeParametersMStab.MStabParameters);
}
///
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs
===================================================================
diff -u -r2089 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs (.../ModelParameters.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs (.../ModelParameters.cs) (revision 2472)
@@ -46,9 +46,6 @@
RequiredSafetyFactorStabilityInnerSlope = 1.0,
RequiredSafetyFactorStabilityOuterSlope = 1.0,
RequiredSafetyFactorPiping = 1.0,
- RequiredProbabilityOfFailureStabilityInnerslope = 0.00000001,
- RequiredProbabilityOfFailureStabilityOuterslope = 0.00000001,
- RequiredProbabilityOfFailurePiping = 0.00000001,
UpliftCriterionPiping = 1.2,
UpliftCriterionStability = 1.2
};
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r2413 -r2472
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 2413)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 2472)
@@ -290,8 +290,6 @@
dpc.BuildPropertyControlTabForTypes(waterBoardPropertyControl,
typeof(WaterBoard), typeof(WaterBoardJob), typeof(DamProjectData));
dpc.BuildPropertyControlTabForTypes(new DikePropertyControl(), typeof(Dike), typeof(DikeJob));
- var schematizationFactorPropertyControl = new SchematizationFactorPropertyControl();
- dpc.BuildPropertyControlTabForTypes(schematizationFactorPropertyControl, typeof(DamProjectData));
dpc.BuildPropertyControlTabForTypes(damProjectCalculationSpecificationPropertyControl, typeof(DamProjectData));
dpc.BuildPropertyControlTabForTypes(designCalculationPropertyControl, typeof(CsvExportData), typeof(LocationJob));
}
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2472)
@@ -711,9 +711,6 @@
Assert.AreEqual(1.2, locationRecords[1].SafetyFactorPiping, tolerance);
Assert.AreEqual(1.3, locationRecords[1].SafetyFactorStabilityInnerSlope, tolerance);
Assert.AreEqual(1.4, locationRecords[1].SafetyFactorStabilityOuterSlope, tolerance);
- Assert.AreEqual(0.01, locationRecords[1].ProbabilityOfFailureStabilityInnerslope, tolerance);
- Assert.AreEqual(0.02, locationRecords[1].ProbabilityOfFailureStabilityOuterslope, tolerance);
- Assert.AreEqual(0.03, locationRecords[1].ProbabilityOfFailurePiping, tolerance);
Assert.AreEqual(1.1, locationRecords[1].UpliftCriterionPiping, tolerance);
Assert.AreEqual(1.2, locationRecords[1].UpliftCriterionStability, tolerance);
Assert.AreEqual(2.1, locationRecords[1].DistanceToEntryPoint, tolerance);
@@ -812,9 +809,6 @@
Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping);
Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope);
Assert.AreEqual(1.300, scenarioRecords[0].SafetyFactorStabilityOuterSlope);
- Assert.AreEqual(31.730, scenarioRecords[0].ProbabilityOfFailureStabilityInnerSlope);
- Assert.AreEqual(63.310, scenarioRecords[0].ProbabilityOfFailureStabilityOuterSlope);
- Assert.AreEqual(0.0, scenarioRecords[0].ProbabilityOfFailurePiping);
Assert.AreEqual(1.3, scenarioRecords[0].UpliftCriterionPiping);
Assert.AreEqual(0.0, scenarioRecords[0].UpliftCriterionStability);
@@ -826,9 +820,6 @@
Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping);
Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope);
Assert.AreEqual(1.400, scenarioRecords[1].SafetyFactorStabilityOuterSlope);
- Assert.AreEqual(32.730, scenarioRecords[1].ProbabilityOfFailureStabilityInnerSlope);
- Assert.AreEqual(3.310, scenarioRecords[1].ProbabilityOfFailureStabilityOuterSlope);
- Assert.AreEqual(1.0, scenarioRecords[1].ProbabilityOfFailurePiping);
Assert.AreEqual(1.3, scenarioRecords[1].UpliftCriterionPiping);
Assert.AreEqual(0.0, scenarioRecords[1].UpliftCriterionStability);
}
@@ -851,9 +842,6 @@
Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping);
Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope);
Assert.AreEqual(1.300, scenarioRecords[0].SafetyFactorStabilityOuterSlope);
- Assert.AreEqual(31.730, scenarioRecords[0].ProbabilityOfFailureStabilityInnerSlope);
- Assert.AreEqual(63.310, scenarioRecords[0].ProbabilityOfFailureStabilityOuterSlope);
- Assert.AreEqual(0.0, scenarioRecords[0].ProbabilityOfFailurePiping);
Assert.AreEqual(1.3, scenarioRecords[0].UpliftCriterionPiping);
Assert.AreEqual(0.0, scenarioRecords[0].UpliftCriterionStability);
Assert.AreEqual(1.1, scenarioRecords[0].PlLineOffsetBelowDikeTopAtRiver);
@@ -875,9 +863,6 @@
Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping);
Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope);
Assert.AreEqual(1.400, scenarioRecords[1].SafetyFactorStabilityOuterSlope);
- Assert.AreEqual(32.730, scenarioRecords[1].ProbabilityOfFailureStabilityInnerSlope);
- Assert.AreEqual(3.310, scenarioRecords[1].ProbabilityOfFailureStabilityOuterSlope);
- Assert.AreEqual(1.0, scenarioRecords[1].ProbabilityOfFailurePiping);
Assert.AreEqual(1.3, scenarioRecords[1].UpliftCriterionPiping);
Assert.AreEqual(0.0, scenarioRecords[1].UpliftCriterionStability);
Assert.AreEqual(0.1, scenarioRecords[1].PlLineOffsetBelowDikeTopAtRiver);
Fisheye: Tag 2472 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/SchematizationFactorPropertyControl.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 2472 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/SchematizationFactorPropertyControl.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
===================================================================
diff -u -r2440 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 2440)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 2472)
@@ -205,14 +205,7 @@
{
return true;
}
- }
- else
- {
- if (calculationResult.FailureProbability != null)
- {
- return true;
- }
- }
+ }
}
}
return false;
@@ -252,41 +245,6 @@
return res;
}
- ///
- /// Get highest porbability of failure of all scenarios
- ///
- ///
- private double GetHighestRealPropbabilityFromDesignScenarios()
- {
- var res = double.MinValue;
- List scenarios = Location.Scenarios;
- foreach (var scenario in scenarios)
- {
- foreach (var calculationResult in scenario.CalculationResults)
- {
- if (calculationResult.Calculation.Equals("FlowSlide"))
- {
- designRequiredFactor = 1.0; // This is a hack to make FlowSlide color display correct;
- // TODO: make a good generic method to display colored results
- }
- else
- {
- if (calculationResult.PipingFailureProbability != null)
- {
- if (calculationResult.PipingFailureProbability.Value > res &&
- calculationResult.PipingFailureProbability.Value < DamGlobalConstants.NoRunValue)
- {
- res = calculationResult.PipingFailureProbability.Value;
- }
- }
-
- }
- }
- }
- if (res == double.MinValue) res = DamGlobalConstants.NoRunValue;
- return res;
- }
-
[Data]
[Label("Safety factor")]
[XmlIgnore]
@@ -327,43 +285,7 @@
}
[Data]
- [Label("Failure probability")]
[XmlIgnore]
- [Format("F3")]
- public double FailureProbability
- {
- get
- {
- if (DamProjectType == DamProjectType.Calamity)
- {
- return DamGlobalConstants.NoRunValue;
- }
- if (DamProjectType == DamProjectType.Design)
- {
- return GetHighestRealPropbabilityFromDesignScenarios();
- }
- return DamGlobalConstants.NoRunValue;
- }
- }
-
- [Data]
- [Label("Required probability")]
- [Format("F3")]
- [XmlIgnore]
- public double RequiredProbability
- {
- get
- {
- if (DamProjectType == DamProjectType.Design)
- {
- return designRequiredFactor; // only for piping at the moment
- }
- return 1; //#Bka: for now return 1 if not piping probabilistic.
- }
- }
-
- [Data]
- [XmlIgnore]
[Label("Result")]
public JobResult Result
{
@@ -373,7 +295,7 @@
{
return JobResultInterpreter.GetJobResult(SafetyFactor, RequiredFactorOfSafety, true);
}
- return JobResultInterpreter.GetJobResult(FailureProbability, RequiredProbability, false);
+ return JobResult.NoRun;
}
}
@@ -462,10 +384,6 @@
ProbabilisticType == ProbabilisticType.Deterministic;
case "RequiredFactorOfSafety": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed &&
ProbabilisticType == ProbabilisticType.Deterministic;
- case "RequiredProbability": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed &&
- ProbabilisticType != ProbabilisticType.Deterministic;
- case "FailureProbability": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed &&
- ProbabilisticType != ProbabilisticType.Deterministic;
case "WaterLevelTimeSerie":
return HasLocationResults;
default: return true;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
===================================================================
diff -u -r2470 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2470)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2472)
@@ -95,13 +95,10 @@
private Dictionary stabilityUpliftSituations;
private Dictionary pipingResults;
- private Dictionary failureProbabilitiesStability;
private Dictionary safetyFactorsPiping;
- private Dictionary failureProbabilitiesPiping;
private Dictionary redesignedSurfaceLines;
private Dictionary resultMessages;
- private Dictionary safetyFactorsFlowSlide;
-
+
private string locationScenarioId;
private double? riverLevel;
private double? riverLevelLow;
@@ -164,10 +161,7 @@
calculationResult = CalculationResult.NoRun;
pipingResults = new Dictionary();
safetyFactorsPiping = new Dictionary();
- safetyFactorsFlowSlide = new Dictionary();
resultMessages = new Dictionary();
- failureProbabilitiesStability = new Dictionary();
- failureProbabilitiesPiping = new Dictionary();
redesignedSurfaceLines = new Dictionary();
calculationResults.Clear();
}
@@ -802,124 +796,6 @@
}
///
- /// Set Safety Factor Piping
- ///
- ///
- ///
- private void SetSafetyFactorPiping(Object objectAsKey, double? safetyFactor)
- {
- safetyFactorsPiping[objectAsKey] = safetyFactor;
- }
-
- ///
- /// Set Safety Factor Piping
- ///
- ///
- ///
- ///
- public void SetSafetyFactorPiping(SoilProfile1D soilProfile, string soilGeometry2DName, double? safetyFactor)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- SetSafetyFactorPiping(objectAsKey, safetyFactor);
- }
-
- ///
- /// Get Failure Probability piping
- ///
- ///
- ///
- private double? GetFailureProbabilityPiping(Object objectAsKey)
- {
- if (objectAsKey != null)
- {
- return failureProbabilitiesPiping.ContainsKey(objectAsKey) ? failureProbabilitiesPiping[objectAsKey] : null;
- }
- return null;
- }
-
- ///
- /// Get Failure Probability piping
- ///
- ///
- ///
- ///
- public double? GetFailureProbabilityPiping(SoilProfile1D soilProfile, string soilGeometry2DName)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- return GetFailureProbabilityPiping(objectAsKey);
- }
-
- ///
- /// Set Failure Probability piping
- ///
- ///
- ///
- ///
- public void SetFailureProbabilityPiping(SoilProfile1D soilProfile, string soilGeometry2DName, double? failureProbability)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- SetFailureProbabilityPiping(objectAsKey, failureProbability);
- }
-
- ///
- /// Set Failure Probability piping
- ///
- ///
- ///
- private void SetFailureProbabilityPiping(Object objectAsKey, double? failureProbability)
- {
- failureProbabilitiesPiping[objectAsKey] = failureProbability;
- }
-
- ///
- /// Get Safety Factor Piping
- ///
- ///
- ///
- ///
- public double? GetSafetyFactorFlowSlide(SoilProfile1D soilProfile, string soilGeometry2DName)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- return GetSafetyFactorFlowSlide(objectAsKey);
- }
-
- ///
- /// Get Safety Factor FlowSlide
- ///
- ///
- ///
- private double? GetSafetyFactorFlowSlide(Object objectAsKey)
- {
- if (objectAsKey != null)
- {
- return safetyFactorsFlowSlide.ContainsKey(objectAsKey) ? safetyFactorsFlowSlide[objectAsKey] : null;
- }
- return null;
- }
-
- ///
- /// Set Safety Factor FlowSlide
- ///
- ///
- ///
- private void SetSafetyFactorFlowSlide(Object objectAsKey, double? safetyFactor)
- {
- safetyFactorsFlowSlide[objectAsKey] = safetyFactor;
- }
-
- ///
- /// Set Safety Factor FlowSlide
- ///
- ///
- ///
- ///
- public void SetSafetyFactorFlowSlide(SoilProfile1D soilProfile, string soilGeometry2DName, double? safetyFactor)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- SetSafetyFactorFlowSlide(objectAsKey, safetyFactor);
- }
-
- ///
/// Get Result Message
///
///
@@ -968,54 +844,6 @@
}
///
- /// Return probability stability
- ///
- ///
- ///
- private double? GetFailureProbabilityStability(Object objectAsKey)
- {
- if (objectAsKey != null)
- {
- return failureProbabilitiesStability.ContainsKey(objectAsKey) ? failureProbabilitiesStability[objectAsKey] : null;
- }
- return null;
- }
-
- ///
- /// Return probability stability
- ///
- ///
- ///
- ///
- public double? GetFailureProbabilityStability(SoilProfile1D soilProfile, string soilGeometry2DName)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- return GetFailureProbabilityStability(objectAsKey);
- }
-
- ///
- /// Set probability stability
- ///
- ///
- ///
- private void SetFailureProbabilityStability(Object objectAsKey, double? failureProbability)
- {
- failureProbabilitiesStability[objectAsKey] = failureProbability;
- }
-
- ///
- /// Set probability stability
- ///
- ///
- ///
- ///
- public void SetFailureProbabilityStability(SoilProfile1D soilProfile, string soilGeometry2DName, double? failureProbability)
- {
- Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
- SetFailureProbabilityStability(objectAsKey, failureProbability);
- }
-
- ///
/// Get Redesigned surfaceline
///
///
@@ -1112,14 +940,12 @@
///
public override string ToString()
{
- return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} SafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} ProbabilityOfFailureStabilityInnerslope={7} ProbabilityOfFailurePiping={8} PlLineOffsetBelowDikeTopAtRiver={9} PlLineOffsetBelowDikeToeAtPolder={10} PlLineOffsetBelowDikeTopAtPolder={11} PlLineOffsetBelowShoulderBaseInside={12} UsePlLineOffsetBelowDikeCrestMiddle {13} PlLineOffsetBelowDikeCrestMiddle {14} UsePlLineOffsetFactorBelowShoulderCrest {15} PlLineOffsetFactorBelowShoulderCrest {16} HeadPl3={17} HeadPl4={18}",
+ return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} SafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} PlLineOffsetBelowDikeTopAtRiver={7} PlLineOffsetBelowDikeToeAtPolder={8} PlLineOffsetBelowDikeTopAtPolder={9} PlLineOffsetBelowShoulderBaseInside={10} UsePlLineOffsetBelowDikeCrestMiddle {11} PlLineOffsetBelowDikeCrestMiddle {12} UsePlLineOffsetFactorBelowShoulderCrest {13} PlLineOffsetFactorBelowShoulderCrest {14} HeadPl3={15} HeadPl4={16}",
Location.Name, LocationScenarioID, RiverLevel,
RiverLevelLow.HasValue ? RiverLevelLow.ToString() : "?",
DikeTableHeight.HasValue ? DikeTableHeight.ToString() : "?",
ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString() : "?",
ModelFactors.RequiredSafetyFactorStabilityOuterSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString() : "?",
- ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.HasValue ? ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.ToString() : "?",
- ModelFactors.RequiredProbabilityOfFailurePiping.HasValue ? ModelFactors.RequiredProbabilityOfFailurePiping.ToString() : "?",
PlLineOffsetBelowDikeTopAtRiver.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?",
PlLineOffsetBelowDikeToeAtPolder.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?",
PlLineOffsetBelowDikeTopAtPolder.HasValue ? PlLineOffsetBelowDikeTopAtPolder.ToString() : "?",
@@ -1164,18 +990,6 @@
{
nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorPiping, ModelFactors.RequiredSafetyFactorPiping.Value.ToString(numberFormatInfo));
}
- if (ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope != null)
- {
- nameValuePairs.Add(ScenarioParameterNames.RequiredProbabilityOfFailureStabilityInnerslope, ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.Value.ToString(numberFormatInfo));
- }
- if (ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope != null)
- {
- nameValuePairs.Add(ScenarioParameterNames.RequiredProbabilityOfFailureStabilityOuterslope, ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope.Value.ToString(numberFormatInfo));
- }
- if (ModelFactors.RequiredProbabilityOfFailurePiping != null)
- {
- nameValuePairs.Add(ScenarioParameterNames.RequiredProbabilityOfFailurePiping, ModelFactors.RequiredProbabilityOfFailurePiping.Value.ToString(numberFormatInfo));
- }
if (ModelFactors.UpliftCriterionPiping != null)
{
nameValuePairs.Add(ScenarioParameterNames.UpliftCriterionPiping, ModelFactors.UpliftCriterionPiping.Value.ToString(numberFormatInfo));
@@ -1246,12 +1060,6 @@
ModelFactors.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorPiping))
ModelFactors.RequiredSafetyFactorPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
- if (parameterName.Equals(ScenarioParameterNames.RequiredProbabilityOfFailureStabilityInnerslope))
- ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope = Convert.ToDouble(parameterValue, numberFormatInfo);
- if (parameterName.Equals(ScenarioParameterNames.RequiredProbabilityOfFailureStabilityOuterslope))
- ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = Convert.ToDouble(parameterValue, numberFormatInfo);
- if (parameterName.Equals(ScenarioParameterNames.RequiredProbabilityOfFailurePiping))
- ModelFactors.RequiredProbabilityOfFailurePiping = Convert.ToDouble(parameterValue, numberFormatInfo);
if (parameterName.Equals(ScenarioParameterNames.UpliftCriterionPiping))
ModelFactors.UpliftCriterionPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
if (parameterName.Equals(ScenarioParameterNames.UpliftCriterionStability))
@@ -1282,8 +1090,6 @@
{
switch (property)
{
- case "RequiredProbabilityOfFailurePiping": return calculationResults != null && calculationResults.Count > 0 &&
- calculationResults[0].ProbabilisticType != ProbabilisticType.Deterministic;
default: return true;
}
}
@@ -1345,9 +1151,6 @@
public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope";
public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope";
public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping";
- public const string RequiredProbabilityOfFailureStabilityInnerslope = "RequiredProbabilityOfFailureStabilityInnerslope";
- public const string RequiredProbabilityOfFailureStabilityOuterslope = "RequiredProbabilityOfFailureStabilityOuterslope";
- public const string RequiredProbabilityOfFailurePiping = "RequiredProbabilityOfFailurePiping";
public const string UpliftCriterionPiping = "UpliftCriterionPiping";
public const string UpliftCriterionStability = "UpliftCriterionStability";
public const string PlLineOffsetBelowDikeTopAtRiver = "PLLineOffsetBelowDikeTopAtRiver";
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r2440 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2440)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2472)
@@ -59,10 +59,8 @@
private Scenario scenario;
private SoilProfile1D soilProfile;
private string soilGeometry2DName;
- private double? failureProbabilityPiping;
private double? localPipingExitPointX;
private double? safetyFactorStability;
- private double? failureProbabilityStability;
private double? zone1SafetyFactorStability;
private double? localZone1EntryPointX;
private double? localZone1ExitPointX;
@@ -637,17 +635,6 @@
set { safetyFactorStability = value; }
}
- [CsvExportColumn("StabilityFailureProbability", 25)]
- [Format("F3")]
- [Unit(UnitType.None)]
- [ReadOnly(true)]
- [Browsable(false)]
- public double? StabilityFailureProbability
- {
- get { return failureProbabilityStability; }
- set { failureProbabilityStability = value; }
- }
-
[CsvExportColumn("RequiredSafetyFactorStabilityInnerSlope", 26)]
[Format("F3")]
[Unit(UnitType.None)]
@@ -732,17 +719,6 @@
}
}
- [CsvExportColumn("PipingFailureProbability", 32)]
- [Format("F3")]
- [Unit(UnitType.None)]
- [ReadOnly(true)]
- [Browsable(false)]
- public double? PipingFailureProbability
- {
- get { return failureProbabilityPiping; }
- set { failureProbabilityPiping = value; }
- }
-
[CsvExportColumn("DikeLength", 33)]
[Format("F3")]
[PropertyOrder(4, 1)]
@@ -1962,31 +1938,6 @@
}
[Format("F3")]
- [PropertyOrder(2, 5)]
- [Unit(UnitType.None)]
- [ReadOnly(true)]
- [XmlIgnore]
- public double? FailureProbability
- {
- get
- {
- double? res = null;
- switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
- {
- case FailureMechanismSystemType.HorizontalBalance:
- case FailureMechanismSystemType.StabilityOutside:
- case FailureMechanismSystemType.StabilityInside:
- res = StabilityFailureProbability;
- break;
- case FailureMechanismSystemType.Piping:
- res = PipingFailureProbability;
- break;
- }
- return res;
- }
- }
-
- [Format("F3")]
[PropertyOrder(2, 10)]
[Unit(UnitType.None)]
[ReadOnly(true)]
@@ -2436,10 +2387,6 @@
return probabilisticType == ProbabilisticType.Deterministic;
case "SafetyFactor":
return probabilisticType == ProbabilisticType.Deterministic;
- case "FailureProbability":
- return probabilisticType == ProbabilisticType.Probabilistic || probabilisticType == ProbabilisticType.ProbabilisticFragility;
- case "RequiredFailureProbability":
- return probabilisticType == ProbabilisticType.Probabilistic || probabilisticType == ProbabilisticType.ProbabilisticFragility;
case "PipingModel":
return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
case "PipingFactor":
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd
===================================================================
diff -u -r2089 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 2472)
@@ -170,8 +170,6 @@
-
-
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2472)
@@ -332,9 +332,6 @@
location1.LayerHeightDistribution = DistributionType.LogNormal;
location1.LayerHeightDeviation = 1.15;
location1.DistanceToEntryPoint = 1.16;
- location1.ModelFactors.RequiredProbabilityOfFailurePiping = 0.01;
- location1.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope = 0.02;
- location1.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = 0.03;
location1.ModelFactors.RequiredSafetyFactorPiping = 1.11;
location1.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.12;
location1.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.13;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r2466 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2466)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 2472)
@@ -264,7 +264,6 @@
-
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2472)
@@ -281,21 +281,6 @@
public const string RequiredSafetyFactorPipingColumnName = ModelFactorCsvIdentifiers.SafetyFactorPiping;
///
- /// probability_of_failure_stability_innerslope
- ///
- public const string ProbabilityOfFailureStabilityInnerslopeColumnName = ModelFactorCsvIdentifiers.ProbabilityOfFailureStabilityInnerslope;
-
- ///
- /// probability_of_failure_stability_outerslope
- ///
- public const string ProbabilityOfFailureStabilityOuterslopeColumnName = ModelFactorCsvIdentifiers.ProbabilityOfFailureStabilityOuterslope;
-
- ///
- /// probability_of_failure_piping
- ///
- public const string ProbabilityOfFailurePipingColumnName = ModelFactorCsvIdentifiers.ProbabilityOfFailurePiping;
-
- ///
/// uplift_criterion_piping
///
public const string UpliftCriterionPipingColumnName = ModelFactorCsvIdentifiers.UpliftCriterionPiping;
Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r2422 -r2472
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2422)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2472)
@@ -127,8 +127,6 @@
DikeTableHeight = 0.0,
ModelFactors = new ModelFactors
{
- RequiredProbabilityOfFailureStabilityInnerslope = 1.0e-08,
- RequiredProbabilityOfFailureStabilityOuterslope = 1.0e-08,
UpliftCriterionPiping = 1.2,
UpliftCriterionStability = 1.2,
Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2472)
@@ -224,9 +224,6 @@
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);
- Assert.AreEqual(0.01, location.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.Value, tolerance);
- Assert.AreEqual(0.02, location.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope.Value, tolerance);
- Assert.AreEqual(0.03, location.ModelFactors.RequiredProbabilityOfFailurePiping.Value, tolerance);
Assert.AreEqual(1.1, location.ModelFactors.UpliftCriterionPiping.Value, tolerance);
Assert.AreEqual(1.2, location.ModelFactors.UpliftCriterionStability.Value, tolerance);
Assert.AreEqual(2.1, location.DistanceToEntryPoint, tolerance);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
===================================================================
diff -u -r2089 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs (.../ModelFactors.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs (.../ModelFactors.cs) (revision 2472)
@@ -28,9 +28,6 @@
public virtual double? RequiredSafetyFactorStabilityInnerSlope { get; set; }
public virtual double? RequiredSafetyFactorStabilityOuterSlope { get; set; }
public virtual double? RequiredSafetyFactorPiping { get; set; }
- public virtual double? RequiredProbabilityOfFailureStabilityInnerslope { get; set; }
- public virtual double? RequiredProbabilityOfFailureStabilityOuterslope { get; set; }
- public virtual double? RequiredProbabilityOfFailurePiping { get; set; }
public virtual double? UpliftCriterionPiping { get; set; }
public virtual double? UpliftCriterionStability { get; set; }
@@ -44,9 +41,6 @@
RequiredSafetyFactorStabilityInnerSlope,
RequiredSafetyFactorStabilityOuterSlope,
RequiredSafetyFactorPiping,
- RequiredProbabilityOfFailureStabilityInnerslope,
- RequiredProbabilityOfFailureStabilityOuterslope,
- RequiredProbabilityOfFailurePiping,
UpliftCriterionPiping,
UpliftCriterionStability
};
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
===================================================================
diff -u -r2466 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2466)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2472)
@@ -114,9 +114,7 @@
public enum PLLineAssignment
{
NoPLLines,
- ExpertKnowledge,
- DikeFlow,
- OrginalPLLines
+ ExpertKnowledge
}
public enum SoilProfileType
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2470 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2470)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2472)
@@ -657,9 +657,6 @@
RequiredSafetyFactorStabilityInnerSlope = scenarioRecord.SafetyFactorStabilityInnerSlope,
RequiredSafetyFactorStabilityOuterSlope = scenarioRecord.SafetyFactorStabilityOuterSlope,
RequiredSafetyFactorPiping = scenarioRecord.SafetyFactorPiping,
- RequiredProbabilityOfFailureStabilityInnerslope = scenarioRecord.ProbabilityOfFailureStabilityInnerSlope,
- RequiredProbabilityOfFailureStabilityOuterslope = scenarioRecord.ProbabilityOfFailureStabilityOuterSlope,
- RequiredProbabilityOfFailurePiping = scenarioRecord.ProbabilityOfFailurePiping,
UpliftCriterionPiping = scenarioRecord.UpliftCriterionPiping,
UpliftCriterionStability = scenarioRecord.UpliftCriterionStability
},
@@ -756,9 +753,6 @@
location.HeadPL2 = locationRecord.HeadPl2;
location.HeadPl3 = locationRecord.HeadPl3;
location.HeadPl4 = locationRecord.HeadPl4;
- location.ModelFactors.RequiredProbabilityOfFailurePiping = locationRecord.ProbabilityOfFailurePiping;
- location.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope = locationRecord.ProbabilityOfFailureStabilityInnerslope;
- location.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = locationRecord.ProbabilityOfFailureStabilityOuterslope;
location.ModelFactors.RequiredSafetyFactorPiping = locationRecord.SafetyFactorPiping;
location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = locationRecord.SafetyFactorStabilityInnerSlope;
location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = locationRecord.SafetyFactorStabilityOuterSlope;
Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r2238 -r2472
--- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 2238)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 2472)
@@ -199,12 +199,6 @@
UserControl
-
- UserControl
-
-
- SchematizationFactorPropertyControl.cs
-
UserControl
@@ -315,9 +309,6 @@
-
- SchematizationFactorPropertyControl.cs
-
DamNewProjectDialog.cs
Designer
Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs
===================================================================
diff -u -r2468 -r2472
--- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2468)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2472)
@@ -215,9 +215,6 @@
PlLineOffsetBelowDikeToeAtPolder = doubleInitialValue,
ModelFactors = new ModelFactors()
{
- RequiredProbabilityOfFailureStabilityInnerslope = doubleInitialValue,
- RequiredProbabilityOfFailureStabilityOuterslope = doubleInitialValue,
- RequiredProbabilityOfFailurePiping = doubleInitialValue,
RequiredSafetyFactorPiping = doubleInitialValue,
RequiredSafetyFactorStabilityInnerSlope = doubleInitialValue,
RequiredSafetyFactorStabilityOuterSlope = doubleInitialValue,
@@ -298,9 +295,6 @@
Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeTopAtPolder);
Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowShoulderBaseInside);
Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeToeAtPolder);
- Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope);
- Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope);
- Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredProbabilityOfFailurePiping);
Assert.AreEqual(doubleTestValue, location.TrafficLoad);
Assert.AreEqual(doubleTestValue, location.TL_DegreeOfConsolidation);
Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredSafetyFactorPiping);
@@ -464,9 +458,6 @@
PlLineOffsetBelowDikeToeAtPolder = doubleInitialValue,
ModelFactors = new ModelFactors()
{
- RequiredProbabilityOfFailureStabilityInnerslope = doubleInitialValue,
- RequiredProbabilityOfFailureStabilityOuterslope = doubleInitialValue,
- RequiredProbabilityOfFailurePiping = doubleInitialValue,
RequiredSafetyFactorPiping = doubleInitialValue,
RequiredSafetyFactorStabilityInnerSlope = doubleInitialValue,
RequiredSafetyFactorStabilityOuterSlope = doubleInitialValue,
@@ -544,9 +535,6 @@
Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeTopAtPolder);
Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowShoulderBaseInside);
Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeToeAtPolder);
- Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope);
- Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope);
- Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredProbabilityOfFailurePiping);
Assert.AreEqual(doubleTestValue, location.TrafficLoad);
Assert.AreEqual(doubleTestValue, location.TL_DegreeOfConsolidation);
Assert.AreEqual(doubleTestValue, location.ModelFactors.RequiredSafetyFactorPiping);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ModelFactorCsvIdentifiers.cs
===================================================================
diff -u -r2089 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ModelFactorCsvIdentifiers.cs (.../ModelFactorCsvIdentifiers.cs) (revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ModelFactorCsvIdentifiers.cs (.../ModelFactorCsvIdentifiers.cs) (revision 2472)
@@ -39,21 +39,6 @@
public const string SafetyFactorStabilityOuterslope = "safety_factor_stability_outer_slope";
///
- /// probability_of_failure_stability_innerslope
- ///
- public const string ProbabilityOfFailureStabilityInnerslope = "probability_of_failure_stability_innerslope";
-
- ///
- /// probability_of_failure_stability_outerslope
- ///
- public const string ProbabilityOfFailureStabilityOuterslope = "probability_of_failure_stability_outerslope";
-
- ///
- /// probability_of_failure_piping
- ///
- public const string ProbabilityOfFailurePiping = "probability_of_failure_piping";
-
- ///
/// uplift_criterion_piping
///
public const string UpliftCriterionPiping = "uplift_criterion_piping";
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r2135 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 2135)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 2472)
@@ -47,7 +47,6 @@
private DamProjectType damProjectType = DamProjectType.Calamity;
private string damDataSourceFileName = "";
private List jobs = new List();
- private SchematizationFactorData schematizationFactorData = new SchematizationFactorData();
private List designCalculations = null;
private List dataSources = new List();
private string dataSourceEsriProjection = null;
@@ -302,17 +301,6 @@
}
}
- public SchematizationFactorData SchematizationFactorData
- {
- get { return schematizationFactorData; }
- set
- {
- DataEventPublisher.BeforeChange(this, "SchematizationFactorData");
- schematizationFactorData = value;
- DataEventPublisher.AfterChange(this, "SchematizationFactorData");
- }
- }
-
public CalculationResult Validate()
{
try
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r2470 -r2472
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2470)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2472)
@@ -112,7 +112,6 @@
-
@@ -238,8 +237,6 @@
-
-
@@ -308,16 +305,12 @@
-
-
-
-
@@ -337,7 +330,6 @@
-
@@ -346,7 +338,6 @@
-
@@ -404,17 +395,15 @@
-
+
-
-
Fisheye: Tag 2472 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/SchematizationFactor/SchematizationFactorData.cs'.
Fisheye: No comparison available. Pass `N' to diff?