From ad121848e3c677234c786b8347c6e0b1db2bd00d Mon Sep 17 00:00:00 2001 From: abv Date: Mon, 21 Dec 2015 18:46:58 +0300 Subject: [PATCH] 0027026: Modeling -- Improve AppCont_LeastSquare::AppCont_LeastSquare::FixSingleBorderPoint() Update of test-cases according to the new behavior --- src/AppCont/AppCont_LeastSquare.cxx | 19 +++++++++++++------ tests/bugs/modalg_6/bug26576_1 | 2 +- tests/bugs/modalg_6/bug26576_3 | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/AppCont/AppCont_LeastSquare.cxx b/src/AppCont/AppCont_LeastSquare.cxx index 92c18eb1a9..d44d555591 100644 --- a/src/AppCont/AppCont_LeastSquare.cxx +++ b/src/AppCont/AppCont_LeastSquare.cxx @@ -24,6 +24,7 @@ #include #include #include +#include //======================================================================= @@ -37,21 +38,25 @@ void AppCont_LeastSquare::FixSingleBorderPoint(const AppCont_Function& the NCollection_Array1& theFix2d, NCollection_Array1& theFix) { - Standard_Real aMaxIter = 15.0; + Standard_Integer aMaxIter = 15; Standard_Integer j, i2; NCollection_Array1 aTabP(1, Max (myNbP, 1)), aPrevP(1, Max (myNbP, 1)); NCollection_Array1 aTabP2d(1, Max (myNbP2d, 1)), aPrevP2d(1, Max (myNbP2d, 1)); Standard_Real aMult = ((theU - theU0) > (theU1 - theU)) ? 1.0: -1.0; - Standard_Real aStartParam = (theU0 + theU1) / 2.0, + Standard_Real aStartParam = theU, aCurrParam, aPrevDist = 1.0, aCurrDist = 1.0; - for (Standard_Real anIter = 1.0; anIter < aMaxIter; anIter += 1.0) + Standard_Real du = -(theU1 - theU0) / 2.0 * aMult; + Standard_Real eps = Epsilon(1.); + Standard_Real dd = du, dec = .1; + for (Standard_Integer anIter = 1; anIter < aMaxIter; anIter++) { - aCurrParam = aStartParam + aMult * (1 - pow(10, -anIter)) * (theU1 - theU0) / 2.0; + dd *= dec; + aCurrParam = aStartParam + dd; theSSP.Value(aCurrParam, aTabP2d, aTabP); // from second iteration - if (anIter > 1.5) + if (anIter > 1) { aCurrDist = 0.0; @@ -68,12 +73,14 @@ void AppCont_LeastSquare::FixSingleBorderPoint(const AppCont_Function& the } // from the third iteration - if (anIter > 2.5 && aCurrDist / aPrevDist > 10.0) + if (anIter > 2 && aCurrDist / aPrevDist > 10.0) break; } aPrevP = aTabP; aPrevP2d = aTabP2d; aPrevDist = aCurrDist; + if(aPrevDist <= eps) + break; } theFix2d = aPrevP2d; theFix = aPrevP; diff --git a/tests/bugs/modalg_6/bug26576_1 b/tests/bugs/modalg_6/bug26576_1 index a85e65d9ca..2ea4e23aed 100644 --- a/tests/bugs/modalg_6/bug26576_1 +++ b/tests/bugs/modalg_6/bug26576_1 @@ -26,7 +26,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log} full Tolerance_ set GoodNbCurv 2 -set expected_Tolerance_Reached 2.4466119525954045e-008 +set expected_Tolerance_Reached 1.2482990218170969e-007 set tol_abs_Tolerance_Reached 1.0e-7 set tol_rel_Tolerance_Reached 0.0 checkreal "Tolerance Reached" ${Tolerance_Reached} ${expected_Tolerance_Reached} ${tol_abs_Tolerance_Reached} ${tol_rel_Tolerance_Reached} diff --git a/tests/bugs/modalg_6/bug26576_3 b/tests/bugs/modalg_6/bug26576_3 index 936519de71..feb317837d 100644 --- a/tests/bugs/modalg_6/bug26576_3 +++ b/tests/bugs/modalg_6/bug26576_3 @@ -31,7 +31,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log} full Tolerance_ set GoodNbCurv 2 -set expected_Tolerance_Reached 2.4466119525954045e-008 +set expected_Tolerance_Reached 1.2482990218170969e-007 set tol_abs_Tolerance_Reached 1.0e-7 set tol_rel_Tolerance_Reached 0.0 checkreal "Tolerance Reached" ${Tolerance_Reached} ${expected_Tolerance_Reached} ${tol_abs_Tolerance_Reached} ${tol_rel_Tolerance_Reached}