Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs =================================================================== diff -u -r434 -r443 --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 434) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityResultReader.cs (.../DGeoStabilityResultReader.cs) (revision 443) @@ -15,7 +15,7 @@ /// public static class DGeoStabilityResultReader { - internal enum StabilityZone { stabilityZone1a = 1, stabilityZone1b = 2, stabilityZone2a = 3, stabilityZone2b = 4, stabilityZone3a = 5, stabilityZone3b = 6 }; + internal enum StabilityZone { StabilityZone1a = 1, StabilityZone1b = 2, StabilityZone2a = 3, StabilityZone2b = 4, StabilityZone3a = 5, StabilityZone3b = 6 }; #region structs @@ -170,7 +170,7 @@ } if (ParseHasZonePlotEnabled(fileContent)) { - DGeoStabilityResultsSingleZone? zoneResults1 = GetDGeoStabilityResultsSingleZoneFrom(fileContent, StabilityZone.stabilityZone1a, StabilityZone.stabilityZone1b); + DGeoStabilityResultsSingleZone? zoneResults1 = GetDGeoStabilityResultsSingleZoneFrom(fileContent, StabilityZone.StabilityZone1a, StabilityZone.StabilityZone1b); if (zoneResults1 != null) { results.Zone1 = zoneResults1.Value; @@ -179,7 +179,7 @@ { throw new DGeoStabilityResultReaderException(Resources.DGeoStabilityResultReader_GetDGeoStabilityResults_StabilityZone1aOr1bShouldExist); } - results.Zone2 = GetDGeoStabilityResultsSingleZoneFrom(fileContent, StabilityZone.stabilityZone2a, StabilityZone.stabilityZone2b); + results.Zone2 = GetDGeoStabilityResultsSingleZoneFrom(fileContent, StabilityZone.StabilityZone2a, StabilityZone.StabilityZone2b); } else { @@ -213,6 +213,8 @@ /// Get the results from a zone (A or if not exists then B) /// /// + /// + /// /// private static DGeoStabilityResultsSingleZone? GetDGeoStabilityResultsSingleZoneFrom(string fileContent, StabilityZone zoneA, StabilityZone zoneB) { Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs =================================================================== diff -u -r434 -r443 --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs (.../DGeoStabilityResultReaderTests.cs) (revision 434) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityResultReaderTests.cs (.../DGeoStabilityResultReaderTests.cs) (revision 443) @@ -20,7 +20,6 @@ [Test] public void TestReadSafetyFactor() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 string inputFileName = Path.Combine(TestFolder, TestFileInput); var result = DGeoStabilityResultReader.ExtractStabilityResults(inputFileName); Assert.GreaterOrEqual(1.276, result.Zone1.SafetyFactor); @@ -29,7 +28,6 @@ [Test] public void TestCanParseStringContentWhenSafetyFactorIsInFirstColumn() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 var contents = @" 28.237 28.850 23.786 2.324 " + Environment.NewLine + @"[End of CircleResults]" + Environment.NewLine + Environment.NewLine + @@ -65,7 +63,6 @@ [Test] public void TestCanParseStringContentWhenSafetyFactorIsInOtherColumn() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 var contents = @" 28.237 28.850 23.786 2.324 " + Environment.NewLine + @"[End of CircleResults]" + Environment.NewLine + Environment.NewLine + @@ -101,7 +98,6 @@ [Test] public void TestCanParseFileContentsStability() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 string fileName = Path.Combine(TestFolder, TestFileOutput); var contents = DGeoStabilityResultReader.GetFileContents(fileName); var result = DGeoStabilityResultReader.GetDGeoStabilityResults(contents); @@ -112,8 +108,6 @@ [Test] public void TestCorrectionSafetyFactorForUplift() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 - // but added that safetyfactor is divided by factor 1.05 when IsUpliftResults is true string fileName = Path.Combine(TestFolder, TestFileUplift); var contents = DGeoStabilityResultReader.GetFileContents(fileName); var result = DGeoStabilityResultReader.GetDGeoStabilityResults(contents); @@ -123,12 +117,10 @@ [Test] public void TestCorrectionSafetyFactorForUpliftWithZone() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 - // but added that safetyfactor is divided by factor 1.05 when IsUpliftResults is true string fileName = Path.Combine(TestFolder, TestFileWithZonePlotUplift); var contents = DGeoStabilityResultReader.GetFileContents(fileName); var result = DGeoStabilityResultReader.ParseZoneResults(contents, - (int)DGeoStabilityResultReader.StabilityZone.stabilityZone1a); + (int)DGeoStabilityResultReader.StabilityZone.StabilityZone1a); Assert.IsTrue(result != null); var safetyFactor = ((DGeoStabilityResultReader.DGeoStabilityResultsSingleZone)result).SafetyFactor; Assert.AreEqual(1.104 / 1.05, safetyFactor, 0.001); @@ -137,7 +129,6 @@ [Test] public void TestValidateIfFileContentsHasZonePlotEnabled() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 string fileName = Path.Combine(TestFolder, TestFileWithZonePlot); var contents = DGeoStabilityResultReader.GetFileContents(fileName); var result = DGeoStabilityResultReader.ParseHasZonePlotEnabled(contents); @@ -147,7 +138,6 @@ [Test] public void TestFileContentsHasZonePlotDisabled() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 string zonePlotOff = @"[MODEL]" + Environment.NewLine + @" 1 : Bishop" + Environment.NewLine + @" 1 : C phi" + Environment.NewLine + @@ -168,7 +158,6 @@ [Test] public void TestFileContentsHasZonePlotZone1bAndZone2b() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 string testWithZonePlot1bAnd2b = @"[MODEL]" + Environment.NewLine + @" 1 : Bishop" + Environment.NewLine + @" 1 : C phi" + Environment.NewLine + @@ -242,7 +231,6 @@ [Test] public void TestCanParseFileHasStabilityFactorZone() { - // expected results are based on test in 'https://repos.deltares.nl/repos/dam/dam classic' revision 230 string fileName = Path.Combine(TestFolder, TestFileWithZonePlot); var contents = DGeoStabilityResultReader.GetFileContents(fileName); var result = DGeoStabilityResultReader.GetDGeoStabilityResults(contents); @@ -521,7 +509,7 @@ var contents = @" 1 : Zone plot on" + Environment.NewLine + @"[Dump]"; DGeoStabilityResultReader.ParseZoneResults(contents, - (int) DGeoStabilityResultReader.StabilityZone.stabilityZone2a); + (int) DGeoStabilityResultReader.StabilityZone.StabilityZone2a); } [Test] @@ -533,7 +521,7 @@ string fileName = Path.Combine(TestFolder, "damCorruptFactorsMissing.std"); var contents = DGeoStabilityResultReader.GetFileContents(fileName); DGeoStabilityResultReader.ParseZoneResults(contents, - (int) DGeoStabilityResultReader.StabilityZone.stabilityZone2a); + (int) DGeoStabilityResultReader.StabilityZone.StabilityZone2a); } [Test] @@ -545,7 +533,7 @@ var contents = DGeoStabilityResultReader.GetFileContents(fileName); try { - DGeoStabilityResultReader.ParseZoneResults(contents, (int)DGeoStabilityResultReader.StabilityZone.stabilityZone2a); + DGeoStabilityResultReader.ParseZoneResults(contents, (int)DGeoStabilityResultReader.StabilityZone.StabilityZone2a); } catch (Exception e) {