Index: dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r459 -r460
--- dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 459)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 460)
@@ -143,7 +143,12 @@
return translationTable[inputIntrusionVerticalWaterPressure];
}
- public static int ConvertToOutputCalculationResult(CalculationResult damProjectType)
+ ///
+ /// Converts to output calculation result.
+ ///
+ /// Type of the dam project.
+ ///
+ public static int ConvertToOutputCalculationResult(CalculationResult calculationResult)
{
var translationTable = new Dictionary()
{
@@ -157,8 +162,30 @@
{CalculationResult.RunFailed, 7},
{CalculationResult.UnexpectedError, 8}
};
- return translationTable[damProjectType];
+ return translationTable[calculationResult];
}
+ ///
+ /// Converts to calculation result.
+ ///
+ /// The calculation result.
+ ///
+ public static CalculationResult ConvertToCalculationResult(int calculationResult)
+ {
+ var translationTable = new Dictionary()
+ {
+ {0, CalculationResult.NoRun},
+ {1, CalculationResult.Succeeded},
+ {2, CalculationResult.NoInput},
+ {3, CalculationResult.NoLicense},
+ {4, CalculationResult.UserAbort},
+ {5, CalculationResult.InvalidInputStructure},
+ {6, CalculationResult.InvalidInputData},
+ {7, CalculationResult.RunFailed},
+ {8, CalculationResult.UnexpectedError}
+ };
+ return translationTable[calculationResult];
+ }
+
}
}
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r459 -r460
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 459)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 460)
@@ -109,5 +109,20 @@
{
Assert.AreEqual(result, ConversionHelper.ConvertToOutputCalculationResult(calculationResult));
}
+
+ [Test]
+ [TestCase(CalculationResult.NoRun, 0)]
+ [TestCase(CalculationResult.Succeeded, 1)]
+ [TestCase(CalculationResult.NoInput, 2)]
+ [TestCase(CalculationResult.NoLicense, 3)]
+ [TestCase(CalculationResult.UserAbort, 4)]
+ [TestCase(CalculationResult.InvalidInputStructure, 5)]
+ [TestCase(CalculationResult.InvalidInputData, 6)]
+ [TestCase(CalculationResult.RunFailed, 7)]
+ [TestCase(CalculationResult.UnexpectedError, 8)]
+ public void CanConvertToCalculationResult(CalculationResult result, int calculationResult)
+ {
+ Assert.AreEqual(result, ConversionHelper.ConvertToCalculationResult(calculationResult));
+ }
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r459 -r460
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 459)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 460)
@@ -26,8 +26,16 @@
namespace Deltares.DamEngine.Interface
{
+ ///
+ /// Class to fill the output xml based on the results in DamProjectData
+ ///
public class FillXmlOutputFromDam
{
+ ///
+ /// Creates the output.
+ ///
+ /// The dam project data.
+ ///
public static Output CreateOutput(DamProjectData damProjectData)
{
// Echo of the input
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs
===================================================================
diff -u -r452 -r460
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 460)
@@ -109,9 +109,9 @@
///
/// Initializes a new instance of the class.
- /// Is only to be used by this.Clone(), nowhere else
+ /// Is only to be used by this.Clone() and in FillDamFromXmlOutput (used in tests), nowhere else
///
- internal DesignResult()
+ public DesignResult()
{
// only for Clone() method
}
@@ -126,8 +126,8 @@
/// Name of the soil geometry2 d.
/// Type of the analysis.
/// Index of the nwo result.
- public DesignResult(string id, DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification, DesignScenario scenario, SoilProfile1D soilProfile,
- string soilGeometry2DName, AnalysisType analysisType, int nwoResultIndex)
+ public DesignResult(string id, DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification,
+ DesignScenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName, AnalysisType analysisType, int nwoResultIndex)
{
this.id = id;
xrd = scenario.Location.XRd;