Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/PipingFailureMechanismConverter.cs
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/PipingFailureMechanismConverter.cs (.../PipingFailureMechanismConverter.cs) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/PipingFailureMechanismConverter.cs (.../PipingFailureMechanismConverter.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -26,12 +26,12 @@
namespace Application.Ringtoets.Storage.Converters
{
///
- /// Converter for to
- /// and to .
+ /// Converter for to
+ /// and to .
///
- public class PipingFailureMechanismConverter : IEntityConverter
+ public class PipingFailureMechanismConverter : IEntityConverter
{
- public Piping ConvertEntityToModel(FailureMechanismEntity entity)
+ public PipingFailureMechanism ConvertEntityToModel(FailureMechanismEntity entity)
{
if (entity == null)
{
@@ -43,15 +43,15 @@
throw new ArgumentException(@"Incorrect modelType", "entity");
}
- var failureMechanism = new Piping
+ var failureMechanism = new PipingFailureMechanism
{
StorageId = entity.FailureMechanismEntityId
};
return failureMechanism;
}
- public void ConvertModelToEntity(Piping modelObject, FailureMechanismEntity entity)
+ public void ConvertModelToEntity(PipingFailureMechanism modelObject, FailureMechanismEntity entity)
{
if (modelObject == null)
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/AssessmentSectionPersistor.cs
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/AssessmentSectionPersistor.cs (.../AssessmentSectionPersistor.cs) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/AssessmentSectionPersistor.cs (.../AssessmentSectionPersistor.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -84,7 +84,7 @@
{
if (failureMechanismEntity.FailureMechanismType == (int) FailureMechanismType.PipingFailureMechanism)
{
- pipingFailureMechanismEntityPersistor.LoadModel(failureMechanismEntity, assessmentSection.Piping);
+ pipingFailureMechanismEntityPersistor.LoadModel(failureMechanismEntity, assessmentSection.PipingFailureMechanism);
}
}
@@ -179,7 +179,7 @@
/// Referenced .
private void UpdateChildren(AssessmentSection model, AssessmentSectionEntity entity)
{
- pipingFailureMechanismEntityPersistor.UpdateModel(entity.FailureMechanismEntities, model.Piping);
+ pipingFailureMechanismEntityPersistor.UpdateModel(entity.FailureMechanismEntities, model.PipingFailureMechanism);
pipingFailureMechanismEntityPersistor.RemoveUnModifiedEntries(entity.FailureMechanismEntities);
hydraulicLocationEntityPersistor.UpdateModel(entity.HydraulicLocationEntities, model.HydraulicBoundaryDatabase);
@@ -193,7 +193,7 @@
/// Referenced .
private void InsertChildren(AssessmentSection model, AssessmentSectionEntity entity)
{
- pipingFailureMechanismEntityPersistor.InsertModel(entity.FailureMechanismEntities, model.Piping);
+ pipingFailureMechanismEntityPersistor.InsertModel(entity.FailureMechanismEntities, model.PipingFailureMechanism);
pipingFailureMechanismEntityPersistor.RemoveUnModifiedEntries(entity.FailureMechanismEntities);
hydraulicLocationEntityPersistor.InsertModel(entity.HydraulicLocationEntities, model.HydraulicBoundaryDatabase);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismPersistorBase.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismPersistorBase.cs (.../FailureMechanismPersistorBase.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismPersistorBase.cs (.../FailureMechanismPersistorBase.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -27,13 +27,12 @@
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.Exceptions;
using Application.Ringtoets.Storage.Properties;
-using Ringtoets.Common.Data;
using Ringtoets.Common.Data.FailureMechanism;
namespace Application.Ringtoets.Storage.Persistors
{
///
- /// Persistor for classes derived from .
+ /// Persistor for classes which implement .
///
public abstract class FailureMechanismPersistorBase where T : IFailureMechanism
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/PipingFailureMechanismPersistor.cs
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/PipingFailureMechanismPersistor.cs (.../PipingFailureMechanismPersistor.cs) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/PipingFailureMechanismPersistor.cs (.../PipingFailureMechanismPersistor.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -27,9 +27,9 @@
namespace Application.Ringtoets.Storage.Persistors
{
///
- /// Persistor for .
+ /// Persistor for .
///
- public class PipingFailureMechanismPersistor : FailureMechanismPersistorBase
+ public class PipingFailureMechanismPersistor : FailureMechanismPersistorBase
{
///
/// New instance of .
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/PipingFailureMechanismConverterTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/PipingFailureMechanismConverterTest.cs (.../PipingFailureMechanismConverterTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/PipingFailureMechanismConverterTest.cs (.../PipingFailureMechanismConverterTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -40,7 +40,7 @@
PipingFailureMechanismConverter converter = new PipingFailureMechanismConverter();
// Assert
- Assert.IsInstanceOf>(converter);
+ Assert.IsInstanceOf>(converter);
}
[Test]
@@ -75,7 +75,7 @@
};
// Call
- Piping failureMechanism = converter.ConvertEntityToModel(entity);
+ PipingFailureMechanism failureMechanism = converter.ConvertEntityToModel(entity);
// Assert
Assert.AreEqual(entity.FailureMechanismEntityId, failureMechanism.StorageId);
@@ -122,7 +122,7 @@
PipingFailureMechanismConverter converter = new PipingFailureMechanismConverter();
// Call
- TestDelegate test = () => converter.ConvertModelToEntity(new Piping(), null);
+ TestDelegate test = () => converter.ConvertModelToEntity(new PipingFailureMechanism(), null);
// Assert
var exception = Assert.Throws(test);
@@ -138,7 +138,7 @@
const long storageId = 1234L;
var entity = new FailureMechanismEntity();
- var model = new Piping
+ var model = new PipingFailureMechanism
{
StorageId = storageId
};
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/AssessmentSectionPersistorTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/AssessmentSectionPersistorTest.cs (.../AssessmentSectionPersistorTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/AssessmentSectionPersistorTest.cs (.../AssessmentSectionPersistorTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -152,7 +152,7 @@
Assert.AreEqual(name, section.Name);
Assert.AreEqual(composition, section.Composition);
Assert.AreEqual(norm, section.FailureMechanismContribution.Norm);
- Assert.AreEqual(pipingFailureMechanismStorageId, section.Piping.StorageId);
+ Assert.AreEqual(pipingFailureMechanismStorageId, section.PipingFailureMechanism.StorageId);
Assert.AreEqual(hydraulicDatabaseVersion, section.HydraulicBoundaryDatabase.Version);
Assert.AreEqual(hydraulicDatabasePath, section.HydraulicBoundaryDatabase.FilePath);
Assert.AreEqual(2, section.HydraulicBoundaryDatabase.Locations.Count);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/PipingFailureMechanismPersistorTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/PipingFailureMechanismPersistorTest.cs (.../PipingFailureMechanismPersistorTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/PipingFailureMechanismPersistorTest.cs (.../PipingFailureMechanismPersistorTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -80,7 +80,7 @@
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
// Call
- TestDelegate test = () => persistor.LoadModel(null, new Piping());
+ TestDelegate test = () => persistor.LoadModel(null, new PipingFailureMechanism());
// Assert
var exception = Assert.Throws(test);
@@ -117,7 +117,7 @@
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
// Call
- TestDelegate test = () => persistor.LoadModel(entity, new Piping());
+ TestDelegate test = () => persistor.LoadModel(entity, new PipingFailureMechanism());
// Assert
Assert.Throws(test);
@@ -128,7 +128,7 @@
{
// Setup
const long storageId = 1234L;
- Piping model = new Piping
+ PipingFailureMechanism model = new PipingFailureMechanism
{
StorageId = storageId
};
@@ -143,11 +143,11 @@
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
// Call
- persistor.LoadModel(entity, assessmentSection.Piping);
+ persistor.LoadModel(entity, assessmentSection.PipingFailureMechanism);
// Assert
- Piping loadedModel = assessmentSection.Piping;
- Assert.IsInstanceOf(loadedModel);
+ PipingFailureMechanism loadedModel = assessmentSection.PipingFailureMechanism;
+ Assert.IsInstanceOf(loadedModel);
Assert.AreEqual(loadedModel.StorageId, entity.FailureMechanismEntityId);
Assert.AreEqual(model.StorageId, loadedModel.StorageId);
}
@@ -160,7 +160,7 @@
mockRepository.ReplayAll();
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
- Piping model = new Piping();
+ PipingFailureMechanism model = new PipingFailureMechanism();
// Call
TestDelegate test = () => persistor.InsertModel(null, model);
@@ -199,7 +199,7 @@
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
IList parentNavigationProperty = new List();
- Piping model = new Piping();
+ PipingFailureMechanism model = new PipingFailureMechanism();
// Call
persistor.InsertModel(parentNavigationProperty, model);
@@ -231,13 +231,13 @@
entityToDelete
};
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
- Piping piping = new Piping
+ PipingFailureMechanism pipingFailureMechanism = new PipingFailureMechanism
{
StorageId = storageId
};
// Call
- persistor.InsertModel(parentNavigationProperty, piping);
+ persistor.InsertModel(parentNavigationProperty, pipingFailureMechanism);
// Assert
Assert.AreEqual(2, parentNavigationProperty.Count);
@@ -257,7 +257,7 @@
mockRepository.ReplayAll();
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
- Piping model = new Piping
+ PipingFailureMechanism model = new PipingFailureMechanism
{
StorageId = storageId
};
@@ -300,7 +300,7 @@
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
IList parentNavigationProperty = new List();
- Piping model = new Piping
+ PipingFailureMechanism model = new PipingFailureMechanism
{
StorageId = storageId
};
@@ -336,7 +336,7 @@
FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism
}
};
- Piping model = new Piping
+ PipingFailureMechanism model = new PipingFailureMechanism
{
StorageId = storageId
};
@@ -367,7 +367,7 @@
FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism
}
};
- Piping model = new Piping
+ PipingFailureMechanism model = new PipingFailureMechanism
{
StorageId = storageId
};
@@ -394,7 +394,7 @@
var persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
IList parentNavigationProperty = new List();
- Piping model = new Piping
+ PipingFailureMechanism model = new PipingFailureMechanism
{
StorageId = 0
};
@@ -428,15 +428,15 @@
};
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
- Piping piping = new Piping
+ PipingFailureMechanism pipingFailureMechanism = new PipingFailureMechanism
{
StorageId = storageId
};
ringtoetsEntities.FailureMechanismEntities.Add(entityToDelete);
// Precondition
- persistor.InsertModel(parentNavigationProperty, piping);
+ persistor.InsertModel(parentNavigationProperty, pipingFailureMechanism);
// Call
persistor.RemoveUnModifiedEntries(parentNavigationProperty);
@@ -480,12 +480,12 @@
};
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
- Piping piping = new Piping
+ PipingFailureMechanism pipingFailureMechanism = new PipingFailureMechanism
{
StorageId = storageId
};
- TestDelegate updateTest = () => persistor.UpdateModel(parentNavigationProperty, piping);
+ TestDelegate updateTest = () => persistor.UpdateModel(parentNavigationProperty, pipingFailureMechanism);
Assert.DoesNotThrow(updateTest, "Precondition failed: Update should not throw exception.");
// Call
@@ -526,9 +526,9 @@
ringtoetsEntities.FailureMechanismEntities.Add(secondEntityToDelete);
PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities);
- Piping piping = new Piping();
+ PipingFailureMechanism pipingFailureMechanism = new PipingFailureMechanism();
- TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, piping);
+ TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, pipingFailureMechanism);
Assert.DoesNotThrow(test, "Precondition failed: UpdateModel");
// Call
@@ -569,10 +569,10 @@
var insertedFailureMechanismEntities = new List();
- IList pipingFailureMechanisms = new List();
+ IList pipingFailureMechanisms = new List();
for (var i = 0; i < numberOfInserts; i++)
{
- pipingFailureMechanisms.Add(new Piping
+ pipingFailureMechanisms.Add(new PipingFailureMechanism
{
StorageId = 0L
});
@@ -605,7 +605,7 @@
foreach (var entity in insertedFailureMechanismEntities)
{
var insertedModel = pipingFailureMechanisms.SingleOrDefault(x => x.StorageId == entity.FailureMechanismEntityId);
- Assert.IsInstanceOf(insertedModel);
+ Assert.IsInstanceOf(insertedModel);
}
mockRepository.VerifyAll();
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r2cf2214c4069c98c3cb21708729fcbc2ca964ab6 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 2cf2214c4069c98c3cb21708729fcbc2ca964ab6)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -107,7 +107,7 @@
private void InitializeDemoPipingData(AssessmentSection demoAssessmentSection)
{
- var pipingFailureMechanism = demoAssessmentSection.Piping;
+ var pipingFailureMechanism = demoAssessmentSection.PipingFailureMechanism;
using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "DR6_surfacelines.csv", "DR6_surfacelines.krp.csv"))
{
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -75,14 +75,14 @@
Assert.AreEqual(2380, demoAssessmentSection.ReferenceLine.Points.Count());
- var soilModels = demoAssessmentSection.Piping.StochasticSoilModels.ToArray();
+ var soilModels = demoAssessmentSection.PipingFailureMechanism.StochasticSoilModels.ToArray();
Assert.AreEqual(4, soilModels.Length);
- var surfaceLines = demoAssessmentSection.Piping.SurfaceLines.ToArray();
+ var surfaceLines = demoAssessmentSection.PipingFailureMechanism.SurfaceLines.ToArray();
Assert.AreEqual(4, surfaceLines.Length);
AssertCharacteristicPointsOnSurfaceLines(surfaceLines);
- Assert.AreEqual(1, demoAssessmentSection.Piping.CalculationsGroup.Children.Count);
- var calculation = demoAssessmentSection.Piping.CalculationsGroup.GetPipingCalculations().First();
+ Assert.AreEqual(1, demoAssessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Count);
+ var calculation = demoAssessmentSection.PipingFailureMechanism.CalculationsGroup.GetPipingCalculations().First();
AssertCalculationAbleToCalculate(calculation);
foreach (var failureMechanism in demoAssessmentSection.GetFailureMechanisms())
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -136,7 +136,7 @@
/// Thrown when is not in interval [0,100]
private void AddOtherContributionItem(double otherContribution)
{
- var otherFailureMechanism = new Other
+ var otherFailureMechanism = new OtherFailureMechanism
{
Contribution = otherContribution
};
Fisheye: Tag c4d2af65ad23757fb3bd11f93458839bc1787ded refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/Other.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag c116b4635603c6d5bbdedb837f68fd3839ece6ca refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/OtherFailureMechanism.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r5ef5e3e186036b4985798236624d86b2801b87d3 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 5ef5e3e186036b4985798236624d86b2801b87d3)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -39,7 +39,7 @@
-
+
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs (.../FailureMechanismContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs (.../FailureMechanismContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -33,14 +33,14 @@
///
/// Initializes a new instance of the class.
///
- /// The failure mechanism.
- /// The parent of .
- /// Thrown when or are null.
- protected FailureMechanismContext(T wrapped, IAssessmentSection parent)
+ /// The failure mechanism.
+ /// The parent of .
+ /// Thrown when or are null.
+ protected FailureMechanismContext(T wrappedFailureMechanism, IAssessmentSection parent)
{
- AssertInputsAreNotNull(wrapped, parent);
+ AssertInputsAreNotNull(wrappedFailureMechanism, parent);
- WrappedData = wrapped;
+ WrappedData = wrappedFailureMechanism;
Parent = parent;
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -111,7 +111,6 @@
dataGridView.CurrentCellDirtyStateChanged += DataGridViewCurrentCellDirtyStateChanged;
dataGridView.CellValidating += DataGridViewCellValidating;
dataGridView.DataError += DataGridViewDataError;
-// dataGridView.CellEndEdit += DataGridViewCellEndEdit;
var sectionName = new DataGridViewTextBoxColumn
{
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/OtherFailureMechanismTest.cs
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/OtherFailureMechanismTest.cs (.../OtherFailureMechanismTest.cs) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/OtherFailureMechanismTest.cs (.../OtherFailureMechanismTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -11,7 +11,7 @@
public void Constructor_Always_NameSet()
{
// Call
- var result = new Other();
+ var result = new OtherFailureMechanism();
// Assert
Assert.AreEqual("Overig", result.Name);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -154,7 +154,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = new Simple();
+ var failureMechanism = new SimpleFailureMechanism();
mocks.ReplayAll();
using (var view = new FailureMechanismResultView { FailureMechanism = failureMechanism })
{
@@ -324,7 +324,7 @@
private FailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView()
{
- var failureMechanism = new Simple();
+ var failureMechanism = new SimpleFailureMechanism();
failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List
{
@@ -345,9 +345,9 @@
return failureMechanismResultView;
}
- private class Simple : FailureMechanismBase
+ private class SimpleFailureMechanism : FailureMechanismBase
{
- public Simple() : base("Stubbed name") { }
+ public SimpleFailureMechanism() : base("Stubbed name") { }
public override IEnumerable CalculationItems
{
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -32,6 +32,7 @@
using Ringtoets.HydraRing.Data;
using Ringtoets.Integration.Data.Placeholders;
using Ringtoets.Integration.Data.Properties;
+using Ringtoets.Piping.Data;
namespace Ringtoets.Integration.Data
{
@@ -53,70 +54,70 @@
{
Name = Resources.AssessmentSection_DisplayName;
- Piping = new Piping.Data.Piping();
- GrassErosion = new Placeholder(Resources.GrassErosionFailureMechanism_DisplayName);
- MacrostabilityInward = new Placeholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName);
- Overtopping = new Placeholder(Resources.OvertoppingFailureMechanism_DisplayName);
- Closing = new Placeholder(Resources.ClosingFailureMechanism_DisplayName);
- FailingOfConstruction = new Placeholder(Resources.FailingOfConstructionFailureMechanism_DisplayName);
- StoneRevetment = new Placeholder(Resources.StoneRevetmentFailureMechanism_DisplayName);
- AsphaltRevetment = new Placeholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName);
- GrassRevetment = new Placeholder(Resources.GrassRevetmentFailureMechanism_DisplayName);
- DuneErosion = new Placeholder(Resources.ErosionFailureMechanism_DisplayName);
+ PipingFailureMechanism = new PipingFailureMechanism();
+ GrassErosion = new FailureMechanismPlaceholder(Resources.GrassErosionFailureMechanism_DisplayName);
+ MacrostabilityInward = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName);
+ Overtopping = new FailureMechanismPlaceholder(Resources.OvertoppingFailureMechanism_DisplayName);
+ Closing = new FailureMechanismPlaceholder(Resources.ClosingFailureMechanism_DisplayName);
+ FailingOfConstruction = new FailureMechanismPlaceholder(Resources.FailingOfConstructionFailureMechanism_DisplayName);
+ StoneRevetment = new FailureMechanismPlaceholder(Resources.StoneRevetmentFailureMechanism_DisplayName);
+ AsphaltRevetment = new FailureMechanismPlaceholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName);
+ GrassRevetment = new FailureMechanismPlaceholder(Resources.GrassRevetmentFailureMechanism_DisplayName);
+ DuneErosion = new FailureMechanismPlaceholder(Resources.ErosionFailureMechanism_DisplayName);
FailureMechanismContribution = new FailureMechanismContribution(GetFailureMechanisms(), 30, 30000);
ChangeComposition(composition);
}
///
- /// Gets the "Piping" failure mechanism.
+ /// Gets the "PipingFailureMechanism" failure mechanism.
///
- public Piping.Data.Piping Piping { get; private set; }
+ public PipingFailureMechanism PipingFailureMechanism { get; private set; }
///
/// Gets the "Graserosie kruin en binnentalud" failure mechanism.
///
- public Placeholder GrassErosion { get; private set; }
+ public FailureMechanismPlaceholder GrassErosion { get; private set; }
///
/// Gets the "Macrostabiliteit binnenwaarts" failure mechanism.
///
- public Placeholder MacrostabilityInward { get; private set; }
+ public FailureMechanismPlaceholder MacrostabilityInward { get; private set; }
///
/// Gets the "Overslag en overloop" failure mechanism.
///
- public Placeholder Overtopping { get; private set; }
+ public FailureMechanismPlaceholder Overtopping { get; private set; }
///
/// Gets the "Niet sluiten" failure mechanism.
///
- public Placeholder Closing { get; private set; }
+ public FailureMechanismPlaceholder Closing { get; private set; }
///
/// Gets the "Constructief falen" failure mechanism.
///
- public Placeholder FailingOfConstruction { get; private set; }
+ public FailureMechanismPlaceholder FailingOfConstruction { get; private set; }
///
/// Gets the "Steenbekledingen" failure mechanism.
///
- public Placeholder StoneRevetment { get; private set; }
+ public FailureMechanismPlaceholder StoneRevetment { get; private set; }
///
/// Gets the "Asfaltbekledingen" failure mechanism.
///
- public Placeholder AsphaltRevetment { get; private set; }
+ public FailureMechanismPlaceholder AsphaltRevetment { get; private set; }
///
/// Gets the "Grasbekledingen" failure mechanism.
///
- public Placeholder GrassRevetment { get; private set; }
+ public FailureMechanismPlaceholder GrassRevetment { get; private set; }
///
/// Gets the "Duinerosie" failure mechanism.
///
- public Placeholder DuneErosion { get; private set; }
+ public FailureMechanismPlaceholder DuneErosion { get; private set; }
public string Name { get; set; }
@@ -133,7 +134,7 @@
set
{
referenceLine = value;
- Piping.SemiProbabilisticInput.SectionLength = value == null ? double.NaN : Math2D.Length(value.Points);
+ PipingFailureMechanism.SemiProbabilisticInput.SectionLength = value == null ? double.NaN : Math2D.Length(value.Points);
}
}
@@ -146,7 +147,7 @@
private set
{
contritbution = value;
- Piping.SemiProbabilisticInput.Norm = value.Norm;
+ PipingFailureMechanism.SemiProbabilisticInput.Norm = value.Norm;
}
}
@@ -156,7 +157,7 @@
public IEnumerable GetFailureMechanisms()
{
- yield return Piping;
+ yield return PipingFailureMechanism;
yield return GrassErosion;
yield return MacrostabilityInward;
yield return Overtopping;
@@ -173,7 +174,7 @@
switch (newComposition)
{
case AssessmentSectionComposition.Dike:
- Piping.Contribution = 24;
+ PipingFailureMechanism.Contribution = 24;
GrassErosion.Contribution = 24;
MacrostabilityInward.Contribution = 4;
Overtopping.Contribution = 2;
@@ -186,7 +187,7 @@
FailureMechanismContribution.UpdateContributions(GetFailureMechanisms(), 30);
break;
case AssessmentSectionComposition.Dune:
- Piping.Contribution = 0;
+ PipingFailureMechanism.Contribution = 0;
GrassErosion.Contribution = 0;
MacrostabilityInward.Contribution = 0;
Overtopping.Contribution = 0;
@@ -199,7 +200,7 @@
FailureMechanismContribution.UpdateContributions(GetFailureMechanisms(), 30);
break;
case AssessmentSectionComposition.DikeAndDune:
- Piping.Contribution = 24;
+ PipingFailureMechanism.Contribution = 24;
GrassErosion.Contribution = 24;
MacrostabilityInward.Contribution = 4;
Overtopping.Contribution = 2;
Fisheye: Tag c116b4635603c6d5bbdedb837f68fd3839ece6ca refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag c4d2af65ad23757fb3bd11f93458839bc1787ded refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/Placeholder.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -41,7 +41,7 @@
Properties\GlobalAssembly.cs
-
+
True
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/FailureMechanismPlaceholderContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/FailureMechanismPlaceholderContext.cs (.../FailureMechanismPlaceholderContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/FailureMechanismPlaceholderContext.cs (.../FailureMechanismPlaceholderContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -20,26 +20,25 @@
// All rights reserved.
using System;
-using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Integration.Data.Placeholders;
namespace Ringtoets.Integration.Forms.PresentationObjects
{
///
- /// This class is a presentation object for an instance of .
+ /// This class is a presentation object for an instance of .
///
- public class FailureMechanismPlaceholderContext : FailureMechanismContext
+ public class FailureMechanismPlaceholderContext : FailureMechanismContext
{
///
/// Initializes a new instance of the class.
///
- /// The failure mechanism.
- /// The parent of .
- /// Thrown when or are null.
- public FailureMechanismPlaceholderContext(Placeholder wrapped, IAssessmentSection parent) :
- base(wrapped, parent)
+ /// The failure mechanism.
+ /// The parent of .
+ /// Thrown when or are null.
+ public FailureMechanismPlaceholderContext(FailureMechanismPlaceholder wrappedFailureMechanism, IAssessmentSection parent) :
+ base(wrappedFailureMechanism, parent)
{
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r2cf2214c4069c98c3cb21708729fcbc2ca964ab6 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision 2cf2214c4069c98c3cb21708729fcbc2ca964ab6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -53,6 +53,7 @@
using Ringtoets.Integration.Forms.Views;
using Ringtoets.Integration.Plugin.FileImporters;
using Ringtoets.Integration.Plugin.Properties;
+using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
using RingtoetsDataResources = Ringtoets.Integration.Data.Properties.Resources;
using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
@@ -352,8 +353,8 @@
{
foreach (IFailureMechanism failureMechanism in nodeData.GetFailureMechanisms())
{
- var placeHolder = failureMechanism as Placeholder;
- var piping = failureMechanism as Piping.Data.Piping;
+ var placeHolder = failureMechanism as FailureMechanismPlaceholder;
+ var piping = failureMechanism as PipingFailureMechanism;
if (placeHolder != null)
{
yield return new FailureMechanismPlaceholderContext(placeHolder, nodeData);
@@ -418,7 +419,7 @@
};
}
- private IList GetInputs(Placeholder nodeData, IAssessmentSection assessmentSection)
+ private IList GetInputs(FailureMechanismPlaceholder nodeData, IAssessmentSection assessmentSection)
{
return new ArrayList
{
@@ -429,7 +430,7 @@
};
}
- private IList GetOutputs(Placeholder nodeData)
+ private IList GetOutputs(FailureMechanismPlaceholder nodeData)
{
return new ArrayList
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -7,7 +7,7 @@
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Contribution;
-
+using Ringtoets.Piping.Data;
using RingtoetsIntegrationResources = Ringtoets.Integration.Data.Properties.Resources;
namespace Ringtoets.Integration.Data.Test
@@ -59,10 +59,10 @@
Assert.AreEqual(composition, section.Composition);
Assert.IsInstanceOf(section.FailureMechanismContribution);
- CollectionAssert.IsEmpty(section.Piping.StochasticSoilModels);
- CollectionAssert.IsEmpty(section.Piping.SurfaceLines);
+ CollectionAssert.IsEmpty(section.PipingFailureMechanism.StochasticSoilModels);
+ CollectionAssert.IsEmpty(section.PipingFailureMechanism.SurfaceLines);
- Assert.IsInstanceOf(section.Piping);
+ Assert.IsInstanceOf(section.PipingFailureMechanism);
Assert.AreEqual(grassErosionName, section.GrassErosion.Name);
Assert.AreEqual(macrostailityInwardName, section.MacrostabilityInward.Name);
Assert.AreEqual(overtoppingName, section.Overtopping.Name);
@@ -78,8 +78,8 @@
Assert.AreEqual(names, section.FailureMechanismContribution.Distribution.Select(d => d.Assessment));
Assert.AreEqual(Enumerable.Repeat(30000.0, 11), section.FailureMechanismContribution.Distribution.Select(d => d.Norm));
- Assert.AreEqual(30000.0, section.Piping.SemiProbabilisticInput.Norm);
- Assert.AreEqual(double.NaN, section.Piping.SemiProbabilisticInput.SectionLength);
+ Assert.AreEqual(30000.0, section.PipingFailureMechanism.SemiProbabilisticInput.Norm);
+ Assert.AreEqual(double.NaN, section.PipingFailureMechanism.SemiProbabilisticInput.SectionLength);
Assert.AreEqual(100, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution));
}
@@ -128,7 +128,7 @@
// Assert
Assert.AreEqual(10, failureMechanisms.Length);
- Assert.AreSame(assessmentSection.Piping, failureMechanisms[0]);
+ Assert.AreSame(assessmentSection.PipingFailureMechanism, failureMechanisms[0]);
Assert.AreSame(assessmentSection.GrassErosion, failureMechanisms[1]);
Assert.AreSame(assessmentSection.MacrostabilityInward, failureMechanisms[2]);
Assert.AreSame(assessmentSection.Overtopping, failureMechanisms[3]);
@@ -200,7 +200,7 @@
{
double[] contributions = GetContributionsArray(composition);
- Assert.AreEqual(contributions[0], assessmentSection.Piping.Contribution);
+ Assert.AreEqual(contributions[0], assessmentSection.PipingFailureMechanism.Contribution);
Assert.AreEqual(contributions[1], assessmentSection.GrassErosion.Contribution);
Assert.AreEqual(contributions[2], assessmentSection.MacrostabilityInward.Contribution);
Assert.AreEqual(contributions[3], assessmentSection.Overtopping.Contribution);
@@ -311,7 +311,7 @@
assessmentSection.ReferenceLine = referenceLine;
// Assert
- Assert.AreEqual(Math2D.Length(referenceLine.Points), assessmentSection.Piping.SemiProbabilisticInput.SectionLength);
+ Assert.AreEqual(Math2D.Length(referenceLine.Points), assessmentSection.PipingFailureMechanism.SemiProbabilisticInput.SectionLength);
}
[Test]
@@ -324,7 +324,7 @@
assessmentSection.ReferenceLine = null;
// Assert
- Assert.AreEqual(double.NaN, assessmentSection.Piping.SemiProbabilisticInput.SectionLength);
+ Assert.AreEqual(double.NaN, assessmentSection.PipingFailureMechanism.SemiProbabilisticInput.SectionLength);
}
}
}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/FailureMechanismPlaceholderTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/FailureMechanismPlaceholderTest.cs (.../FailureMechanismPlaceholderTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/FailureMechanismPlaceholderTest.cs (.../FailureMechanismPlaceholderTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -16,7 +16,7 @@
const string expectedName = "test";
// Call
- var failureMechanism = new Placeholder(expectedName);
+ var failureMechanism = new FailureMechanismPlaceholder(expectedName);
// Assert
Assert.IsInstanceOf(failureMechanism);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/FailureMechanismPlaceholderContextTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/FailureMechanismPlaceholderContextTest.cs (.../FailureMechanismPlaceholderContextTest.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/FailureMechanismPlaceholderContextTest.cs (.../FailureMechanismPlaceholderContextTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -21,13 +21,13 @@
var assessmentSection = mocks.Stub();
mocks.ReplayAll();
- var failureMechanism = new Placeholder("A");
+ var failureMechanism = new FailureMechanismPlaceholder("A");
// Call
var context = new FailureMechanismPlaceholderContext(failureMechanism, assessmentSection);
// Assert
- Assert.IsInstanceOf>(context);
+ Assert.IsInstanceOf>(context);
Assert.AreSame(failureMechanism, context.WrappedData);
Assert.AreSame(assessmentSection, context.Parent);
mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -rfc38d18fc6ff1749476da0ea43281d5d80568283 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision fc38d18fc6ff1749476da0ea43281d5d80568283)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -36,6 +36,7 @@
using Ringtoets.Integration.Data.Placeholders;
using Ringtoets.Integration.Forms.PresentationObjects;
using Ringtoets.Integration.Plugin;
+using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
@@ -145,8 +146,8 @@
// Setup
var failureMechanisms = new IFailureMechanism[]
{
- new Piping.Data.Piping(),
- new Placeholder("A")
+ new PipingFailureMechanism(),
+ new FailureMechanismPlaceholder("A")
};
var contribution = new FailureMechanismContribution(failureMechanisms, 10.0, 2);
var comments = "some comment";
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs (.../FailureMechanismPlaceholderTreeNodeInfoTest.cs) (revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs (.../FailureMechanismPlaceholderTreeNodeInfoTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -66,7 +66,7 @@
mocks.ReplayAll();
var testName = "ttt";
- var placeholder = new Placeholder(testName);
+ var placeholder = new FailureMechanismPlaceholder(testName);
var placeholderContext = new FailureMechanismPlaceholderContext(placeholder, assessmentSection);
using (var plugin = new RingtoetsGuiPlugin())
@@ -125,7 +125,7 @@
{
var info = GetInfo(plugin);
- var failureMechanism = new Placeholder("test");
+ var failureMechanism = new FailureMechanismPlaceholder("test");
failureMechanism.AddSection(new FailureMechanismSection("A", new[]
{
new Point2D(1, 2),
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfc38d18fc6ff1749476da0ea43281d5d80568283 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision fc38d18fc6ff1749476da0ea43281d5d80568283)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -74,7 +74,7 @@
// Setup
mocks.ReplayAll();
- var mechanism = new Piping.Data.Piping();
+ var mechanism = new PipingFailureMechanism();
var context = new FailureMechanismSectionResultContext(mechanism.SectionResults, mechanism);
// Call
Fisheye: Tag c4d2af65ad23757fb3bd11f93458839bc1787ded refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/Piping.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag c116b4635603c6d5bbdedb837f68fd3839ece6ca refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -59,7 +59,7 @@
-
+
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs (.../PipingCalculationContext.cs) (revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs (.../PipingCalculationContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -40,24 +40,24 @@
/// The instance wrapped by this context object.
/// The surface lines available within the piping context.
/// The stochastic soil models available within the piping context.
- /// The piping failure mechanism which the piping context belongs to.
+ /// The piping failure mechanism which the piping context belongs to.
/// The assessment section which the piping context belongs to.
- public PipingCalculationContext(PipingCalculation calculation, IEnumerable surfaceLines, IEnumerable stochasticSoilModels, Data.Piping piping, IAssessmentSection assessmentSection)
+ public PipingCalculationContext(PipingCalculation calculation, IEnumerable surfaceLines, IEnumerable stochasticSoilModels, PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection)
: base(calculation, surfaceLines, stochasticSoilModels, assessmentSection)
{
- if (piping == null)
+ if (pipingFailureMechanism == null)
{
var message = String.Format(Resources.PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
Resources.PipingContext_DataDescription_PipingFailureMechanism);
- throw new ArgumentNullException("piping", message);
+ throw new ArgumentNullException("pipingFailureMechanism", message);
}
- Piping = piping;
+ PipingFailureMechanism = pipingFailureMechanism;
}
///
- /// Gets the piping failure mechanism which the piping context belongs to.
+ /// Gets the PipingFailureMechanism failure mechanism which the PipingFailureMechanism context belongs to.
///
- public Data.Piping Piping { get; private set; }
+ public PipingFailureMechanism PipingFailureMechanism { get; private set; }
}
}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs (.../PipingCalculationGroupContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs (.../PipingCalculationGroupContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -21,7 +21,6 @@
using System;
using System.Collections.Generic;
-using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.Properties;
@@ -41,24 +40,24 @@
/// The instance wrapped by this context object.
/// The surface lines available within the piping context.
/// The stochastic soil models available within the piping context.
- /// The piping failure mechanism which the piping context belongs to.
+ /// The piping failure mechanism which the piping context belongs to.
/// The assessment section which the piping context belongs to.
- public PipingCalculationGroupContext(PipingCalculationGroup calculationGroup, IEnumerable surfaceLines, IEnumerable stochasticSoilModels, Data.Piping piping, IAssessmentSection assessmentSection)
+ public PipingCalculationGroupContext(PipingCalculationGroup calculationGroup, IEnumerable surfaceLines, IEnumerable stochasticSoilModels, PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection)
: base(calculationGroup, surfaceLines, stochasticSoilModels, assessmentSection)
{
- if (piping == null)
+ if (pipingFailureMechanism == null)
{
var message = string.Format(Resources.PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
Resources.PipingContext_DataDescription_PipingFailureMechanism);
- throw new ArgumentNullException("piping", message);
+ throw new ArgumentNullException("pipingFailureMechanism", message);
}
- Piping = piping;
+ PipingFailureMechanism = pipingFailureMechanism;
}
///
- /// Gets the piping failure mechanism which the piping context belongs to.
+ /// Gets the PipingFailureMechanism failure mechanism which the PipingFailureMechanism context belongs to.
///
- public Data.Piping Piping { get; private set; }
+ public PipingFailureMechanism PipingFailureMechanism { get; private set; }
}
}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingFailureMechanismContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingFailureMechanismContext.cs (.../PipingFailureMechanismContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingFailureMechanismContext.cs (.../PipingFailureMechanismContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -20,25 +20,24 @@
// All rights reserved.
using System;
-using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Piping.Data;
namespace Ringtoets.Piping.Forms.PresentationObjects
{
///
- /// This class is a presentation object for an instance of .
+ /// This class is a presentation object for an instance of .
///
- public class PipingFailureMechanismContext : FailureMechanismContext
+ public class PipingFailureMechanismContext : FailureMechanismContext
{
///
/// Initializes a new instance of the class.
///
/// The failure mechanism.
/// The parent of .
/// Thrown when or are null.
- public PipingFailureMechanismContext(Data.Piping failureMechanism, IAssessmentSection assessmentSection) :
+ public PipingFailureMechanismContext(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) :
base(failureMechanism, assessmentSection)
{
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs (.../RingtoetsPipingSurfaceLinesContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs (.../RingtoetsPipingSurfaceLinesContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -21,14 +21,13 @@
using System;
using Core.Common.Base;
-using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Piping.Data;
namespace Ringtoets.Piping.Forms.PresentationObjects
{
///
- /// The presentation object for .
+ /// The presentation object for .
///
public class RingtoetsPipingSurfaceLinesContext : IObservable
{
@@ -38,7 +37,7 @@
/// The failure mechanism to wrap.
/// The assessment section.
/// Thrown when or is null.
- public RingtoetsPipingSurfaceLinesContext(Data.Piping failureMechanism, IAssessmentSection assessmentSection)
+ public RingtoetsPipingSurfaceLinesContext(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
{
if (failureMechanism == null)
{
@@ -54,7 +53,7 @@
AssessmentSection = assessmentSection;
}
- public Data.Piping FailureMechanism { get; private set; }
+ public PipingFailureMechanism FailureMechanism { get; private set; }
public IAssessmentSection AssessmentSection { get; private set; }
#region IObservable
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelContext.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelContext.cs (.../StochasticSoilModelContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelContext.cs (.../StochasticSoilModelContext.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -21,14 +21,13 @@
using System;
using Core.Common.Base;
-using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Piping.Data;
namespace Ringtoets.Piping.Forms.PresentationObjects
{
///
- /// The presentation object for .
+ /// The presentation object for .
///
public class StochasticSoilModelContext : IObservable
{
@@ -38,7 +37,7 @@
/// The failure mechanism to wrap.
/// The assessment section.
/// Thrown when or is null.
- public StochasticSoilModelContext(Data.Piping failureMechanism, IAssessmentSection assessmentSection)
+ public StochasticSoilModelContext(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
{
if (failureMechanism == null)
{
@@ -54,7 +53,7 @@
AssessmentSection = assessmentSection;
}
- public Data.Piping FailureMechanism { get; private set; }
+ public PipingFailureMechanism FailureMechanism { get; private set; }
public IAssessmentSection AssessmentSection { get; private set; }
#region IObservable
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r65fbb105db0ceec852fbf97a568cec6f8c634809 -rc4d2af65ad23757fb3bd11f93458839bc1787ded
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 65fbb105db0ceec852fbf97a568cec6f8c634809)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
@@ -53,7 +53,7 @@
private IAssessmentSection assessmentSection;
private DataGridViewComboBoxColumn hydraulicBoundaryLocationColumn;
private PipingCalculationGroup pipingCalculationGroup;
- private Data.Piping piping;
+ private PipingFailureMechanism pipingFailureMechanism;
private DataGridViewComboBoxColumn stochasticSoilModelColumn;
private DataGridViewComboBoxColumn stochasticSoilProfileColumn;
private bool updatingDataSource;
@@ -78,17 +78,17 @@
///
/// Gets or sets the piping failure mechanism.
///
- public Data.Piping Piping
+ public PipingFailureMechanism PipingFailureMechanism
{
get
{
- return piping;
+ return pipingFailureMechanism;
}
set
{
- piping = value;
- pipingStochasticSoilModelsObserver.Observable = piping != null ? piping.StochasticSoilModels : null;
- pipingFailureMechanismObserver.Observable = piping;
+ pipingFailureMechanism = value;
+ pipingStochasticSoilModelsObserver.Observable = pipingFailureMechanism != null ? pipingFailureMechanism.StochasticSoilModels : null;
+ pipingFailureMechanismObserver.Observable = pipingFailureMechanism;
UpdateStochasticSoilModelColumn();
UpdateStochasticSoilProfileColumn();
@@ -151,7 +151,7 @@
protected override void Dispose(bool disposing)
{
AssessmentSection = null;
- Piping = null;
+ PipingFailureMechanism = null;
if (disposing && (components != null))
{
@@ -305,9 +305,9 @@
private void UpdateGenerateScenariosButtonState()
{
- buttonGenerateScenarios.Enabled = piping != null &&
- piping.SurfaceLines.Any() &&
- piping.StochasticSoilModels.Any();
+ buttonGenerateScenarios.Enabled = pipingFailureMechanism != null &&
+ pipingFailureMechanism.SurfaceLines.Any() &&
+ pipingFailureMechanism.StochasticSoilModels.Any();
}
private void RefreshDataGridView()
@@ -386,13 +386,13 @@
private IEnumerable GetSoilModelsForCalculation(PipingCalculation pipingCalculation)
{
- if (piping == null)
+ if (pipingFailureMechanism == null)
{
return Enumerable.Empty();
}
return PipingCalculationConfigurationHelper.GetStochasticSoilModelsForSurfaceLine(
pipingCalculation.InputParameters.SurfaceLine,
- piping.StochasticSoilModels);
+ pipingFailureMechanism.StochasticSoilModels);
}
private IEnumerable GetSoilProfilesForCalculation(PipingCalculation pipingCalculation)
@@ -420,10 +420,10 @@
{
listBox.Items.Clear();
- if (piping != null && piping.Sections.Any())
+ if (pipingFailureMechanism != null && pipingFailureMechanism.Sections.Any())
{
- listBox.Items.AddRange(piping.Sections.Cast