Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -2874,6 +2874,15 @@
}
///
+ /// Looks up a localized string similar to De schematisatie van de hoogte van het dwarsprofiel..
+ ///
+ public static string SurfaceLine_Description {
+ get {
+ return ResourceManager.GetString("SurfaceLine_Description", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Profielschematisatie.
///
public static string SurfaceLine_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -1125,4 +1125,7 @@
Profielschematisatie
+
+ De schematisatie van de hoogte van het dwarsprofiel.
+
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/CharacteristicPoints.cs
===================================================================
diff -u -r5579d8fdef4f553fb4ba94160825ec960b89bab9 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/CharacteristicPoints.cs (.../CharacteristicPoints.cs) (revision 5579d8fdef4f553fb4ba94160825ec960b89bab9)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/CharacteristicPoints.cs (.../CharacteristicPoints.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -48,7 +48,7 @@
/// Gets the name of the location for which the defines
/// characteristic points.
///
- public string Name { get; private set; }
+ public string Name { get; }
///
/// Gets or sets the location which generalizes the surface level on the
@@ -144,7 +144,7 @@
///
/// Gets or sets the location which generalizes the height of the surface
- /// on the oustide of the polder.
+ /// on the outside of the polder.
///
public Point3D SurfaceLevelOutside { get; set; }
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLine.cs
===================================================================
diff -u -rb8976a5e3cf525e419227e409e44ac69a430711a -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLine.cs (.../SurfaceLine.cs) (revision b8976a5e3cf525e419227e409e44ac69a430711a)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLine.cs (.../SurfaceLine.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -44,27 +44,28 @@
}
///
- /// Gets or sets the name of the surfaceline.
+ /// Gets or sets the name of the surface line.
///
public string Name { get; set; }
///
- /// Gets the 3D points describing its geometry.
+ /// Gets the 3D points describing the geometry of the surface line.
///
public Point3D[] Points { get; private set; }
///
- /// Sets the geometry of the surfaceline.
+ /// Sets the geometry of the surface line.
///
- /// The collection of points defining the surfaceline geometry.
+ /// The collection of points defining the surface line geometry.
/// Thrown when is null.
/// Thrown when either:
///
- /// - Any element of is null
- /// - The given points are too close to eachother
- /// - The given points form a reclining line: one in which the local L-coordinates of the points
+ ///
- any element of is null;
+ /// - the given points are too close to each other;
+ /// - the given points form a reclining line, one in which the local L-coordinates of the points
/// are not in ascending order.
- ///
+ ///
+ ///
public void SetGeometry(IEnumerable points)
{
if (points == null)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLinesCsvImporterConfiguration.cs
===================================================================
diff -u -rb8fa5d6867c945f3f1744fd1455b89cadb357959 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLinesCsvImporterConfiguration.cs (.../SurfaceLinesCsvImporterConfiguration.cs) (revision b8fa5d6867c945f3f1744fd1455b89cadb357959)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLinesCsvImporterConfiguration.cs (.../SurfaceLinesCsvImporterConfiguration.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -34,8 +34,8 @@
///
/// The transformer to use in this configuration.
/// The strategy to use in this configuration.
- /// Thrown when
- /// is null.
+ /// Thrown when
+ /// or is null.
public SurfaceLinesCsvImporterConfiguration(ISurfaceLineTransformer transformer, ISurfaceLineUpdateDataStrategy updateStrategy)
{
if (updateStrategy == null)
@@ -51,12 +51,12 @@
}
///
- /// The strategy for updating the data model with the mechanism specific surface lines.
+ /// Gets the strategy for updating the data model with the mechanism specific surface lines.
///
public ISurfaceLineUpdateDataStrategy UpdateUpdateStrategy { get; }
///
- /// The transformer used for tranforming generic surface lines into mechanism specific
+ /// Gets the transformer used for transforming generic surface lines into mechanism specific
/// surface lines.
///
public ISurfaceLineTransformer Transformer { get; }
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/CharacteristicPointsTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/CharacteristicPointsTest.cs (.../CharacteristicPointsTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/CharacteristicPointsTest.cs (.../CharacteristicPointsTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -41,7 +41,7 @@
[Test]
[TestCase("")]
[TestCase("Name")]
- public void Constructor_WithName_ThrowsArgumentNullException(string name)
+ public void Constructor_WithName_ValuesAsExpected(string name)
{
// Call
var location = new CharacteristicPoints(name);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLineTest.cs
===================================================================
diff -u -rb8976a5e3cf525e419227e409e44ac69a430711a -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLineTest.cs (.../SurfaceLineTest.cs) (revision b8976a5e3cf525e419227e409e44ac69a430711a)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SurfaceLines/SurfaceLineTest.cs (.../SurfaceLineTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -102,7 +102,7 @@
[TestCase(1)]
[TestCase(2)]
[TestCase(12)]
- public void SetGeometry_GeometryIsZeroLength_ThrowArgumentException(int pointCount)
+ public void SetGeometry_GeometryIsZeroLength_ThrowsArgumentException(int pointCount)
{
// Setup
var surfaceLine = new SurfaceLine();
@@ -126,7 +126,7 @@
[TestCase(0.99, true)]
[TestCase(0, true)]
[TestCase(-5, true)]
- public void SetGeometry_GeometryIsReclining_ThrowArgumentException(double thirdPointL, bool expectedThrowsException)
+ public void SetGeometry_GeometryIsReclining_ThrowsArgumentException(double thirdPointL, bool expectedThrowsException)
{
// Setup
var random = new Random(21);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r2fc082ea75494a149eca240146035aa8fa7f9e1c -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -248,15 +248,6 @@
}
///
- /// Looks up a localized string similar to De schematisatie van de hoogte van het dwarsprofiel..
- ///
- public static string MacroStabilityInwardsInput_SurfaceLine_Description {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsInput_SurfaceLine_Description", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Profielschematisatie.
///
public static string MacroStabilityInwardsInput_SurfaceLine_DisplayName {
@@ -450,42 +441,6 @@
}
///
- /// Looks up a localized string similar to Naam van de profielschematisatie..
- ///
- public static string RingtoetsMacroStabilityInwardsSurfaceLine_Name_Description {
- get {
- return ResourceManager.GetString("RingtoetsMacroStabilityInwardsSurfaceLine_Name_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Naam.
- ///
- public static string RingtoetsMacroStabilityInwardsSurfaceLine_Name_DisplayName {
- get {
- return ResourceManager.GetString("RingtoetsMacroStabilityInwardsSurfaceLine_Name_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to De punten die de geometrie van de profielschematisatie definiëren..
- ///
- public static string RingtoetsMacroStabilityInwardsSurfaceLine_Points_Description {
- get {
- return ResourceManager.GetString("RingtoetsMacroStabilityInwardsSurfaceLine_Points_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Geometriepunten.
- ///
- public static string RingtoetsMacroStabilityInwardsSurfaceLine_Points_DisplayName {
- get {
- return ResourceManager.GetString("RingtoetsMacroStabilityInwardsSurfaceLine_Points_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De locatie van het bestand waaruit de profielschematisaties zijn geïmporteerd..
///
public static string RingtoetsMacroStabilityInwardsSurfaceLineCollection_SourcePath_Description {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r2fc082ea75494a149eca240146035aa8fa7f9e1c -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -124,21 +124,6 @@
..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Naam van de profielschematisatie.
-
-
- Naam
-
-
- De punten die de geometrie van de profielschematisatie definiëren.
-
-
- Geometriepunten
-
-
- De schematisatie van de hoogte van het dwarsprofiel.
-
Profielschematisatie
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs
===================================================================
diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs (.../MacroStabilityInwardsInputContextProperties.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs (.../MacroStabilityInwardsInputContextProperties.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -205,8 +205,8 @@
[PropertyOrder(surfaceLinePropertyIndex)]
[Editor(typeof(MacroStabilityInwardsInputContextSurfaceLineSelectionEditor), typeof(UITypeEditor))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsInput_SurfaceLine_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsInput_SurfaceLine_Description))]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_DisplayName))]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Description))]
public RingtoetsMacroStabilityInwardsSurfaceLine SurfaceLine
{
get
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r683ff9234262d9fa3bea5edc0abe35254f80e49d -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 683ff9234262d9fa3bea5edc0abe35254f80e49d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -110,24 +110,6 @@
}
///
- /// Looks up a localized string similar to Profielschematisatie heeft een coördinaatwaarde die niet omgezet kan worden naar een getal..
- ///
- public static string Error_SurfaceLine_has_not_double {
- get {
- return ResourceManager.GetString("Error_SurfaceLine_has_not_double", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Profielschematisatie heeft een coördinaatwaarde die te groot of te klein is om ingelezen te worden..
- ///
- public static string Error_SurfaceLine_parsing_causes_overflow {
- get {
- return ResourceManager.GetString("Error_SurfaceLine_parsing_causes_overflow", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?><!--
///Copyright (C) Stichting Deltares 2017. All rights reserved.
///
@@ -235,76 +217,11 @@
}
///
- /// Looks up a localized string similar to Het bestand is niet geschikt om profielschematisaties uit te lezen (Verwachte koptekst: locationid;X1;Y1;Z1)..
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_File_invalid_header {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_File_invalid_header", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Regel heeft geen ID..
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_Line_lacks_ID {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_Line_lacks_ID", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Ontbrekend scheidingsteken '{0}'..
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_Line_lacks_separator_0_ {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_Line_lacks_separator_0_", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Profielschematisatie heeft een teruglopende geometrie (punten behoren een oplopende set L-coördinaten te hebben in het lokale coördinatenstelsel)..
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_reclining_geometry {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_reclining_geo" +
- "metry", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Profielschematisatie heeft een geometrie die een lijn met lengte 0 beschrijft..
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_zero_length {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_zero_length", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Voor de profielschematisatie ontbreken er waardes om een 3D (X,Y,Z) punt aan te maken..
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_SurfaceLine_lacks_values_for_coordinate_triplet {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_ReadLine_SurfaceLine_lacks_values_for_" +
- "coordinate_triplet", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to profielschematisatie '{0}'.
- ///
- public static string MacroStabilityInwardsSurfaceLinesCsvReader_SurfaceLineName_0_ {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLinesCsvReader_SurfaceLineName_0_", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Karakteristiek punt '{0}' is niet gedefiniëerd..
///
public static string MacroStabilityInwardsSurfaceLineTransformer_CharacteristicPoint_0_is_undefined {
get {
- return ResourceManager.GetString("MacroStabilityInwardsSurfaceLineTransformer_CharacteristicPoint_0_is undefined", resourceCulture);
+ return ResourceManager.GetString("MacroStabilityInwardsSurfaceLineTransformer_CharacteristicPoint_0_is_undefined", resourceCulture);
}
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx
===================================================================
diff -u -r683ff9234262d9fa3bea5edc0abe35254f80e49d -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision 683ff9234262d9fa3bea5edc0abe35254f80e49d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -120,12 +120,6 @@
Er kan geen 1D-profiel bepaald worden wanneer segmenten in een 2D laag verticaal lopen op de gekozen positie: x = {0}.
-
- Profielschematisatie heeft een coördinaatwaarde die niet omgezet kan worden naar een getal.
-
-
- Profielschematisatie heeft een coördinaatwaarde die te groot of te klein is om ingelezen te worden.
-
Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.
@@ -135,21 +129,6 @@
Ondergrondschematisatie bevat geen geldige waarde in kolom '{0}'.
-
- Het bestand is niet geschikt om profielschematisaties uit te lezen (Verwachte koptekst: locationid;X1;Y1;Z1).
-
-
- Profielschematisatie heeft een teruglopende geometrie (punten behoren een oplopende set L-coördinaten te hebben in het lokale coördinatenstelsel).
-
-
- Ontbrekend scheidingsteken '{0}'.
-
-
- Voor de profielschematisatie ontbreken er waardes om een 3D (X,Y,Z) punt aan te maken.
-
-
- Regel heeft geen ID.
-
De database heeft niet de vereiste versie informatie. Vereiste versie is '{0}'.
@@ -168,15 +147,9 @@
Coördinaat van een punt bevat ongeldige waarde.
-
- profielschematisatie '{0}'
-
ondergrondschematisatie '{0}'
-
- Profielschematisatie heeft een geometrie die een lijn met lengte 0 beschrijft.
-
Kon geen stochastische ondergrondmodellen verkrijgen uit de database.
@@ -264,7 +237,7 @@
..\Resources\MacroStabiliteitBinnenwaartsConfiguratieSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
+
Karakteristiek punt '{0}' is niet gedefiniëerd.
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r9caa7daa14d0070e2a3f68c4b9e66109318bd9ab -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision 9caa7daa14d0070e2a3f68c4b9e66109318bd9ab)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -65,6 +65,7 @@
{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Ringtoets.Common.Data
+ False
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/RingtoetsMacroStabilityInwardsSurfaceLine.cs
===================================================================
diff -u -re6106ea248df5d48159b78e37bb533856d2ebce7 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/RingtoetsMacroStabilityInwardsSurfaceLine.cs (.../RingtoetsMacroStabilityInwardsSurfaceLine.cs) (revision e6106ea248df5d48159b78e37bb533856d2ebce7)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/RingtoetsMacroStabilityInwardsSurfaceLine.cs (.../RingtoetsMacroStabilityInwardsSurfaceLine.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -74,7 +74,7 @@
///
/// Gets the location which generalizes the height of the surface
- /// on the oustide of the polder.
+ /// on the outside of the polder.
///
public Point3D SurfaceLevelOutside { get; private set; }
Fisheye: Tag b04ee63f77708d3e30dd18f07dbb8ab31d548edb refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/MacrostabilityInwardsSurfaceLineTransformerTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj
===================================================================
diff -u -r5579d8fdef4f553fb4ba94160825ec960b89bab9 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision 5579d8fdef4f553fb4ba94160825ec960b89bab9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -78,7 +78,7 @@
-
+
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -209,7 +209,7 @@
// Call
IEnumerable affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(Enumerable.Empty(),
- sourceFilePath).ToArray();
+ sourceFilePath).ToArray();
// Assert
Assert.IsFalse(calculation.HasOutput);
@@ -226,8 +226,6 @@
public void UpdateSurfaceLinesWithImportedData_ImportedDataContainsDuplicateNames_ThrowsUpdateDataException()
{
// Setup
- var targetCollection = new RingtoetsMacroStabilityInwardsSurfaceLineCollection();
-
const string duplicateName = "Duplicate name it is";
RingtoetsMacroStabilityInwardsSurfaceLine[] importedSurfaceLines =
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -211,7 +211,6 @@
new TestStochasticSoilModel("B")
};
var strategy = new StochasticSoilModelReplaceDataStrategy(new MacroStabilityInwardsFailureMechanism());
- var targetCollection = new StochasticSoilModelCollection();
// Call
TestDelegate test = () => strategy.UpdateModelWithImportedData(importedStochasticSoilModels, "path");
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -487,7 +487,7 @@
return model;
}
- private StochasticSoilProfile CloneAndSlightlyModify(StochasticSoilProfile profile)
+ private static StochasticSoilProfile CloneAndSlightlyModify(StochasticSoilProfile profile)
{
return new StochasticSoilProfile(profile.Probability, profile.SoilProfileType, profile.SoilProfileId)
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -36,7 +36,6 @@
using Ringtoets.MacroStabilityInwards.Data;
using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil;
-using Ringtoets.MacroStabilityInwards.Plugin.FileImporter;
using Ringtoets.MacroStabilityInwards.Primitives;
using FormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -35,7 +35,6 @@
using Ringtoets.MacroStabilityInwards.Data;
using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil;
-using Ringtoets.MacroStabilityInwards.Plugin.FileImporter;
using Ringtoets.MacroStabilityInwards.Primitives;
using FormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r2fc082ea75494a149eca240146035aa8fa7f9e1c -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -136,16 +136,6 @@
}
///
- /// Looks up a localized string similar to De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen..
- ///
- public static string RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_to_assign_as_characteristic_point_1_ {
- get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_poi" +
- "nt_at_0_to_assign_as_characteristic_point_1_", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Stochastische ondergrondmodellen.
///
public static string StochasticSoilModelCollection_TypeDescriptor {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx
===================================================================
diff -u -r2fc082ea75494a149eca240146035aa8fa7f9e1c -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -129,9 +129,6 @@
Het uittredepunt moet landwaarts van het intredepunt liggen.
-
- De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.
-
Het gespecificeerde punt moet op het profiel liggen (bereik {0}).
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataPointsFactory.cs
===================================================================
diff -u -rb8976a5e3cf525e419227e409e44ac69a430711a -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataPointsFactory.cs (.../PipingChartDataPointsFactory.cs) (revision b8976a5e3cf525e419227e409e44ac69a430711a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataPointsFactory.cs (.../PipingChartDataPointsFactory.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.Geometry;
using Core.Components.Chart.Data;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r2fc082ea75494a149eca240146035aa8fa7f9e1c -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -643,24 +643,6 @@
}
///
- /// Looks up a localized string similar to De schematisatie van de hoogte van het dwarsprofiel..
- ///
- public static string PipingInput_SurfaceLine_Description {
- get {
- return ResourceManager.GetString("PipingInput_SurfaceLine_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Profielschematisatie.
- ///
- public static string PipingInput_SurfaceLine_DisplayName {
- get {
- return ResourceManager.GetString("PipingInput_SurfaceLine_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De dikte van de bovenste voor doorlatendheid te onderscheiden zandlaag of combinatie van zandlagen..
///
public static string PipingInput_ThicknessAquiferLayer_Description {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r2fc082ea75494a149eca240146035aa8fa7f9e1c -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -250,12 +250,6 @@
..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- De schematisatie van de hoogte van het dwarsprofiel.
-
-
- Profielschematisatie
-
Naam
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -263,8 +263,8 @@
[PropertyOrder(surfaceLinePropertyIndex)]
[Editor(typeof(PipingInputContextSurfaceLineSelectionEditor), typeof(UITypeEditor))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingInput_SurfaceLine_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.PipingInput_SurfaceLine_Description))]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_DisplayName))]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Description))]
public RingtoetsPipingSurfaceLine SurfaceLine
{
get
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj (.../Ringtoets.Piping.KernelWrapper.csproj) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj (.../Ringtoets.Piping.KernelWrapper.csproj) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -75,6 +75,7 @@
{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Ringtoets.Common.Data
+ False
{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs (.../StochasticSoilModelReplaceDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs (.../StochasticSoilModelReplaceDataStrategy.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -31,7 +31,7 @@
{
///
/// A to replace the stochastic
- /// soil models with the imported stochastic soil models.
+ /// soil models with the imported stochastic soil models.
///
public class StochasticSoilModelReplaceDataStrategy : ReplaceDataStrategyBase,
IStochasticSoilModelUpdateModelStrategy
Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Ringtoets.Piping.Primitives.csproj
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Ringtoets.Piping.Primitives.csproj (.../Ringtoets.Piping.Primitives.csproj) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Ringtoets.Piping.Primitives.csproj (.../Ringtoets.Piping.Primitives.csproj) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -63,6 +63,7 @@
{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Ringtoets.Common.Data
+ False
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
===================================================================
diff -u -rb8976a5e3cf525e419227e409e44ac69a430711a -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision b8976a5e3cf525e419227e409e44ac69a430711a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -23,7 +23,6 @@
using System.Linq;
using System.Windows.Forms;
using Core.Common.Base;
-using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Components.Chart.Data;
using Core.Components.Chart.Forms;
@@ -157,22 +156,22 @@
var calculation = new PipingCalculationScenario(new GeneralPipingInput())
{
InputParameters =
+ {
+ StochasticSoilProfile = new StochasticSoilProfile(0.1, SoilProfileType.SoilProfile1D, 1)
{
- StochasticSoilProfile = new StochasticSoilProfile(0.1, SoilProfileType.SoilProfile1D, 1)
- {
- SoilProfile = new PipingSoilProfile(
- "profile",
- -1,
- new[]
- {
- new PipingSoilLayer(3.0),
- new PipingSoilLayer(2.0),
- new PipingSoilLayer(0)
- },
- SoilProfileType.SoilProfile1D,
- 1)
- }
+ SoilProfile = new PipingSoilProfile(
+ "profile",
+ -1,
+ new[]
+ {
+ new PipingSoilLayer(3.0),
+ new PipingSoilLayer(2.0),
+ new PipingSoilLayer(0)
+ },
+ SoilProfileType.SoilProfile1D,
+ 1)
}
+ }
};
using (var view = new PipingInputView
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -29,7 +29,6 @@
using Core.Common.Utils.Builders;
using NUnit.Framework;
using Rhino.Mocks;
-using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Exceptions;
using Ringtoets.Common.IO.FileImporters.MessageProviders;
using Ringtoets.Piping.Data;
@@ -985,7 +984,7 @@
var strategy = mocks.StrictMock();
strategy.Expect(s => s.UpdateModelWithImportedData(Arg.Is.NotNull,
- Arg.Is.Same(filePath)
+ Arg.Is.Same(filePath)
)).Throw(new UpdateDataException("Exception message"));
mocks.ReplayAll();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineReplaceDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineReplaceDataStrategyTest.cs (.../PipingSurfaceLineReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineReplaceDataStrategyTest.cs (.../PipingSurfaceLineReplaceDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -96,7 +96,7 @@
{
// Setup
var failureMechanism = new PipingFailureMechanism();
- var targetCollection = failureMechanism.SurfaceLines;
+ RingtoetsPipingSurfaceLineCollection targetCollection = failureMechanism.SurfaceLines;
var strategy = new PipingSurfaceLineReplaceDataStrategy(failureMechanism);
const string newSourcePath = "some/other/path";
@@ -210,7 +210,7 @@
// Call
IEnumerable affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(Enumerable.Empty(),
- sourceFilePath).ToArray();
+ sourceFilePath).ToArray();
// Assert
Assert.IsFalse(calculation.HasOutput);
@@ -227,8 +227,6 @@
public void UpdateSurfaceLinesWithImportedData_ImportedDataContainsDuplicateNames_ThrowsUpdateDataException()
{
// Setup
- var targetCollection = new RingtoetsPipingSurfaceLineCollection();
-
const string duplicateName = "Duplicate name it is";
RingtoetsPipingSurfaceLine[] importedSurfaceLines =
{
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsPipingSurfaceLineUpdateDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -31,7 +31,6 @@
using Ringtoets.Common.IO.SurfaceLines;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.IO.Importers;
using Ringtoets.Piping.KernelWrapper.TestUtil;
using Ringtoets.Piping.Plugin.FileImporter;
using Ringtoets.Piping.Primitives;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -211,7 +211,6 @@
new TestStochasticSoilModel("B")
};
var strategy = new StochasticSoilModelReplaceDataStrategy(new PipingFailureMechanism());
- var targetCollection = new StochasticSoilModelCollection();
// Call
TestDelegate test = () => strategy.UpdateModelWithImportedData(importedStochasticSoilModels, "path");
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -196,7 +196,7 @@
var existingModel = new TestStochasticSoilModel(modelsName);
var failureMechanism = new PipingFailureMechanism();
- var targetCollection = failureMechanism.StochasticSoilModels;
+ StochasticSoilModelCollection targetCollection = failureMechanism.StochasticSoilModels;
targetCollection.AddRange(new[]
{
existingModel
@@ -229,7 +229,7 @@
var existingModel = new TestStochasticSoilModel(modelsName);
var failureMechanism = new PipingFailureMechanism();
- var targetCollection = failureMechanism.StochasticSoilModels;
+ StochasticSoilModelCollection targetCollection = failureMechanism.StochasticSoilModels;
targetCollection.AddRange(new[]
{
existingModel
@@ -263,7 +263,7 @@
var existingModel = new TestStochasticSoilModel(modelsName);
var failureMechanism = new PipingFailureMechanism();
- var targetCollection = failureMechanism.StochasticSoilModels;
+ StochasticSoilModelCollection targetCollection = failureMechanism.StochasticSoilModels;
targetCollection.AddRange(new[]
{
existingModel
@@ -317,7 +317,7 @@
var existingModel = new TestStochasticSoilModel(modelsName);
var failureMechanism = new PipingFailureMechanism();
- var targetCollection = failureMechanism.StochasticSoilModels;
+ StochasticSoilModelCollection targetCollection = failureMechanism.StochasticSoilModels;
targetCollection.AddRange(new[]
{
existingModel
@@ -414,7 +414,7 @@
var existingModel = new TestStochasticSoilModel(modelsName);
var failureMechanism = new PipingFailureMechanism();
- var targetCollection = failureMechanism.StochasticSoilModels;
+ StochasticSoilModelCollection targetCollection = failureMechanism.StochasticSoilModels;
targetCollection.AddRange(new[]
{
existingModel
@@ -434,7 +434,7 @@
calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel;
calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = unaffectedProfile;
calculationWithNotUpdatedProfile.Output = new PipingOutput(new PipingOutput.ConstructionProperties());
-
+
failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile);
failureMechanism.CalculationsGroup.Children.Add(calculationWithRemovedProfile);
@@ -487,7 +487,7 @@
return model;
}
- private StochasticSoilProfile CloneAndSlightlyModify(StochasticSoilProfile profile)
+ private static StochasticSoilProfile CloneAndSlightlyModify(StochasticSoilProfile profile)
{
return new StochasticSoilProfile(profile.Probability, profile.SoilProfileType, profile.SoilProfileId)
{
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -35,9 +35,7 @@
using Ringtoets.Common.IO.SurfaceLines;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.IO.Importers;
using Ringtoets.Piping.KernelWrapper.TestUtil;
-using Ringtoets.Piping.Plugin.FileImporter;
using Ringtoets.Piping.Primitives;
using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb)
@@ -34,9 +34,7 @@
using Ringtoets.Common.IO.SurfaceLines;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.IO.Importers;
using Ringtoets.Piping.KernelWrapper.TestUtil;
-using Ringtoets.Piping.Plugin.FileImporter;
using Ringtoets.Piping.Primitives;
using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
@@ -120,7 +118,7 @@
var failureMechanism = new PipingFailureMechanism();
var surfaceLines = new RingtoetsPipingSurfaceLineCollection();
- surfaceLines.AddRange(Enumerable.Empty(),"some/path");
+ surfaceLines.AddRange(Enumerable.Empty(), "some/path");
var context = new RingtoetsPipingSurfaceLinesContext(surfaceLines, failureMechanism, assessmentSection);