Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r392a294fe943895657d19f2534b66770ae258d25 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 392a294fe943895657d19f2534b66770ae258d25)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -282,7 +282,7 @@
}
///
- /// Looks up a localized string similar to Gto.
+ /// Looks up a localized string similar to Gf.
///
public static string SerializableCombinedFailureMechanismSectionAssembly_IdPrefix {
get {
@@ -291,7 +291,7 @@
}
///
- /// Looks up a localized string similar to Ts.
+ /// Looks up a localized string similar to Fm.
///
public static string SerializableFailureMechanismCreator_IdPrefix {
get {
@@ -300,7 +300,7 @@
}
///
- /// Looks up a localized string similar to Tv.
+ /// Looks up a localized string similar to Bv.
///
public static string SerializableFailureMechanismSection_IdPrefix {
get {
@@ -309,7 +309,7 @@
}
///
- /// Looks up a localized string similar to T.
+ /// Looks up a localized string similar to F.
///
public static string SerializableFailureMechanismSectionAssembly_IdPrefix {
get {
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx
===================================================================
diff -u -r392a294fe943895657d19f2534b66770ae258d25 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision 392a294fe943895657d19f2534b66770ae258d25)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -130,19 +130,19 @@
Bp
- Ts
+ Fm
- Tv
+ Bv
- T
+ F
Vi
- Gto
+ Gf
{0} Er is geen toetsoordeel geƫxporteerd.
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs
===================================================================
diff -u -ra1090298a1bbfca8db1877eed50cab25a1d00cc8 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision a1090298a1bbfca8db1877eed50cab25a1d00cc8)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -130,7 +130,7 @@
sectionId++);
SerializableCombinedFailureMechanismSectionAssembly actualSectionAssemblyResult = serializableFailureMechanismSectionAssemblies.ElementAt(i);
- Assert.AreEqual($"Gto.{combinedSectionId++}", actualSectionAssemblyResult.Id);
+ Assert.AreEqual($"Gf.{combinedSectionId++}", actualSectionAssemblyResult.Id);
Assert.AreEqual(actualSection.Id, actualSectionAssemblyResult.FailureMechanismSectionId);
Assert.AreEqual(expectedSerializableTotalAssemblyResult.Id, actualSectionAssemblyResult.TotalAssemblyResultId);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -114,7 +114,7 @@
// Assert
SerializableFailureMechanism serializableFailureMechanism = aggregatedFailureMechanism.FailureMechanism;
- Assert.AreEqual("Ts.0", serializableFailureMechanism.Id);
+ Assert.AreEqual("Fm.0", serializableFailureMechanism.Id);
Assert.AreEqual(serializableTotalAssembly.Id, serializableFailureMechanism.TotalAssemblyResultId);
Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.GenericFailureMechanism);
@@ -159,7 +159,7 @@
ExportableFailureMechanismSectionAssemblyWithProbabilityResult expectedSectionAssemblyResult = expectedSectionAssemblyResults.ElementAt(i);
SerializableFailureMechanismSectionAssembly actualSectionAssemblyResult = serializableFailureMechanismSectionAssemblies.ElementAt(i);
- Assert.AreEqual($"T.{sectionAssemblyId++}", actualSectionAssemblyResult.Id);
+ Assert.AreEqual($"F.{sectionAssemblyId++}", actualSectionAssemblyResult.Id);
Assert.AreEqual(expectedSerializableFailureMechanism.Id, actualSectionAssemblyResult.FailureMechanismId);
Assert.AreEqual(actualSection.Id, actualSectionAssemblyResult.FailureMechanismSectionId);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs
===================================================================
diff -u -re512d8a06d1bed7093f968af74acb02a64d46769 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision e512d8a06d1bed7093f968af74acb02a64d46769)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -235,17 +235,17 @@
SerializableFeatureMember[] serializableAssemblyFeatureMembers)
{
var failureMechanism = (SerializableFailureMechanism) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism];
- AssertSerializableFailureMechanism($"Ts.{expectedId}",
+ AssertSerializableFailureMechanism($"Fm.{expectedId}",
expectedSerializableTotalAssemblyResult,
failureMechanism);
var failureMechanismSectionCollection = (SerializableFailureMechanismSectionCollection) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 10];
AssertSerializableFailureMechanismSectionCollection($"Vi.{expectedId}",
failureMechanismSectionCollection);
var serializableFailureMechanismSection = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 15];
- AssertSerializableFailureMechanismSection($"Tv.{expectedId}",
+ AssertSerializableFailureMechanismSection($"Bv.{expectedId}",
failureMechanismSectionCollection,
serializableFailureMechanismSection);
- AssertSerializableFailureMechanismSectionAssembly($"T.{expectedId}",
+ AssertSerializableFailureMechanismSectionAssembly($"F.{expectedId}",
failureMechanism,
serializableFailureMechanismSection,
(SerializableFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 4]);
@@ -287,10 +287,10 @@
SerializableFeatureMember[] serializableAssemblyFeatureMembers)
{
var combinedFailureMechanismSection = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly + 11];
- AssertSerializableFailureMechanismSection($"Tv.{expectedSectionId}",
+ AssertSerializableFailureMechanismSection($"Bv.{expectedSectionId}",
expectedCombinedFailureMechanismSectionCollection,
combinedFailureMechanismSection);
- AssertSerializableCombinedFailureMechanismSectionAssembly($"Gto.{expectedCombinedSectionAssemblyId}",
+ AssertSerializableCombinedFailureMechanismSectionAssembly($"Gf.{expectedCombinedSectionAssemblyId}",
expectedSerializableTotalAssemblyResult,
combinedFailureMechanismSection,
(SerializableCombinedFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly]);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -r16ecb0ef67f466c0678dbccbdfdefce0f0230b94 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs (.../SerializableFailureMechanismCreatorTest.cs) (revision 16ecb0ef67f466c0678dbccbdfdefce0f0230b94)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCreatorTest.cs (.../SerializableFailureMechanismCreatorTest.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -84,7 +84,7 @@
failureMechanism);
// Assert
- Assert.AreEqual("Ts.0", serializableFailureMechanism.Id);
+ Assert.AreEqual("Fm.0", serializableFailureMechanism.Id);
Assert.AreEqual(serializableTotalAssembly.Id, serializableFailureMechanism.TotalAssemblyResultId);
Assert.AreEqual(SerializableFailureMechanismTypeCreator.Create(failureMechanism.Code), serializableFailureMechanism.GenericFailureMechanism);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismSectionTestHelper.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rbd8b271e8423fb8ad5b4fe455f287e142ee10233
--- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismSectionTestHelper.cs (.../SerializableFailureMechanismSectionTestHelper.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismSectionTestHelper.cs (.../SerializableFailureMechanismSectionTestHelper.cs) (revision bd8b271e8423fb8ad5b4fe455f287e142ee10233)
@@ -55,7 +55,7 @@
SerializableFailureMechanismSection actualSerializableSection,
int expectedId = 0)
{
- Assert.AreEqual($"Tv.{expectedId}", actualSerializableSection.Id);
+ Assert.AreEqual($"Bv.{expectedId}", actualSerializableSection.Id);
Assert.AreEqual(expectedCollection.Id, actualSerializableSection.FailureMechanismSectionCollectionId);
Assert.AreEqual(GeometrySerializationFormatter.Format(expectedSection.Geometry),
@@ -89,7 +89,7 @@
SerializableFailureMechanismSection actualSerializableSection,
int expectedId = 0)
{
- Assert.AreEqual($"Tv.{expectedId}", actualSerializableSection.Id);
+ Assert.AreEqual($"Bv.{expectedId}", actualSerializableSection.Id);
Assert.AreEqual(expectedCollection.Id, actualSerializableSection.FailureMechanismSectionCollectionId);
Assert.AreEqual(GeometrySerializationFormatter.Format(expectedSection.Geometry),