Index: Application/Ringtoets/src/Application.Ringtoets.Storage/FingerprintHelper.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/FingerprintHelper.cs (.../FingerprintHelper.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/FingerprintHelper.cs (.../FingerprintHelper.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -74,7 +74,7 @@
///
/// The first array, cannot be null.
/// The second array, cannot be null.
- /// True if the two fingerprints are equal, false otherwise.
+ /// true if the two fingerprints are equal, false otherwise.
public static bool AreEqual(byte[] array1, byte[] array2)
{
if (array1.Length != array2.Length)
Index: Core/Common/src/Core.Common.Base/Geometry/Math2D.cs
===================================================================
diff -u -ra1f0bed43a1bdeeda53ac505a77c065ca6fd7c12 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision a1f0bed43a1bdeeda53ac505a77c065ca6fd7c12)
+++ Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -158,7 +158,7 @@
///
/// The first point.
/// The second point.
- /// True when the points are equal. False otherwise.
+ /// true when the points are equal, false otherwise.
/// Thrown when or
/// is null.
public static bool AreEqualPoints(Point2D point1, Point2D point2)
@@ -353,7 +353,7 @@
/// The second 2D vector.
/// The vector from the tail of
/// to the tail of .
- /// True if the vectors are collinear, false otherwise.
+ /// true if the vectors are collinear, false otherwise.
private static bool AreCollinear(Vector vector1, Vector vector2, Vector tailsVector)
{
return Math.Abs(PerpDotProduct(vector1, tailsVector)) < epsilonForComparisons &&
Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs
===================================================================
diff -u -r8e74b5d6680386fce48486c8253b62331f7d7055 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 8e74b5d6680386fce48486c8253b62331f7d7055)
+++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -133,7 +133,7 @@
///
/// This method returns the result of the import action.
///
- /// True if the import was successful, false if otherwise.
+ /// true if the import was successful, false if otherwise.
/// Implementations of this method are allowed to throw exceptions of any kind.
protected abstract bool OnImport();
Index: Core/Common/src/Core.Common.Base/ObservableUniqueItemCollectionWithSourcePath.cs
===================================================================
diff -u -r569a286badd9b3494f5465cc2767a8cf6a77f618 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Base/ObservableUniqueItemCollectionWithSourcePath.cs (.../ObservableUniqueItemCollectionWithSourcePath.cs) (revision 569a286badd9b3494f5465cc2767a8cf6a77f618)
+++ Core/Common/src/Core.Common.Base/ObservableUniqueItemCollectionWithSourcePath.cs (.../ObservableUniqueItemCollectionWithSourcePath.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -106,8 +106,8 @@
/// Removes the first occurrence of in the collection.
///
/// The item of type to be removed.
- /// True if the was successfully removed from the collection;
- /// False if otherwise or if the was not found in the collection.
+ /// true if the was successfully removed from the collection;
+ /// false if otherwise or if the was not found in the collection.
public bool Remove(TElement item)
{
bool remove = collection.Remove(item);
Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs
===================================================================
diff -u -rf17fd54ecae5f97f74504318fd89aad3880fede4 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs (.../DataGridViewControl.cs) (revision f17fd54ecae5f97f74504318fd89aad3880fede4)
+++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs (.../DataGridViewControl.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -112,8 +112,8 @@
}
///
- /// Returns true when the is in edit mode.
- /// False otherwise.
+ /// Returns true when the is in edit mode,
+ /// false otherwise.
///
public bool IsCurrentCellInEditMode
{
Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyAttribute.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyAttribute.cs (.../DynamicReadOnlyAttribute.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyAttribute.cs (.../DynamicReadOnlyAttribute.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -44,7 +44,7 @@
///
/// The object.
/// The name of the property of .
- /// True if the property is read-only, false otherwise.
+ /// true if the property is read-only, false otherwise.
/// Thrown when
/// does not correspond to a public property of .
/// Thrown when there isn't a single method
Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs (.../DynamicReadOnlyValidationMethodAttribute.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs (.../DynamicReadOnlyValidationMethodAttribute.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -39,7 +39,7 @@
/// Required method signature when marking a method with .
///
/// The name of the property to be checked.
- /// True if the referred property should be read-only, false if it should be editable.
+ /// true if the referred property should be read-only, false if it should be editable.
public delegate bool IsPropertyReadOnly(string propertyName);
///
Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleAttribute.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -44,7 +44,7 @@
///
/// The object.
/// The name of the property of .
- /// True if the property is visible, false otherwise.
+ /// true if the property is visible, false otherwise.
/// Thrown when
/// does not correspond to a public property of .
/// Thrown when there isn't a single method
Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs (.../DynamicVisibleValidationMethodAttribute.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs (.../DynamicVisibleValidationMethodAttribute.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -39,7 +39,7 @@
/// Required method signature when marking a method with .
///
/// The name of the property to be checked.
- /// True if the referred property should be visible, false if it should be hidden.
+ /// true if the referred property should be visible, false if it should be hidden.
public delegate bool IsPropertyVisible(string propertyName);
///
Index: Core/Common/src/Core.Common.Gui/Commands/IStorageCommands.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Gui/Commands/IStorageCommands.cs (.../IStorageCommands.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Commands/IStorageCommands.cs (.../IStorageCommands.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -40,7 +40,7 @@
/// Checks whether the current project has unsaved changes. If so, these unsaved changes
/// will be handled.
///
- /// True if there were no unsaved changes or when the changes were
+ /// true if there were no unsaved changes or when the changes were
/// successfully handled, false if the unsaved changes were not handled.
bool HandleUnsavedChanges();
Index: Core/Common/src/Core.Common.Gui/Commands/IViewCommands.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Gui/Commands/IViewCommands.cs (.../IViewCommands.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Commands/IViewCommands.cs (.../IViewCommands.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -51,7 +51,7 @@
/// Indicates if a there are any views available for the application's selection.
///
/// The data object to open views for.
- /// True if there are any views for , false otherwise.
+ /// true if there are any views for , false otherwise.
bool CanOpenViewFor(object viewData);
}
}
\ No newline at end of file
Index: Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs
===================================================================
diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs (.../SqLiteDatabaseReaderBase.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c)
+++ Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs (.../SqLiteDatabaseReaderBase.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -111,7 +111,7 @@
/// Moves to and reads the next result set in multiple row-returning SQL command.
///
/// The to process.
- /// True if the command was successful and a new result set is available, false otherwise.
+ /// true if the command was successful and a new result set is available, false otherwise.
protected static bool MoveNext(IDataReader sqliteDataReader)
{
return sqliteDataReader.Read() || sqliteDataReader.NextResult() && sqliteDataReader.Read();
Index: Core/Common/src/Core.Common.Utils/Extensions/ComparableExtensions.cs
===================================================================
diff -u -r569a286badd9b3494f5465cc2767a8cf6a77f618 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Utils/Extensions/ComparableExtensions.cs (.../ComparableExtensions.cs) (revision 569a286badd9b3494f5465cc2767a8cf6a77f618)
+++ Core/Common/src/Core.Common.Utils/Extensions/ComparableExtensions.cs (.../ComparableExtensions.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -33,7 +33,7 @@
///
/// The first object.
/// The second object.
- /// True if is considered greater than ,
+ /// true if is considered greater than ,
/// false otherwise.
/// null is considered smaller than any other not-null value.
/// Thrown when object type of
@@ -57,7 +57,7 @@
///
/// The first object.
/// The second object.
- /// True if is considered smaller than ,
+ /// true if is considered smaller than ,
/// false otherwise.
/// null is considered smaller than any not-null value.
/// Thrown when object type of
@@ -78,7 +78,7 @@
/// Value to be checked.
/// First range value.
/// Second range value.
- /// True if falls within the inclusive bounds,
+ /// true if falls within the inclusive bounds,
/// false otherwise.
/// Thrown when object type of
/// is not the same as that of or .
Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -recb90789988e5dd12d9eeeb7e016b57551121089 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision ecb90789988e5dd12d9eeeb7e016b57551121089)
+++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -60,7 +60,7 @@
///
/// The type to check for.
/// Type to check.
- /// True if is the same type as ,
+ /// true if is the same type as ,
/// or has that as (one of) its supertypes.
///
public static bool Implements(this Type thisType)
@@ -73,7 +73,7 @@
///
/// Type to check.
/// The type to check for.
- /// True if is the same type as ,
+ /// true if is the same type as ,
/// or has that as (one of) its supertypes.
///
/// Thrown when is null.
Index: Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs (.../ShapeFileReaderBase.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs (.../ShapeFileReaderBase.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -74,7 +74,7 @@
/// Determines whether the specified attribute has been defined in the shapefile attributes.
///
/// Name of the attribute.
- /// True is the attribute is defined, false otherwise.
+ /// true is the attribute is defined, false otherwise.
/// This check is case-sensitive.
public bool HasAttribute(string attributeName)
{
Index: Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/DikeProfileDataReader.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/DikeProfileDataReader.cs (.../DikeProfileDataReader.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/DikeProfileDataReader.cs (.../DikeProfileDataReader.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -189,7 +189,7 @@
///
/// The text.
/// The line number.
- /// True if the text matches a VERSIE key-value pair and has been
+ /// true if the text matches a VERSIE key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the VERSIE key does
/// not represent a valid version code or has already been defined or the version
@@ -266,7 +266,7 @@
/// The text.
/// The data to be updated.
/// The line number.
- /// True if the text matches an ID key-value pair and has been
+ /// true if the text matches an ID key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the ID key does
/// not represent an id or has already been defined.
@@ -326,7 +326,7 @@
/// The text.
/// The data to be updated.
/// The line number.
- /// True if the text matches a RICHTING key-value pair and has been
+ /// true if the text matches a RICHTING key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the RICHTING key does
/// not represent a valid number or has already been defined or the orientation value
@@ -403,7 +403,7 @@
/// The text.
/// The data to be updated.
/// The line number.
- /// True if the text matches a DAM key-value pair and has been
+ /// true if the text matches a DAM key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the DAM key does
/// not represent a valid value or has already been defined.
@@ -468,7 +468,7 @@
/// The text.
/// The data to be updated.
/// The line number.
- /// True if the text matches a DAMWAND key-value pair and has been
+ /// true if the text matches a DAMWAND key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the DAMWAND key
/// does not represent a valid value or has already been defined.
@@ -533,7 +533,7 @@
/// The text.
/// The data to be updated.
/// The line number.
- /// True if the text matches a DAMHOOGTE key-value pair and has been
+ /// true if the text matches a DAMHOOGTE key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the DAMHOOGTE key
/// does not represent a valid number or has already been defined.
@@ -589,7 +589,7 @@
/// The text.
/// The data to be updated.
/// The line number.
- /// True if the text matches a KRUINHOOGTE key-value pair and has been
+ /// true if the text matches a KRUINHOOGTE key-value pair and has been
/// validated successfully; false otherwise.
/// The value after the KRUINHOOGTE key
/// does not represent a valid number or has already been defined.
@@ -646,7 +646,7 @@
/// The data to be updated.
/// The reader of the file.
/// The line number.
- /// True if the text matches a DIJK key-value pair and has been
+ /// true if the text matches a DIJK key-value pair and has been
/// validated successfully; false otherwise.
/// Thrown when
///
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -52,7 +52,7 @@
/// to set the newly
/// created .
/// The path of the hydraulic boundary database file to import from.
- /// True if the import was successful, false otherwise.
+ /// true if the import was successful, false otherwise.
/// Thrown when is null.
/// Thrown when:
///
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryLocationFilter.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryLocationFilter.cs (.../HydraulicBoundaryLocationFilter.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryLocationFilter.cs (.../HydraulicBoundaryLocationFilter.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -63,7 +63,7 @@
/// should be imported.
///
/// The name of the location.
- /// True if the location should be imported, false otherwise.
+ /// true if the location should be imported, false otherwise.
public bool ShouldInclude(long locationId)
{
int matchingIndex = locationsToFilterOut.BinarySearch(locationId);
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -1704,15 +1704,6 @@
}
///
- /// Looks up a localized string similar to Het uitlezen van de ondergrondschematisatie is mislukt..
- ///
- public static string SoilProfile1DReader_ReadSoilProfile_Failed_to_construct_profile_from_read_data {
- get {
- return ResourceManager.GetString("SoilProfile1DReader_ReadSoilProfile_Failed_to_construct_profile_from_read_data", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database..
///
public static string SoilProfileReader_Critical_Unexpected_value_on_column {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -844,9 +844,6 @@
Er zijn geen stochastische ondergrondmodellen gevonden die horen bij het faalmechanisme.
-
- Het uitlezen van de ondergrondschematisatie is mislukt.
-
Het stochastische ondergrondmodel met '{0}' als faalmechanisme type is niet ondersteund. Alleen stochastische ondergrondmodellen met '{1}' als faalmechanisme type zijn ondersteund.
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilProfile1DReader.cs
===================================================================
diff -u -rd0d3ed3067ec66c52283bd4d1c44011b1a412492 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilProfile1DReader.cs (.../SoilProfile1DReader.cs) (revision d0d3ed3067ec66c52283bd4d1c44011b1a412492)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilProfile1DReader.cs (.../SoilProfile1DReader.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -165,22 +165,11 @@
throw;
}
- try
- {
- MoveToNextProfile(criticalProperties.ProfileId);
- return new SoilProfile1D(criticalProperties.ProfileId,
- criticalProperties.ProfileName,
- properties.Bottom,
- soilLayers);
- }
- catch (ArgumentException exception)
- {
- MoveToNextProfile(criticalProperties.ProfileId);
- throw new SoilProfileReadException(
- Resources.SoilProfile1DReader_ReadSoilProfile_Failed_to_construct_profile_from_read_data,
- criticalProperties.ProfileName,
- exception);
- }
+ MoveToNextProfile(criticalProperties.ProfileId);
+ return new SoilProfile1D(criticalProperties.ProfileId,
+ criticalProperties.ProfileName,
+ properties.Bottom,
+ soilLayers);
}
private void PrepareReader()
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilProfile2DReader.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilProfile2DReader.cs (.../SoilProfile2DReader.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilProfile2DReader.cs (.../SoilProfile2DReader.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -174,39 +174,33 @@
var soilLayerGeometryLookup = new Dictionary();
long soilProfileId = criticalProperties.ProfileId;
+ RequiredProfileProperties properties;
try
{
- var properties = new RequiredProfileProperties(this, criticalProperties.ProfileName);
+ properties = new RequiredProfileProperties(this, criticalProperties.ProfileName);
var geometryReader = new SoilLayer2DGeometryReader();
for (var i = 1; i <= criticalProperties.LayerCount; i++)
{
ReadSoilLayerGeometryFrom(this, geometryReader, criticalProperties.ProfileName, soilLayerGeometryLookup);
MoveNext();
}
-
- return new SoilProfile2D(soilProfileId,
- criticalProperties.ProfileName,
- GetHierarchicallyOrderedSoilLayers(soilLayerGeometryLookup).ToArray(),
- GetPreconsolidationStresses(soilProfileId).ToArray())
- {
- IntersectionX = properties.IntersectionX
- };
}
catch (SoilProfileReadException)
{
MoveToNextProfile(soilProfileId);
throw;
}
- catch (ArgumentException exception)
+
+ MoveToNextProfile(soilProfileId);
+ return new SoilProfile2D(soilProfileId,
+ criticalProperties.ProfileName,
+ GetHierarchicallyOrderedSoilLayers(soilLayerGeometryLookup).ToArray(),
+ GetPreconsolidationStresses(soilProfileId).ToArray())
{
- MoveToNextProfile(soilProfileId);
- throw new SoilProfileReadException(
- Resources.SoilProfile1DReader_ReadSoilProfile_Failed_to_construct_profile_from_read_data,
- criticalProperties.ProfileName,
- exception);
- }
+ IntersectionX = properties.IntersectionX
+ };
}
///
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -54,7 +54,7 @@
///
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
public static bool Validate(string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{
var isValid = true;
Index: Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/ValidationRule.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/ValidationRule.cs (.../ValidationRule.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ValidationRules/ValidationRule.cs (.../ValidationRule.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -39,7 +39,7 @@
/// Checks if a value is NaN or Infinity.
///
/// The value which needs to be checked.
- /// Trueif is not a concrete number, false if otherwise.
+ /// trueif is not a concrete number, false if otherwise.
protected static bool IsNotConcreteNumber(double value)
{
return double.IsNaN(value) || double.IsInfinity(value);
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -55,7 +55,7 @@
///
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
public static bool Validate(string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{
var isValid = true;
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs
===================================================================
diff -u -r30baf70ea42def18e66d1ec3c71aa0e54a89229a -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 30baf70ea42def18e66d1ec3c71aa0e54a89229a)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -462,6 +462,32 @@
}
[Test]
+ public void ReadStochasticSoilModel_ModelWithStochasticProfilesWith1DProfilesLastProfileEmpty_ReturnsModelWithStochasticProfiles()
+ {
+ // Setup
+ string dbFile = Path.Combine(testDataPath, "modelWith1dProfilesLastProfileEmpty.soil");
+
+ using (var reader = new StochasticSoilModelReader(dbFile))
+ {
+ reader.Validate();
+
+ // Call
+ StochasticSoilModel model = reader.ReadStochasticSoilModel();
+
+ // Assert
+ Assert.AreEqual("43003_Piping", model.Name);
+ Assert.AreEqual(FailureMechanismType.Piping, model.FailureMechanismType);
+ Assert.AreEqual(2, model.StochasticSoilProfiles.Count);
+ var emptyProfile = (SoilProfile1D) model.StochasticSoilProfiles.First().SoilProfile;
+ var profileWithLayers = (SoilProfile1D) model.StochasticSoilProfiles.Last().SoilProfile;
+ CollectionAssert.IsEmpty(emptyProfile.Layers);
+ CollectionAssert.IsNotEmpty(profileWithLayers.Layers);
+ }
+
+ Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile));
+ }
+
+ [Test]
public void ReadStochasticSoilModel_ModelWithStochasticProfilesWith2DProfiles_ReturnsModelWithStochasticProfiles()
{
// Setup
@@ -497,6 +523,32 @@
}
[Test]
+ public void ReadStochasticSoilModel_ModelWithStochasticProfilesWith2DProfilesLastProfileEmpty_ReturnsModelWithStochasticProfiles()
+ {
+ // Setup
+ string dbFile = Path.Combine(testDataPath, "modelWith2dProfilesLastProfileEmpty.soil");
+
+ using (var reader = new StochasticSoilModelReader(dbFile))
+ {
+ reader.Validate();
+
+ // Call
+ StochasticSoilModel model = reader.ReadStochasticSoilModel();
+
+ // Assert
+ Assert.AreEqual("43003_Stability", model.Name);
+ Assert.AreEqual(FailureMechanismType.Stability, model.FailureMechanismType);
+ Assert.AreEqual(2, model.StochasticSoilProfiles.Count);
+ var emptyProfile = (SoilProfile2D) model.StochasticSoilProfiles.First().SoilProfile;
+ var profileWithLayers = (SoilProfile2D) model.StochasticSoilProfiles.Last().SoilProfile;
+ CollectionAssert.IsEmpty(emptyProfile.Layers);
+ CollectionAssert.IsNotEmpty(profileWithLayers.Layers);
+ }
+
+ Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile));
+ }
+
+ [Test]
public void ReadStochasticSoilModel_OtherFailureMechanism_ThrowsStochasticSoilModelException()
{
// Setup
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/modelWith1dProfilesLastProfileEmpty.soil
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/modelWith2dProfilesLastProfileEmpty.soil
===================================================================
diff -u
Binary files differ
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -53,7 +53,7 @@
///
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
public static bool Validate(string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{
var isValid = true;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -70,7 +70,7 @@
///
/// The for which to validate the values.
/// The for which to validate the values.
- /// True if has no validation errors; False otherwise.
+ /// true if has no validation errors; false otherwise.
public static bool Validate(GrassCoverErosionInwardsCalculation calculation, IAssessmentSection assessmentSection)
{
CalculationServiceHelper.LogValidationBegin();
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -46,7 +46,7 @@
/// The for which to validate the values.
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
/// Thrown when is null.
public static bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -r9368b3ac19481ec8b10dcea903ecdf0fab3048cf -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 9368b3ac19481ec8b10dcea903ecdf0fab3048cf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -46,7 +46,7 @@
/// the execution of the operation.
///
/// The for which to validate the values.
- /// False if contains validation errors; True otherwise.
+ /// false if contains validation errors; true otherwise.
/// Thrown when is null.
public static bool Validate(MacroStabilityInwardsCalculation calculation)
{
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs
===================================================================
diff -u -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2 -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -45,7 +45,7 @@
/// the execution of the operation.
///
/// The for which to validate the values.
- /// False if contains validation errors; True otherwise.
+ /// false if contains validation errors; true otherwise.
/// Thrown when is null.
public static bool Validate(PipingCalculation calculation)
{
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -75,7 +75,7 @@
/// database file which to validate.
/// The preprocessor directory to validate.
/// The name of the design water level property.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
/// Thrown when
/// or is null.
protected static bool ValidateWaveConditionsInput(WaveConditionsInput waveConditionsInput,
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -50,7 +50,7 @@
/// The for which to validate the values.
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
/// Thrown when is null.
public static bool Validate(StabilityStoneCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -re2892835ceb1c916be9a9122ba372858f20b981a
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a)
@@ -46,7 +46,7 @@
/// The for which to validate the values.
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
- /// True if there were no validation errors; False otherwise.
+ /// true if there were no validation errors; false otherwise.
/// Thrown when is null.
public static bool Validate(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{