Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs
===================================================================
diff -u -r3329f24f4e41a93f26e8b64a8454cbe851ee057f -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs (.../StochasticSoilModel.cs) (revision 3329f24f4e41a93f26e8b64a8454cbe851ee057f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs (.../StochasticSoilModel.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -37,9 +37,8 @@
///
/// Creates a new instance of .
///
- /// Database identifier of the stochastic soil model.
/// Name of the segment soil model.
- public StochasticSoilModel(long id, string name)
+ public StochasticSoilModel(string name)
{
Name = name;
Geometry = new List();
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs
===================================================================
diff -u -r3329f24f4e41a93f26e8b64a8454cbe851ee057f -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 3329f24f4e41a93f26e8b64a8454cbe851ee057f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -234,9 +234,8 @@
private StochasticSoilModel ReadStochasticSoilModelSegment()
{
- long stochasticSoilModelId = Convert.ToInt64(dataReader[StochasticSoilModelTableColumns.StochasticSoilModelId]);
string stochasticSoilModelName = Convert.ToString(dataReader[StochasticSoilModelTableColumns.StochasticSoilModelName]);
- return new StochasticSoilModel(stochasticSoilModelId, stochasticSoilModelName);
+ return new StochasticSoilModel(stochasticSoilModelName);
}
private long ReadStochasticSoildModelSegmentId()
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs (.../StochasticSoilModelCollectionTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs (.../StochasticSoilModelCollectionTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -40,26 +40,26 @@
protected override IEnumerable UniqueElements()
{
- yield return new StochasticSoilModel(5, "Model A");
- yield return new StochasticSoilModel(6, "Model B");
+ yield return new StochasticSoilModel("Model A");
+ yield return new StochasticSoilModel("Model B");
}
protected override IEnumerable SingleNonUniqueElements()
{
const string someName = "Soil model";
- yield return new StochasticSoilModel(5, someName);
- yield return new StochasticSoilModel(6, someName);
+ yield return new StochasticSoilModel(someName);
+ yield return new StochasticSoilModel(someName);
}
protected override IEnumerable MultipleNonUniqueElements()
{
const string someName = "Soil model";
const string someOtherName = "Other soil model";
- yield return new StochasticSoilModel(5, someName);
- yield return new StochasticSoilModel(6, someName);
- yield return new StochasticSoilModel(7, someOtherName);
- yield return new StochasticSoilModel(8, someOtherName);
- yield return new StochasticSoilModel(9, someOtherName);
+ yield return new StochasticSoilModel(someName);
+ yield return new StochasticSoilModel(someName);
+ yield return new StochasticSoilModel(someOtherName);
+ yield return new StochasticSoilModel(someOtherName);
+ yield return new StochasticSoilModel(someOtherName);
}
protected override void AssertSingleNonUniqueElements(ArgumentException exception, IEnumerable itemsToAdd)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs (.../StochasticSoilModelExtensionsTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs (.../StochasticSoilModelExtensionsTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -55,7 +55,7 @@
public void IntersectsWithSurfaceLineGeometry_SurfaceLineNull_ThrowArgumentNullException()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -74,7 +74,7 @@
public void IntersectsWithSurfaceLineGeometry_SurfacelineIntersectingSoilModel_ReturnTrue()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -100,7 +100,7 @@
public void IntersectsWithSurfaceLineGeometry_SurfacelineNotIntersectingSoilModel_ReturnFalse()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs
===================================================================
diff -u -r3329f24f4e41a93f26e8b64a8454cbe851ee057f -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs (.../StochasticSoilModelTest.cs) (revision 3329f24f4e41a93f26e8b64a8454cbe851ee057f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs (.../StochasticSoilModelTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -36,10 +36,10 @@
[Test]
[TestCase("")]
[TestCase("segmentSoilModelName")]
- public void Constructor_Always_ExpectedValues(long segmentSoilModelId, string segmentSoilModelName)
+ public void Constructor_Always_ExpectedValues(string segmentSoilModelName)
{
// Call
- var stochasticSoilModel = new StochasticSoilModel(segmentSoilModelId, segmentSoilModelName);
+ var stochasticSoilModel = new StochasticSoilModel(segmentSoilModelName);
// Assert
Assert.IsInstanceOf(stochasticSoilModel);
@@ -52,9 +52,8 @@
public void PropertySegmentPoints_Always_ReturnsExpectedValues()
{
// Setup
- const long expectedSegmentSoilModelId = 1234L;
const string expectedSegmentSoilModelName = "someSegmentSoilModelName";
- var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName);
+ var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelName);
var point2D = new Point2D(1.0, 2.0);
// Call
@@ -70,9 +69,8 @@
public void PropertyStochasticSoilProfileProbabilities_Always_ReturnsExpectedValues()
{
// Setup
- const long expectedSegmentSoilModelId = 1234L;
const string expectedSegmentSoilModelName = "someSegmentSoilModelName";
- var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName);
+ var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelName);
var mockRepository = new MockRepository();
var stochasticSoilProfileProbabilityMock = mockRepository.StrictMock(1.0, null, null);
@@ -92,7 +90,7 @@
public void Update_WithNullModel_ThrowsArgumentNullException()
{
// Setup
- var model = new StochasticSoilModel(1234, "name");
+ var model = new StochasticSoilModel("name");
// Call
TestDelegate test = () => model.Update(null);
@@ -106,21 +104,20 @@
public void Update_ModelWithUpdatedProperties_PropertiesUpdated()
{
// Setup
- var model = new StochasticSoilModel(1234, "name");
+ var model = new StochasticSoilModel("name");
model.Geometry.AddRange(new[]
{
new Point2D(1, 2),
new Point2D(4, 5)
});
- const int expectedId = 1236;
const string expectedName = "otherName";
var expectedGeometry = new[]
{
new Point2D(4, 2)
};
- var otherModel = new StochasticSoilModel(expectedId, expectedName);
+ var otherModel = new StochasticSoilModel(expectedName);
otherModel.Geometry.AddRange(expectedGeometry);
// Call
@@ -306,7 +303,7 @@
model.StochasticSoilProfiles.Add(stochasticProfileB);
const string otherName = "other name";
- var otherModel = new StochasticSoilModel(41, otherName);
+ var otherModel = new StochasticSoilModel(otherName);
var otherPointA = new Point2D(2, 0);
var otherPointB = new Point2D(3, 0);
@@ -397,7 +394,7 @@
public void ToString_WithName_ReturnsName(string name)
{
// Setup
- var stochasticSoilModel = new StochasticSoilModel(1, name);
+ var stochasticSoilModel = new StochasticSoilModel(name);
// Call & Assert
Assert.AreEqual(name, stochasticSoilModel.ToString());
@@ -413,7 +410,7 @@
private StochasticSoilModel CreateEmptyModel()
{
- var model = new StochasticSoilModel(1234, "name");
+ var model = new StochasticSoilModel("name");
return model;
}
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -33,7 +33,7 @@
/// Creates a new instance of .
///
/// The name of the stochastic soil model.
- public TestStochasticSoilModel(string name) : base(0, name)
+ public TestStochasticSoilModel(string name) : base(name)
{
StochasticSoilProfiles.AddRange(new[]
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -135,8 +135,8 @@
};
var stochasticSoilModels = new[]
{
- new StochasticSoilModel(1, "StochasticSoilModelName1"),
- new StochasticSoilModel(2, "StochasticSoilModelName2")
+ new StochasticSoilModel("StochasticSoilModelName1"),
+ new StochasticSoilModel("StochasticSoilModelName2")
};
stochasticSoilModels[0].Geometry.AddRange(pointsOne);
stochasticSoilModels[1].Geometry.AddRange(pointsTwo);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -60,7 +60,7 @@
}, SoilProfileType.SoilProfile1D, 2)
};
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -114,7 +114,7 @@
new MacroStabilityInwardsSoilLayer(4.0)
}, SoilProfileType.SoilProfile1D, 2);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -170,7 +170,7 @@
public void GetStochasticSoilModelsForSurfaceLine_NoSoilProfiles_ReturnEmpty()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -216,7 +216,7 @@
new MacroStabilityInwardsSoilLayer(4.0)
}, SoilProfileType.SoilProfile1D, 2);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -277,7 +277,7 @@
};
const double y = 1.1;
- var soilModel1 = new StochasticSoilModel(1, "A");
+ var soilModel1 = new StochasticSoilModel("A");
soilModel1.Geometry.AddRange(new[]
{
new Point2D(1.0, y),
@@ -288,7 +288,7 @@
soilProfile1
});
- var soilModel2 = new StochasticSoilModel(1, "A");
+ var soilModel2 = new StochasticSoilModel("A");
soilModel2.Geometry.AddRange(new[]
{
new Point2D(3.0, y),
@@ -447,7 +447,7 @@
}, SoilProfileType.SoilProfile1D, 2)
};
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -509,7 +509,7 @@
public void GenerateCalculationItemsStructure_NoSoilProfiles_LogWarning()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -573,7 +573,7 @@
new MacroStabilityInwardsSoilLayer(4.0)
}, SoilProfileType.SoilProfile1D, 2);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -655,7 +655,7 @@
};
const double y = 1.1;
- var soilModel1 = new StochasticSoilModel(1, "A");
+ var soilModel1 = new StochasticSoilModel("A");
soilModel1.Geometry.AddRange(new[]
{
new Point2D(1.0, y),
@@ -666,7 +666,7 @@
soilProfile1
});
- var soilModel2 = new StochasticSoilModel(1, "A");
+ var soilModel2 = new StochasticSoilModel("A");
soilModel2.Geometry.AddRange(new[]
{
new Point2D(3.0, y),
@@ -748,7 +748,7 @@
};
const double y = 1.1;
- var soilModel1 = new StochasticSoilModel(1, "A");
+ var soilModel1 = new StochasticSoilModel("A");
soilModel1.Geometry.AddRange(new[]
{
new Point2D(1.0, y),
@@ -760,7 +760,7 @@
soilProfile2
});
- var soilModel2 = new StochasticSoilModel(1, "A");
+ var soilModel2 = new StochasticSoilModel("A");
soilModel2.Geometry.AddRange(new[]
{
new Point2D(3.0, y),
@@ -869,7 +869,7 @@
};
const double y = 1.1;
- var soilModel1 = new StochasticSoilModel(1, "A");
+ var soilModel1 = new StochasticSoilModel("A");
soilModel1.Geometry.AddRange(new[]
{
new Point2D(1.0, y),
@@ -881,7 +881,7 @@
soilProfile2
});
- var soilModel2 = new StochasticSoilModel(1, "A");
+ var soilModel2 = new StochasticSoilModel("A");
soilModel2.Geometry.AddRange(new[]
{
new Point2D(3.0, y),
@@ -977,7 +977,7 @@
new MacroStabilityInwardsSoilLayer(4.0)
}, SoilProfileType.SoilProfile1D, 2);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -1056,7 +1056,7 @@
new MacroStabilityInwardsSoilLayer(4.0)
}, SoilProfileType.SoilProfile1D, 2);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -303,7 +303,7 @@
}
}, SoilProfileType.SoilProfile1D, 0)
};
- var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName");
+ var stochasticSoilModel = new StochasticSoilModel("StochasticSoilModelName");
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile);
HydraulicBoundaryLocation testHydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(0.0);
@@ -736,7 +736,7 @@
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
};
- var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName");
+ var stochasticSoilModel = new StochasticSoilModel("StochasticSoilModelName");
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile);
var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput());
@@ -781,7 +781,7 @@
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
};
- var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName");
+ var stochasticSoilModel = new StochasticSoilModel("StochasticSoilModelName");
stochasticSoilModel.StochasticSoilProfiles.Add(soilProfile);
var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())
{
@@ -836,14 +836,14 @@
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
};
- var stochasticSoilModel1 = new StochasticSoilModel(0, "StochasticSoilModel1Name");
+ var stochasticSoilModel1 = new StochasticSoilModel("StochasticSoilModel1Name");
stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile1);
var stochasticSoilProfile2 = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
};
- var stochasticSoilModel2 = new StochasticSoilModel(0, "StochasticSoilModel2Name");
+ var stochasticSoilModel2 = new StochasticSoilModel("StochasticSoilModel2Name");
stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile2);
var inputParameters = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput())
@@ -946,7 +946,7 @@
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
var soilModels = new[]
{
- new StochasticSoilModel(1, "A")
+ new StochasticSoilModel("A")
{
Geometry =
{
@@ -958,7 +958,7 @@
new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1)
}
},
- new StochasticSoilModel(2, "C")
+ new StochasticSoilModel("C")
{
Geometry =
{
@@ -970,7 +970,7 @@
new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2)
}
},
- new StochasticSoilModel(3, "E")
+ new StochasticSoilModel("E")
{
Geometry =
{
@@ -1048,7 +1048,7 @@
mocks.ReplayAll();
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
- var model = new StochasticSoilModel(1, "A")
+ var model = new StochasticSoilModel("A")
{
StochasticSoilProfiles =
{
@@ -1484,7 +1484,7 @@
private static StochasticSoilModel ValidStochasticSoilModel(double xMin, double xMax)
{
- var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName");
+ var stochasticSoilModel = new StochasticSoilModel("StochasticSoilModelName");
stochasticSoilModel.StochasticSoilProfiles.Add(new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1234)
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -53,7 +53,7 @@
public void GetProperties_WithData_ReturnExpectedValues()
{
// Setup
- var stochasticSoilModel = new StochasticSoilModel(1324, "Name");
+ var stochasticSoilModel = new StochasticSoilModel("Name");
stochasticSoilModel.Geometry.Add(new Point2D(1.0, 2.0));
var soilProfile = new MacroStabilityInwardsSoilProfile("MacroStabilityInwardsSoilProfile", 0, new List
{
@@ -83,7 +83,7 @@
public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
{
// Setup
- var stochasticSoilModel = new StochasticSoilModel(1324, "Name");
+ var stochasticSoilModel = new StochasticSoilModel("Name");
stochasticSoilModel.Geometry.Add(new Point2D(1.0, 2.0));
var soilProfile = new MacroStabilityInwardsSoilProfile("MacroStabilityInwardsSoilProfile", 0, new List
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -58,7 +58,7 @@
var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput())
{
- StochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName")
+ StochasticSoilModel = new StochasticSoilModel("StochasticSoilModelName")
};
var inputContext = new MacroStabilityInwardsInputContext(input,
calculationItem,
@@ -106,7 +106,7 @@
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
};
- var stochasticSoilModel = new StochasticSoilModel(0, "Model")
+ var stochasticSoilModel = new StochasticSoilModel("Model")
{
Geometry =
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -109,7 +109,7 @@
{
SoilProfile = new TestMacroStabilityInwardsSoilProfile()
};
- var stochasticSoilModel = new StochasticSoilModel(0, "Model")
+ var stochasticSoilModel = new StochasticSoilModel("Model")
{
Geometry =
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -143,7 +143,7 @@
public void StochasticSoilModel_AlwaysOnChange_NotifyObserverCalculationPropertyChangedOutputCleared()
{
// Setup
- var newModel = new StochasticSoilModel(0, "test");
+ var newModel = new StochasticSoilModel("test");
var newValue = new DataGridViewComboBoxItemWrapper(newModel);
var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput());
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -1444,7 +1444,7 @@
}, SoilProfileType.SoilProfile1D, 1)
};
- var stochasticSoilModelA = new StochasticSoilModel(1, "Model A")
+ var stochasticSoilModelA = new StochasticSoilModel("Model A")
{
Geometry =
{
@@ -1475,7 +1475,7 @@
}, SoilProfileType.SoilProfile1D, 1)
};
- var stochasticSoilModelE = new StochasticSoilModel(1, "Model E")
+ var stochasticSoilModelE = new StochasticSoilModel("Model E")
{
Geometry =
{
@@ -1490,7 +1490,7 @@
failureMechanism.StochasticSoilModels.AddRange(new[]
{
stochasticSoilModelA,
- new StochasticSoilModel(1, "Model C")
+ new StochasticSoilModel("Model C")
{
Geometry =
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -254,13 +254,13 @@
ReferenceLine = referenceLine
};
- var stochasticSoilModel1 = new StochasticSoilModel(0, "name1");
+ var stochasticSoilModel1 = new StochasticSoilModel("name1");
stochasticSoilModel1.Geometry.AddRange(new[]
{
new Point2D(1.0, 2.0),
new Point2D(1.1, 2.2)
});
- var stochasticSoilModel2 = new StochasticSoilModel(0, "name2");
+ var stochasticSoilModel2 = new StochasticSoilModel("name2");
stochasticSoilModel2.Geometry.AddRange(new[]
{
new Point2D(3.0, 4.0),
@@ -684,7 +684,7 @@
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
- var stochasticSoilModel = new StochasticSoilModel(0, "");
+ var stochasticSoilModel = new StochasticSoilModel("");
stochasticSoilModel.Geometry.AddRange(new[]
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -79,7 +79,7 @@
calculation2.Name = "PK001_0002 W1-6_4_1D1";
calculation2.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_SCH_17", 0, 0);
calculation2.InputParameters.SurfaceLine.Name = "PK001_0002";
- calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Macrostabiliteit");
+ calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel("PK001_0002_Macrostabiliteit");
calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0)
{
SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_4_1D1", 0, new[]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -169,7 +169,7 @@
new Point3D(2.5, 1.0, 1.0),
new Point3D(5.0, 1.0, 0.0)
});
- var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel");
+ var stochasticSoilModel = new StochasticSoilModel("Ondergrondmodel");
stochasticSoilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -219,7 +219,7 @@
new Point3D(3.0, 0.0, 1.0),
new Point3D(3.0, -5.0, 0.0)
});
- var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel");
+ var stochasticSoilModel = new StochasticSoilModel("Ondergrondmodel");
stochasticSoilModel.Geometry.AddRange(new[]
{
new Point2D(1.0, 0.0),
@@ -303,7 +303,7 @@
}, SoilProfileType.SoilProfile1D, 0)
};
- var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel");
+ var stochasticSoilModel = new StochasticSoilModel("Ondergrondmodel");
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile);
stochasticSoilModel.Geometry.AddRange(new[]
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -134,7 +134,7 @@
{
HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0),
SurfaceLine = surfaceline,
- StochasticSoilModel = new StochasticSoilModel(1, "PK001_0001_Macrostabiliteit"),
+ StochasticSoilModel = new StochasticSoilModel("PK001_0001_Macrostabiliteit"),
StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0)
{
SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_0_1D1", 0, new[]
@@ -217,7 +217,7 @@
surfaceline1,
surfaceline2
}, "some/path/to/surfacelines");
- var stochasticSoilModel1 = new StochasticSoilModel(1, "A")
+ var stochasticSoilModel1 = new StochasticSoilModel("A")
{
Geometry =
{
@@ -229,7 +229,7 @@
new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1)
}
};
- var stochasticSoilModel2 = new StochasticSoilModel(2, "C")
+ var stochasticSoilModel2 = new StochasticSoilModel("C")
{
Geometry =
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -630,7 +630,7 @@
var soilModels = new[]
{
- new StochasticSoilModel(1, "A")
+ new StochasticSoilModel("A")
{
Geometry =
{
@@ -642,7 +642,7 @@
new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1)
}
},
- new StochasticSoilModel(2, "C")
+ new StochasticSoilModel("C")
{
Geometry =
{
@@ -699,7 +699,7 @@
// Setup
var soilModels = new[]
{
- new StochasticSoilModel(1, "A")
+ new StochasticSoilModel("A")
{
Geometry =
{
@@ -711,7 +711,7 @@
new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1)
}
},
- new StochasticSoilModel(2, "C")
+ new StochasticSoilModel("C")
{
Geometry =
{
@@ -723,7 +723,7 @@
new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2)
}
},
- new StochasticSoilModel(3, "E")
+ new StochasticSoilModel("E")
{
Geometry =
{
@@ -788,7 +788,7 @@
public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilInputs()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A")
+ var soilModel = new StochasticSoilModel("A")
{
Geometry =
{
@@ -846,7 +846,7 @@
public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilModelInput()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A")
+ var soilModel = new StochasticSoilModel("A")
{
Geometry =
{
@@ -935,7 +935,7 @@
var soilModels = new[]
{
- new StochasticSoilModel(1, "A")
+ new StochasticSoilModel("A")
{
Geometry =
{
@@ -947,7 +947,7 @@
new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1)
}
},
- new StochasticSoilModel(2, "C")
+ new StochasticSoilModel("C")
{
Geometry =
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -487,9 +487,9 @@
/// Name of the created model.
/// List of names for the profiles to be added to the model.
/// A new .
- private StochasticSoilModel CreateSimpleModel(string modelName, params string[] profileNames)
+ private static StochasticSoilModel CreateSimpleModel(string modelName, params string[] profileNames)
{
- var model = new StochasticSoilModel(-1, modelName);
+ var model = new StochasticSoilModel(modelName);
foreach (string profileName in profileNames)
{
model.StochasticSoilProfiles.Add(
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -159,7 +159,7 @@
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
failureMechanism.StochasticSoilModels.AddRange(new[]
{
- new StochasticSoilModel(0, "Name")
+ new StochasticSoilModel("Name")
}, "path");
var stochasticSoilModelCollectionContext = new StochasticSoilModelCollectionContext(
@@ -198,7 +198,7 @@
SoilProfile = soilProfile2
};
- var stochasticSoilModel = new StochasticSoilModel(0, "Name");
+ var stochasticSoilModel = new StochasticSoilModel("Name");
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1);
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile2);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -82,7 +82,7 @@
{
// Setup
const string name = "test test 123";
- var model = new StochasticSoilModel(1, name);
+ var model = new StochasticSoilModel(name);
// Call
string text = info.Text(model);
@@ -95,7 +95,7 @@
public void Image_Always_ReturnsSetImage()
{
// Setup
- var model = new StochasticSoilModel(1, "A");
+ var model = new StochasticSoilModel("A");
// Call
Image image = info.Image(model);
@@ -123,7 +123,7 @@
}, SoilProfileType.SoilProfile1D, 0)
};
- var stochasticSoilModel = new StochasticSoilModel(0, "Name");
+ var stochasticSoilModel = new StochasticSoilModel("Name");
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1);
stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile2);
@@ -143,7 +143,7 @@
public void ContextMenuStrip_Always_CallsBuilder()
{
// Setup
- var model = new StochasticSoilModel(1, "A");
+ var model = new StochasticSoilModel("A");
var mocks = new MockRepository();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -353,7 +353,7 @@
{
// Setup
MacroStabilityInwardsFailureMechanism failureMechanism = null;
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
// Call
TestDelegate call = () => MacroStabilityInwardsDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, soilModel);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs
===================================================================
diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r07783a47e1cfb0bd793eaba29c7567cb17e0b367
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367)
@@ -32,7 +32,7 @@
public void SetMatchingStochasticSoilModel_SurfaceLineOverlappingSingleSoilModel_SetsSoilModel()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput());
// Call
@@ -50,8 +50,8 @@
{
// Setup
var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput());
- var soilModel1 = new StochasticSoilModel(1, "A");
- var soilModel2 = new StochasticSoilModel(2, "C");
+ var soilModel1 = new StochasticSoilModel("A");
+ var soilModel2 = new StochasticSoilModel("C");
// Call
MacroStabilityInwardsInputService.SetMatchingStochasticSoilModel(input, new[]
@@ -68,14 +68,14 @@
public void SetMatchingStochasticSoilModel_CurrentSoilModelNotInOverlappingMultipleSoilModels_ClearsModel()
{
// Setup
- var nonOverlappingSoilModel = new StochasticSoilModel(1, "A");
+ var nonOverlappingSoilModel = new StochasticSoilModel("A");
var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput())
{
StochasticSoilModel = nonOverlappingSoilModel
};
- var soilModel1 = new StochasticSoilModel(1, "A");
- var soilModel2 = new StochasticSoilModel(2, "C");
+ var soilModel1 = new StochasticSoilModel("A");
+ var soilModel2 = new StochasticSoilModel("C");
// Call
MacroStabilityInwardsInputService.SetMatchingStochasticSoilModel(input, new[]
@@ -94,7 +94,7 @@
// Setup
var soilProfile = new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.StochasticSoilProfiles.Add(soilProfile);
var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput())
@@ -113,7 +113,7 @@
public void SyncStochasticSoilProfileWithStochasticSoilModel_MultipleStochasticSoilProfilesInStochasticSoilModel_DoesNotSetStochasticSoilProfile()
{
// Setup
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.StochasticSoilProfiles.AddRange(new[]
{
new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1),
@@ -137,7 +137,7 @@
// Setup
var soilProfile = new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1);
- var soilModel = new StochasticSoilModel(1, "A");
+ var soilModel = new StochasticSoilModel("A");
soilModel.StochasticSoilProfiles.Add(soilProfile);
var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput())