Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs =================================================================== diff -u -r1025 -r1038 --- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1025) +++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 1038) @@ -53,7 +53,7 @@ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityKernelType = StabilityKernelType.DamClassic; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; - + damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; DamEngine.Io.XmlInput.Input input = FillXmlInputFromDamUi.CreateInput(damProjectData); string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); @@ -93,12 +93,10 @@ Assert.AreEqual(AnalysisType.NoAdaption, allCalculationresults[0].AnalysisType); // * Probabilistic = Deterministic Assert.AreEqual(ProbabilisticType.Deterministic, allCalculationresults[0].ProbabilisticType); -// * Uplift = true ??? MUST BE FALSE?! is not relevant for outside - //Assert.AreEqual(true, allCalculationresults[0].IsUplift); <++++++++++ - Assert.AreEqual(false, allCalculationresults[0].IsUplift); +// * Uplift = true + Assert.AreEqual(true, allCalculationresults[0].IsUplift); // * Profile = "" (empty) but must be name of profile (1D: profile name, 2D-sti: name of stifile used as base, in future with real 2D: profile name) - // Assert.AreEqual(null, allCalculationresults[0].ProfileName); <++++++++++++++++ - Assert.AreEqual("DWP_1.sti", allCalculationresults[0].ProfileName); + Assert.AreEqual("DWP_1.sti", allCalculationresults[0].ProfileName); // * Profile probability = 100 Assert.AreEqual(100, allCalculationresults[0].ProfileProbability); // * Stability model = Bishop @@ -135,14 +133,13 @@ // * Dike length = 36.150 Assert.AreEqual(36.150, allCalculationresults[0].DikeLength); // * PL3 Min uplift = 1.141 - // Assert.AreEqual(1.141, allCalculationresults[0].Pl3MinUplift); <+++++++++++++++ Dam classic geeft toch waarde terwijl niet aan voorwaarde wordt voldaan! getallen zijn gelijk (upliftFactor < pl3MinUplift) in UpdateOutputValuesForPl3_4 - Assert.AreEqual(0.000, allCalculationresults[0].Pl3MinUplift); + Assert.AreEqual(1.141, allCalculationresults[0].Pl3MinUplift, diff); // * PL3 Head adjusted = 4.400 - Assert.AreEqual(0.000, allCalculationresults[0].Pl3HeadAdjusted); + Assert.AreEqual(4.400, allCalculationresults[0].Pl3HeadAdjusted); // * PL3 Min uplift (X local) = 60.640 - Assert.AreEqual(0.000, allCalculationresults[0].Pl3LocalLocationXMinUplift); + Assert.AreEqual(60.640, allCalculationresults[0].Pl3LocalLocationXMinUplift, diff); // * PL3 Min uplift (X global) = 69.060 - Assert.AreEqual(8.42, allCalculationresults[0].Pl3LocationXMinUplift); + Assert.AreEqual(69.060, allCalculationresults[0].Pl3LocationXMinUplift, diff); // * PL3 Min uplift (Y global) = 0.000 Assert.AreEqual(0.000, allCalculationresults[0].Pl3LocationYMinUplift); // * PL4 Min uplift = 0.000 @@ -200,7 +197,7 @@ Assert.AreEqual(ProbabilisticType.Deterministic, allCalculationresults[1].ProbabilisticType); // * Uplift = false Assert.AreEqual(false, allCalculationresults[1].IsUplift); - // * Profile = "" (leeg) maar zou gevuld moeten zijn met naam van 1D dus Segment_1_1D2 +// * Profile = "" (leeg) maar zou gevuld moeten zijn met naam van 1D dus Segment_1_1D2 Assert.AreEqual("Segment_1_1D2", allCalculationresults[1].ProfileName); // * Profile probability = (leeg) maar zou gevuld moeten zijn met 2.43 Assert.AreEqual(2.43, allCalculationresults[1].ProfileProbability); @@ -238,20 +235,15 @@ // * Dike length = 14.12 Assert.AreEqual(14.12, allCalculationresults[1].DikeLength, diff * 10); // * PL3 Min uplift = 1.851 - //Assert.AreEqual(1.851, allCalculationresults[1].Pl3MinUplift, diff); <++++++++++++++ Uplift is false so this should be 0 - Assert.AreEqual(0.000, allCalculationresults[1].Pl3MinUplift, diff); + Assert.AreEqual(1.851, allCalculationresults[1].Pl3MinUplift, diff); // * PL3 Head adjusted = -5.370 - // Assert.AreEqual(-5.370, allCalculationresults[1].Pl3HeadAdjusted, diff); <++++++++++++++ Uplift is false so this should be 0 - Assert.AreEqual(0.000, allCalculationresults[1].Pl3HeadAdjusted, diff); + Assert.AreEqual(-5.370, allCalculationresults[1].Pl3HeadAdjusted, diff); // * PL3 Min uplift (X local) = 31.329 - //Assert.AreEqual(31.329, allCalculationresults[1].Pl3LocalLocationXMinUplift, diff); <++++++++++++ Uplift is false so this should be 0 - Assert.AreEqual(0.000, allCalculationresults[1].Pl3LocalLocationXMinUplift, diff); + Assert.AreEqual(31.329, allCalculationresults[1].Pl3LocalLocationXMinUplift, diff); // * PL3 Min uplift (X global) = 88233.750 - //Assert.AreEqual(88233.750, allCalculationresults[1].Pl3LocationXMinUplift, diff); <++++++++++++++++ Uplift is false so this should be 0 - Assert.AreEqual(88209.150, allCalculationresults[1].Pl3LocationXMinUplift, diff); + Assert.AreEqual(88233.750, allCalculationresults[1].Pl3LocationXMinUplift, diff); // * PL3 Min uplift (Y global) = 448883.620 - //Assert.AreEqual(448883.620, allCalculationresults[1].Pl3LocationYMinUplift, diff); <+++++++++++++++++++ Uplift is false so this should be 0 - Assert.AreEqual(448864.220, allCalculationresults[1].Pl3LocationYMinUplift, diff); + Assert.AreEqual(448883.620, allCalculationresults[1].Pl3LocationYMinUplift, diff); // * PL4 Min uplift = 0.000 Assert.AreEqual(0.000, allCalculationresults[1].Pl4MinUplift); // * PL4 Head adjusted = 0.000 @@ -282,8 +274,6 @@ Assert.AreEqual(ResultEvaluation.NotEvaluated, allCalculationresults[1].ResultEvaluation); // * 1 leeg veld (Uplift Factor) Assert.AreEqual(null, allCalculationresults[1].UpliftFactor); - } - } }