Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r3033 -r3078
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 3033)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 3078)
@@ -44,55 +44,14 @@
..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.SellmeijerVNKCalculator.dll
-
+
False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Calculation.dll
-
-
..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.CSharpWrapper.dll
-
+
False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Data.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Geometry.dll
-
-
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Interface.dll
-
-
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Io.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Kernel.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Preprocessing.dll
-
-
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Reliability.dll
-
-
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Reliability.CSharpWrapper.dll
-
-
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Reliability.Interface.dll
-
-
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Reliability.Io.dll
-
-
- False
..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Standard.dll
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.WaternetCreator.dll
-
False
..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.SearchAlgorithms.dll
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r2918 -r3078
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 2918)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 3078)
@@ -40,30 +40,6 @@
False
..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.CSharpWrapper.dll
-
- False
- ..\..\..\MacroStabilityReliability\extern\Macrostability\Deltares.MacroStability.Data.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Geometry.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Io.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.Preprocessing.dll
-
-
- False
- ..\..\..\MacroStabilityReliability\extern\Macrostability\Deltares.MacroStability.Standard.dll
-
-
- False
- ..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.MacroStability.WaternetCreator.dll
-
False
..\..\lib\FailureMechanisms\MacrostabilityCSharpWrapper\Deltares.SearchAlgorithms.dll
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3049 -r3078
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3049)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3078)
@@ -213,7 +213,7 @@
// Run the dll
kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages);
MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput;
- Assert.AreEqual(0, messages.Count); // #Bka: grid ligt niet goed voor een berekening, dus faalt de berekening. OP zich prima test, dus verbouwen en uitbreiden
+ Assert.AreEqual(0, messages.Count);
Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult);
Assert.AreEqual(1, macroStabilityOutput.StabilityOutputItems.Count);
Assert.AreEqual(1.357, macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, diff); // ToDo replace by actual value when calculation is done and output is parsed