Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/HydraulicShortcutRWEvaluator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLineCreatorException.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/HydraulicShortcutRWEvaluatorTests.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/AquitardEvaluatorTests.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLine4Creator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenarioSelector.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/UpliftLocationDeterminator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/UpliftRWEvaluatorTests.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r284 -r286
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 284)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 286)
@@ -113,9 +113,8 @@
-
-
+
@@ -147,14 +146,11 @@
-
-
-
@@ -171,10 +167,8 @@
-
-
@@ -189,10 +183,6 @@
-
- Code
-
-
@@ -214,7 +204,6 @@
-
@@ -237,10 +226,6 @@
{71c1e257-520d-4943-81c4-9e125daa182c}
Deltares.Stability
-
- {61810811-6765-4d51-b569-3b50da177f3c}
- Deltares.Uplift
-
{F1CD9620-15CF-41F8-AF70-5AE004A50F60}
Deltares.Dam.Data
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/CalculationHelperTest.cs
===================================================================
diff -u -r236 -r286
--- dam clients/DamUI/trunk/src/Dam/Tests/CalculationHelperTest.cs (.../CalculationHelperTest.cs) (revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/CalculationHelperTest.cs (.../DamHelperFunctionsTest.cs) (revision 286)
@@ -8,13 +8,13 @@
namespace Deltares.Dam.Tests
{
[TestFixture]
- public class CalculationHelperTest
+ public class DamHelperFunctionsTest
{
[Test]
public void TimeStampIsCreatedCorrectly()
{
var dateTime = new DateTime(2013, 11, 5, 13, 40, 30);
- string timeStamp = CalculationHelper.DateToTimeStamp(dateTime);
+ string timeStamp = DamHelperFunctions.DateToTimeStamp(dateTime);
Assert.AreEqual("2013-11-05T13:40:30", timeStamp);
}
}
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/DikeMaterialRWEvaluator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/CalculationHelperTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/UpliftLocationDeterminatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLineCreatorBase.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PLLinesCreator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs
===================================================================
diff -u -r268 -r286
--- dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs (.../DamHelperFunctions.cs) (revision 268)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs (.../DamHelperFunctions.cs) (revision 286)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -36,6 +37,44 @@
}
///
+ /// Convert Date to time stamp as needed by TNO AnySense.
+ ///
+ /// The date time.
+ ///
+ public static string DateToTimeStamp(DateTime dateTime)
+ {
+ // Following 2 lines is an example how to handle customization of this format.
+ // TNO at the last moment decided they did not need this change so we change it back to
+ // the default format
+ // string customFormat = "yyyy-MM-dd_HH-mm-ss";
+ // return dateTime.ToString(customFormat);
+ return dateTime.ToString("s", DateTimeFormatInfo.InvariantInfo);
+ }
+
+ ///
+ /// Determine name of Stability project file
+ ///
+ internal static string GetProjectFileName(string dikeName, Location location, int? jobCount, MStabModelType? model, string stabilityWorkingPath, DateTime? dateTime)
+ {
+ string calculationName = String.Format("Dik({0})_Loc({1})", dikeName, location.Name);
+ if (jobCount != null)
+ {
+ calculationName = calculationName + String.Format("_Stp({0})", jobCount);
+ }
+ if (model != null)
+ {
+ calculationName = calculationName + String.Format("_Mdl({0})", model);
+ }
+ if (dateTime != null)
+ {
+ calculationName = calculationName + "_" + DateToTimeStamp(dateTime.Value);
+ }
+ calculationName = Regex.Replace(calculationName, @"[\\\/:\*\?""'<>|.]", "_");
+ // assemble the target project file name
+ return Path.Combine(stabilityWorkingPath, calculationName + ".sti");
+ }
+
+ ///
/// Gets the D-GeoStability executable path.
///
///
@@ -49,6 +88,5 @@
@"DGeoStability.exe");
}
}
-
}
}
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLine3Or4CreatorBase.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam.sln
===================================================================
diff -u -r268 -r286
--- dam clients/DamUI/trunk/src/Dam.sln (.../Dam.sln) (revision 268)
+++ dam clients/DamUI/trunk/src/Dam.sln (.../Dam.sln) (revision 286)
@@ -1,5 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{95699CCD-37A6-4F2E-9462-F2F474AD8AE8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}"
@@ -30,8 +32,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Piping.Data", "Piping\Data\Deltares.Piping.Data.csproj", "{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Uplift", "Uplift\Deltares.Uplift.csproj", "{61810811-6765-4D51-B569-3B50DA177F3C}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LumenWorks.Framework.IO", "Tools\LumenWorks.Framework.IO\LumenWorks.Framework.IO.csproj", "{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.AssessmentMechanism", "Deltares.AssessmentMechanism\Deltares.AssessmentMechanism.csproj", "{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}"
@@ -105,10 +105,6 @@
{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Debug|x86.Build.0 = Debug|x86
{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Release|x86.ActiveCfg = Release|x86
{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Release|x86.Build.0 = Release|x86
- {61810811-6765-4D51-B569-3B50DA177F3C}.Debug|x86.ActiveCfg = Debug|x86
- {61810811-6765-4D51-B569-3B50DA177F3C}.Debug|x86.Build.0 = Debug|x86
- {61810811-6765-4D51-B569-3B50DA177F3C}.Release|x86.ActiveCfg = Release|x86
- {61810811-6765-4D51-B569-3B50DA177F3C}.Release|x86.Build.0 = Release|x86
{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.ActiveCfg = Debug|x86
{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.Build.0 = Debug|x86
{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.ActiveCfg = Release|x86
@@ -224,11 +220,11 @@
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
{146FCBE0-C8C1-46CA-AF69-E8F67F179958} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}
+ {7A9F4AF0-9F1B-4C80-83C0-252B5CED05A6} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
+ {6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
{62CC2363-893F-4ECD-BCD6-AA7150AD6918} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}
{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD} = {31A32A36-649A-41A8-9F43-6A6193C04770}
- {61810811-6765-4D51-B569-3B50DA177F3C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
{AABFB557-DC0C-41EF-9B41-B84EEBF541BB} = {31A32A36-649A-41A8-9F43-6A6193C04770}
{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770}
@@ -242,8 +238,8 @@
{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {31A32A36-649A-41A8-9F43-6A6193C04770}
{4599EA18-543F-419C-BB0B-E554F9FDD126} = {31A32A36-649A-41A8-9F43-6A6193C04770}
{960169CA-6D93-4039-85ED-E826E21FA84A} = {31A32A36-649A-41A8-9F43-6A6193C04770}
- {7A9F4AF0-9F1B-4C80-83C0-252B5CED05A6} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
- {6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
+ {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC}
+ {03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
{CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
{3929C2AB-5F5B-40A1-8D77-6303AEE7976B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
{D092C06D-9CE6-48CF-8453-637FCCE8B371} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
@@ -252,11 +248,10 @@
{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
{D258D962-3F8D-406D-A134-DEA27114EFAB} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
- {731A8E36-4E16-4C13-B548-D47DA12B813F} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
- {9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
{D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
{2C1BFE67-A106-4926-BA5A-0374EA6B99B6} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
- {1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC}
{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA} = {BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549}
+ {731A8E36-4E16-4C13-B548-D47DA12B813F} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
+ {9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
EndGlobalSection
EndGlobal
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/RWSelectorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/DamMStabAssemblerTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/CalculationHelper.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/ExpertCreatePhreaticLineTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/UpliftRWEvaluator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLine1Creator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLine3Creator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PLLinesCreatorDupuit.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/AquitardEvaluator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorLocationSafetyFactorCalculator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWEvaluator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorPLLine2Creator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/DikeMaterialRWEvaluatorTests.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r284 -r286
--- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 284)
+++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 286)
@@ -215,7 +215,6 @@
-
@@ -264,12 +263,7 @@
-
-
-
-
-
@@ -288,8 +282,6 @@
-
-
@@ -309,7 +301,6 @@
-
@@ -318,16 +309,8 @@
-
-
-
-
-
-
-
-
@@ -374,7 +357,6 @@
-
Code
@@ -424,7 +406,6 @@
-
@@ -556,10 +537,6 @@
{71c1e257-520d-4943-81c4-9e125daa182c}
Deltares.Stability
-
- {61810811-6765-4d51-b569-3b50da177f3c}
- Deltares.Uplift
-
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Tests/Deltares.Uplift.Tests.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/UpliftCalculator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Tests/SoilVolumeMassCalculatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Tests/SoilVolumeMassCalculatorEffectiveStressTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Tests/UpliftCalculatorTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/SoilVolumicMassCalculator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Tests/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Deltares.Uplift.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 286 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Uplift/Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available. Pass `N' to diff?