Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilProfileReader.cs
===================================================================
diff -u -r801944e042197afab2cf3bb57359970479e286b3 -r78382ec129ddc7537096860680cef36f3796700d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilProfileReader.cs (.../StochasticSoilProfileReader.cs) (revision 801944e042197afab2cf3bb57359970479e286b3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilProfileReader.cs (.../StochasticSoilProfileReader.cs) (revision 78382ec129ddc7537096860680cef36f3796700d)
@@ -35,7 +35,7 @@
namespace Ringtoets.MacroStabilityInwards.IO.SoilProfile
{
///
- /// This class reads a DSoil database file and reads
+ /// This class reads a DSoil database file and reads
/// from this database.
///
public class StochasticSoilProfileReader : SqLiteDatabaseReaderBase
@@ -67,18 +67,18 @@
///
/// Reads the information for the next stochastic soil profile from the database
- /// and creates a instance of the information.
+ /// and creates a instance of the information.
///
- /// Identifier of the next
+ /// Identifier of the next
/// to look for.
- /// The next from the database, or null
+ /// The next from the database, or null
/// if no more stochastic soil profiles can be read.
/// Thrown when the database returned
/// incorrect values for required properties.
/// Rows are being read in ascending order based on the database ID of the
/// stochastic soil model. Therefore once a stochastic soil model has been read already,
/// it will not be found with this method.
- public StochasticSoilProfile ReadStochasticSoilProfile(long stochasticSoilModelId)
+ public MacroStabilityInwardsStochasticSoilProfile ReadStochasticSoilProfile(long stochasticSoilModelId)
{
if (!HasNext)
{
@@ -91,7 +91,7 @@
}
try
{
- StochasticSoilProfile stochasticSoilProfile = ReadStochasticSoilProfileProbability();
+ MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = ReadStochasticSoilProfileProbability();
MoveToNextStochasticSoilModelId(stochasticSoilModelId);
return stochasticSoilProfile;
}
@@ -193,18 +193,18 @@
return Convert.ToInt64(dataReader[StochasticSoilProfileTableColumns.StochasticSoilModelId]);
}
- private StochasticSoilProfile ReadStochasticSoilProfileProbability()
+ private MacroStabilityInwardsStochasticSoilProfile ReadStochasticSoilProfileProbability()
{
object valueProbability = dataReader[StochasticSoilProfileTableColumns.Probability];
double probability = valueProbability.Equals(DBNull.Value) ? 0 : Convert.ToDouble(valueProbability);
- StochasticSoilProfile soilProfile1DId = ReadSoilProfile1DId(probability);
+ MacroStabilityInwardsStochasticSoilProfile soilProfile1DId = ReadSoilProfile1DId(probability);
if (soilProfile1DId != null)
{
return soilProfile1DId;
}
- StochasticSoilProfile soilProfile2DId = ReadSoilProfile2DId(probability);
+ MacroStabilityInwardsStochasticSoilProfile soilProfile2DId = ReadSoilProfile2DId(probability);
if (soilProfile2DId != null)
{
return soilProfile2DId;
@@ -215,24 +215,24 @@
throw new StochasticSoilProfileReadException(message);
}
- private StochasticSoilProfile ReadSoilProfile2DId(double probability)
+ private MacroStabilityInwardsStochasticSoilProfile ReadSoilProfile2DId(double probability)
{
object valueSoilProfile2DId = dataReader[StochasticSoilProfileTableColumns.SoilProfile2DId];
if (!valueSoilProfile2DId.Equals(DBNull.Value))
{
long soilProfileId = Convert.ToInt64(valueSoilProfile2DId);
- return new StochasticSoilProfile(probability, SoilProfileType.SoilProfile2D, soilProfileId);
+ return new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile2D, soilProfileId);
}
return null;
}
- private StochasticSoilProfile ReadSoilProfile1DId(double probability)
+ private MacroStabilityInwardsStochasticSoilProfile ReadSoilProfile1DId(double probability)
{
object valueSoilProfile1DId = dataReader[StochasticSoilProfileTableColumns.SoilProfile1DId];
if (!valueSoilProfile1DId.Equals(DBNull.Value))
{
long soilProfileId = Convert.ToInt64(valueSoilProfile1DId);
- return new StochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, soilProfileId);
+ return new MacroStabilityInwardsStochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, soilProfileId);
}
return null;
}