Index: dam engine/trunk/Xsds Liquid/DamDesignResult.xsd
===================================================================
diff -u -r444 -r450
--- dam engine/trunk/Xsds Liquid/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 444)
+++ dam engine/trunk/Xsds Liquid/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 450)
@@ -6,16 +6,16 @@
-
+
-
-
+
+
@@ -29,8 +29,8 @@
-
-
+
+
@@ -39,16 +39,16 @@
-
+
-
-
+
+
@@ -64,16 +64,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs
===================================================================
diff -u -r404 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs (.../DamProjectCalculatorCsvExportDataBuilder.cs) (revision 404)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs (.../DamProjectCalculatorCsvExportDataBuilder.cs) (revision 450)
@@ -84,17 +84,14 @@
private DesignResult Build(SoilGeometryProbability soilGeometryProbability, StabilityKernelType kernelType, int index)
{
- var data = new DesignResult(
+ var data = new DesignResult(
Message.ToString(),
FailureMechanismSystemType,
Scenario,
soilGeometryProbability.SoilProfile,
soilGeometryProbability.SoilGeometry2DName,
AnalysisType,
- index,
- ProbabilisticType);
- //data.SelectedStabilityKernelType = kernelType; #Bka
-
+ index);
Message.Clear();
return data;
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/Stochast.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/Stochast.cs (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/Stochast.cs (revision 450)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the DAM Engine.
+//
+// The DAM Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.DamEngine.Data.General.TimeSeries
+{
+ public class Stochast
+ {
+ public Stochast()
+ {
+ }
+
+ public double Mean { get; set; }
+ public double StandardDeviation { get; set; }
+ public int Distribution { get; set; }
+ }
+}
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs
===================================================================
diff -u -r444 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 444)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 450)
@@ -126,9 +126,8 @@
/// Name of the soil geometry2 d.
/// Type of the analysis.
/// Index of the nwo result.
- /// Type of the probabilistic.
public DesignResult(string id, DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification, DesignScenario scenario, SoilProfile1D soilProfile,
- string soilGeometry2DName, AnalysisType analysisType, int nwoResultIndex, ProbabilisticType probabilisticType)
+ string soilGeometry2DName, AnalysisType analysisType, int nwoResultIndex)
{
this.id = id;
xrd = scenario.Location.XRd;
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs
===================================================================
diff -u -r334 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs (.../LocationResult.cs) (revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs (.../LocationResult.cs) (revision 450)
@@ -28,13 +28,9 @@
{
private TimeSerie stabilityTimeSerie = new TimeSerie();
private TimeSerie pipingTimeSerie = new TimeSerie();
- private RWScenariosResult rwScenariosResult = null;
- private RWSchematizationFactorsResult schematizationFactorsResult = null;
+ private RWScenariosResult rwScenariosResult;
+ private RWSchematizationFactorsResult schematizationFactorsResult;
- public LocationResult()
- {
- }
-
public virtual TimeSerie StabilityTimeSerie
{
get { return stabilityTimeSerie; }
Index: dam engine/trunk/Xsds Liquid/DamUpliftSituation.xsd
===================================================================
diff -u
--- dam engine/trunk/Xsds Liquid/DamUpliftSituation.xsd (revision 0)
+++ dam engine/trunk/Xsds Liquid/DamUpliftSituation.xsd (revision 450)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r445 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 445)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 450)
@@ -612,8 +612,7 @@
soilProfileProbability.SoilProfile,
soilProfileProbability.SoilGeometry2DName,
DamProjectCalculationSpecification.SelectedAnalysisType,
- 0,
- damProjectData.DamProjectCalculationSpecification.SelectedProbabilisticType);
+ 0);
scenario.CalculationResults.Add(resultRecord);
scenario.Errors.Add(errorMessage);
scenario.CalculationResult = CalculationResult.RunFailed;
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/NwoDesignResults.cs
===================================================================
diff -u -r444 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/NwoDesignResults.cs (.../NwoDesignResults.cs) (revision 444)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/NwoDesignResults.cs (.../NwoDesignResults.cs) (revision 450)
@@ -27,14 +27,14 @@
public class NwoDesignResults
{
private string nwoId;
- private int resultIndex;
+ private int? resultIndex;
private double? locationXrdStart;
private double? locationYrdStart;
private double? locationZrdStart;
private double? locationXrdEnd;
private double? locationYrdEnd;
private double? locationZrdEnd;
- private int numberOfIterations;
+ private int? numberOfIterations;
private double? safetyFactor;
private double? zone1SafetyFactor;
private double? localZone1EntryPointX;
@@ -68,7 +68,7 @@
///
/// The index of the result.
///
- public int ResultIndex
+ public int? ResultIndex
{
get
{
@@ -194,7 +194,7 @@
///
/// The number of iterations.
///
- public int NumberOfIterations
+ public int? NumberOfIterations
{
get
{
Index: dam engine/trunk/Xsds Liquid/DamCalculationResults.xsd
===================================================================
diff -u -r444 -r450
--- dam engine/trunk/Xsds Liquid/DamCalculationResults.xsd (.../DamCalculationResults.xsd) (revision 444)
+++ dam engine/trunk/Xsds Liquid/DamCalculationResults.xsd (.../DamCalculationResults.xsd) (revision 450)
@@ -3,6 +3,7 @@
+
@@ -18,7 +19,7 @@
-
+
@@ -33,16 +34,16 @@
-
+
-
-
+
+
@@ -53,14 +54,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -80,7 +81,13 @@
-
+
+
+
+
+
+
+
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs
===================================================================
diff -u -r444 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 444)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 450)
@@ -29,7 +29,7 @@
///
public class StabilityDesignResults
{
- private int numberOfIterations;
+ private int? numberOfIterations;
private string resultMessage = "";
private double? safetyFactor;
private double? failureProbability;
@@ -48,7 +48,7 @@
///
/// The number of iterations.
///
- public int NumberOfIterations
+ public int? NumberOfIterations
{
get
{
Index: dam engine/trunk/Xsds Liquid/DamRWResult.xsd
===================================================================
diff -u -r379 -r450
--- dam engine/trunk/Xsds Liquid/DamRWResult.xsd (.../DamRWResult.xsd) (revision 379)
+++ dam engine/trunk/Xsds Liquid/DamRWResult.xsd (.../DamRWResult.xsd) (revision 450)
@@ -2,17 +2,17 @@
-
+
-
-
-
+
+
+
Index: dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd
===================================================================
diff -u -r406 -r450
--- dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd (.../DamRWScenarioResult.xsd) (revision 406)
+++ dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd (.../DamRWScenarioResult.xsd) (revision 450)
@@ -12,40 +12,40 @@
-
-
+
+
-
+
-
+
-
+
-
+
@@ -61,7 +61,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -89,9 +89,9 @@
-
-
-
+
+
+
@@ -101,46 +101,46 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -156,7 +156,7 @@
-
+
@@ -173,7 +173,7 @@
-
+
@@ -188,6 +188,6 @@
-
+
\ No newline at end of file
Index: dam engine/trunk/Xsds Liquid/DamTimeSerie.xsd
===================================================================
diff -u -r379 -r450
--- dam engine/trunk/Xsds Liquid/DamTimeSerie.xsd (.../DamTimeSerie.xsd) (revision 379)
+++ dam engine/trunk/Xsds Liquid/DamTimeSerie.xsd (.../DamTimeSerie.xsd) (revision 450)
@@ -5,11 +5,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -31,40 +31,40 @@
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r444 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 444)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 450)
@@ -99,6 +99,7 @@
+
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs
===================================================================
diff -u -r334 -r450
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 450)
@@ -32,16 +32,17 @@
public TimeSerieEntry(DateTime dateTime, double value)
{
- this.DateTime = dateTime;
- this.Value = value;
+ DateTime = dateTime;
+ Value = value;
}
public virtual DateTime DateTime { get; set; }
public virtual double Value { get; set; }
public virtual string BasisFileName { get; set; }
public string RelativeCalculationPathName { get; set; }
- //public Stochast StochastValue { get; set; } #Bka: for now just disable.
+ public Stochast StochastValue { get; set; }
+
public int Flag { get; set; }
public TimeSerieEntry GetShallowCopy()
@@ -63,7 +64,7 @@
var entry = this.GetShallowCopy();
try
{
- entry.Value = !this.Value.AlmostEquals(missingValue) ? function(this) : missingValue;
+ entry.Value = !Value.AlmostEquals(missingValue) ? function(this) : missingValue;
}
catch
{
@@ -74,11 +75,11 @@
public void Assign(TimeSerieEntry entry)
{
- this.DateTime = entry.DateTime;
- this.Value = entry.Value;
- this.BasisFileName = entry.BasisFileName;
- //this.StochastValue = entry.StochastValue; #Bka: for now just disable
- this.Flag = entry.Flag;
+ DateTime = entry.DateTime;
+ Value = entry.Value;
+ BasisFileName = entry.BasisFileName;
+ StochastValue = entry.StochastValue;
+ Flag = entry.Flag;
}
}