0027300: Boolean operation produces invalid shape in terms of "bopargcheck" command

1. Check, if value found by math_PSO algorithm cannot be precised by math_NewtonMinimum algorithm. In this case, we call math_PSO algorithm repeatedly, however, with other parameters.

2. Some margin of edge tolerance value has been provided in IntTools_Tools class.

3. Interface of math_NewtonMinimum class has been changed (method GetStatus() has been added).

Correction of some test cases according to their new behavior.

diff --git a/src/GeomLib/GeomLib_CheckCurveOnSurface.cxx b/src/GeomLib/GeomLib_CheckCurveOnSurface.cxx
index 7f8c8a8ae69c2adcfd0bf414dc824401492b92cd..88f31d7c511b54c18b2aa0a690201c05ff5bf281 100644 (file)
--- a/src/GeomLib/GeomLib_CheckCurveOnSurface.cxx
+++ b/src/GeomLib/GeomLib_CheckCurveOnSurface.cxx
@@ -575,6 +575,56 @@ Standard_Integer FillSubIntervals(const Handle(Geom_Curve)& theCurve3d,
   return aNbSubIntervals;
 }
 
+//=======================================================================
+//class   : PSO_Perform
+//purpose : Searches minimal distance with math_PSO class
+//=======================================================================
+Standard_Boolean PSO_Perform(GeomLib_CheckCurveOnSurface_TargetFunc& theFunction,
+                             const math_Vector &theParInf,
+                             const math_Vector &theParSup,
+                             const Standard_Real theEpsilon,
+                             const Standard_Integer theNbParticles, 
+                             Standard_Real& theBestValue,
+                             math_Vector &theOutputParam)
+{
+  const Standard_Real aDeltaParam = theParSup(1) - theParInf(1);
+  if(aDeltaParam < Precision::PConfusion())
+    return Standard_False;
+
+  math_Vector aStepPar(1, 1);
+  aStepPar(1) = theEpsilon*aDeltaParam;
+
+  math_PSOParticlesPool aParticles(theNbParticles, 1);
+
+  //They are used for finding a position of theNbParticles worst places
+  const Standard_Integer aNbControlPoints = 3*theNbParticles;
+
+  const Standard_Real aStep = aDeltaParam/(aNbControlPoints-1);
+  Standard_Integer aCount = 1;
+  for(Standard_Real aPrm = theParInf(1); aCount <= aNbControlPoints; aCount++,
+    aPrm = (aCount == aNbControlPoints)? theParSup(1) : aPrm+aStep)
+  {
+    Standard_Real aVal = RealLast();
+    if(!theFunction.Value(aPrm, aVal))
+      continue;
+
+    PSO_Particle* aParticle = aParticles.GetWorstParticle();
+
+    if(aVal > aParticle->BestDistance)
+      continue;
+
+    aParticle->Position[0] = aPrm;
+    aParticle->BestPosition[0] = aPrm;
+    aParticle->Distance     = aVal;
+    aParticle->BestDistance = aVal;
+  }
+
+  math_PSO aPSO(&theFunction, theParInf, theParSup, aStepPar);
+  aPSO.Perform(aParticles, theNbParticles, theBestValue, theOutputParam);
+
+  return Standard_True;
+}
+
 //=======================================================================
 //class   : MinComputing
 //purpose : Performs computing minimal value
@@ -590,61 +640,52 @@ Standard_Boolean MinComputing (
   {
     OCC_CATCH_SIGNALS
 
-    //They are used for finding a position of theNbParticles worst places
-    const Standard_Integer aNbControlPoints = 3*theNbParticles;
     //
-    math_Vector aParInf(1, 1), aParSup(1, 1), anOutputParam(1, 1), aStepPar(1,1);
+    math_Vector aParInf(1, 1), aParSup(1, 1), anOutputParam(1, 1);
     aParInf(1) = theFunction.FirstParameter();
     aParSup(1) = theFunction.LastParameter();
     theBestParameter = aParInf(1);
     theBestValue = RealLast();
 
-    const Standard_Real aDeltaParam = aParSup(1) - aParInf(1);
-    if(aDeltaParam < Precision::PConfusion())
-        return Standard_False;
-
-    aStepPar(1) = theEpsilon*aDeltaParam;
-
-    math_PSOParticlesPool aParticles(theNbParticles, 1);
-
-    const Standard_Real aStep = aDeltaParam/(aNbControlPoints-1);
-    Standard_Integer aCount = 1;
-    for(Standard_Real aPrm = aParInf(1); aCount <= aNbControlPoints; aCount++,
-                      aPrm = (aCount == aNbControlPoints)? aParSup(1) : aPrm+aStep)
+    if(!PSO_Perform(theFunction, aParInf, aParSup, theEpsilon, theNbParticles,
+                    theBestValue, anOutputParam))
     {
-      Standard_Real aVal = RealLast();
-      theFunction.Value(aPrm, aVal);
-
-      PSO_Particle* aParticle = aParticles.GetWorstParticle();
-
-      if(aVal > aParticle->BestDistance)
-        continue;
-
-      aParticle->Position[0] = aPrm;
-      aParticle->BestPosition[0] = aPrm;
-      aParticle->Distance     = aVal;
-      aParticle->BestDistance = aVal;
+#ifdef OCCT_DEBUG
+      cout << "BRepLib_CheckCurveOnSurface::Compute(): math_PSO is failed!" << endl;
+#endif
+      return Standard_False;
     }
 
-    math_PSO aPSO(&theFunction, aParInf, aParSup, aStepPar);
-    aPSO.Perform(aParticles, theNbParticles, theBestValue, anOutputParam);
+    theBestParameter = anOutputParam(1);
 
     //Here, anOutputParam contains parameter, which is near to optimal.
     //It needs to be more precise. Precision is made by math_NewtonMinimum.
-    math_NewtonMinimum anA(theFunction);
-    anA.Perform(theFunction, anOutputParam);
-
-    if(!anA.IsDone())
-    {
-#ifdef OCCT_DEBUG
-      cout << "BRepLib_CheckCurveOnSurface::Compute(): No solution found!" << endl;
-#endif
-      return Standard_False;
+    math_NewtonMinimum aMinSol(theFunction);
+    aMinSol.Perform(theFunction, anOutputParam);
+
+    if(aMinSol.IsDone() && (aMinSol.GetStatus() == math_OK))
+    {//math_NewtonMinimum has precised the value. We take it.
+      aMinSol.Location(anOutputParam);
+      theBestParameter =  anOutputParam(1);
+      theBestValue = aMinSol.Minimum();
+    }
+    else
+    {//Use math_PSO again but on smaller range.
+      const Standard_Real aStep = theEpsilon*(aParSup(1) - aParInf(1));
+      aParInf(1) = theBestParameter - 0.5*aStep;
+      aParSup(1) = theBestParameter + 0.5*aStep;
+
+      Standard_Real aValue = RealLast();
+      if(PSO_Perform(theFunction, aParInf, aParSup, theEpsilon, theNbParticles,
+                     aValue, anOutputParam))
+      {
+        if(aValue < theBestValue)
+        {
+          theBestValue = aValue;
+          theBestParameter = anOutputParam(1);
+        }
+      }
     }
-
-    anA.Location(anOutputParam);
-    theBestParameter =  anOutputParam(1);
-    theBestValue = anA.Minimum();
   }
   catch(Standard_Failure)
   {

diff --git a/src/IntTools/IntTools_Tools.cxx b/src/IntTools/IntTools_Tools.cxx
index 9a3c1123aa4626f383e39078cd05779ebe1cf38c..c6a71f3ca855dd90f3f9c7ef7f375d8d92e68a9d 100644 (file)
--- a/src/IntTools/IntTools_Tools.cxx
+++ b/src/IntTools/IntTools_Tools.cxx
@@ -797,8 +797,16 @@ Standard_Boolean IntTools_Tools::ComputeTolerance
   if (!aCS.IsDone()) {
     return Standard_False;
   }
-  //
-  theMaxDist = aCS.MaxDistance();
+
+  //Obtaining precise result is impossible if we use 
+  //numeric methods for solution. Therefore, we must provide
+  //some margin. Otherwise, in the future
+  //(when geometrical properties of the curve will be changed,
+  //e.g. after trimming) we will be able to come
+  //to the more precise minimum point. As result, this curve with the
+  //tolerance computed earlier will become invalid.
+  const Standard_Real anEps = (1.0+1.0e-9);
+  theMaxDist = anEps*aCS.MaxDistance();
   theMaxPar  = aCS.MaxParameter();
   //
   return Standard_True;

diff --git a/src/math/math_NewtonMinimum.cxx b/src/math/math_NewtonMinimum.cxx
index 27d73450ae1436181ae420f5a92c72c201000834..d8595833cd878f95cc15c7c455deeff2845dabd6 100644 (file)
--- a/src/math/math_NewtonMinimum.cxx
+++ b/src/math/math_NewtonMinimum.cxx
@@ -140,8 +140,9 @@ void math_NewtonMinimum::Perform(math_MultipleVarFunctionWithHessian& F,
             }
         }
        else {
-           TheStatus = math_FunctionError;
-           return;
+         Done = Standard_False;
+         TheStatus = math_FunctionError;
+         return;
        }
      }
 

diff --git a/src/math/math_NewtonMinimum.hxx b/src/math/math_NewtonMinimum.hxx
index 7de5f81d8323a9bdc30882b9944e02474d50b222..a344203a160c113a593d42e6e46befb8b6b780f2 100644 (file)
--- a/src/math/math_NewtonMinimum.hxx
+++ b/src/math/math_NewtonMinimum.hxx
@@ -98,6 +98,11 @@ public:
   //! calculation of the minimum.
   //! The exception NotDone is raised if an error has occured.
     Standard_Integer NbIterations() const;
+
+  //! Returns the Status of computation.
+  //! The exception NotDone is raised if an error has occured.
+    math_Status GetStatus() const;
+
   
   //! Prints on the stream o information on the current state
   //! of the object.

diff --git a/src/math/math_NewtonMinimum.lxx b/src/math/math_NewtonMinimum.lxx
index 2d6852b97f9eb754dcafb1f71fae17e55685cb29..78b3fee14c37de3715fa2bc71d3a93b6101bbffd 100644 (file)
--- a/src/math/math_NewtonMinimum.lxx
+++ b/src/math/math_NewtonMinimum.lxx
@@ -63,3 +63,7 @@ inline Standard_Integer math_NewtonMinimum::NbIterations() const
    return nbiter;
 }
 
+inline math_Status math_NewtonMinimum::GetStatus() const 
+{
+  return TheStatus;
+}

diff --git a/tests/bugs/modalg_6/bug25613_1 b/tests/bugs/modalg_6/bug25613_1
index 91936d4e1daac49ffea6de46e9f4c47bf92c7a01..1f9b9cd322d0bea81c62f61bab7f5044469f77ab 100644 (file)
--- a/tests/bugs/modalg_6/bug25613_1
+++ b/tests/bugs/modalg_6/bug25613_1
@@ -6,8 +6,8 @@ puts ""
 ## Wrong distance found by xdistef command for attached shapes
 ###############################
 
-set Tol 1.0e-14
-set dist_good 8.5127062130336385e-006
+set Tol 5.0e-14
+set dist_good 8.512706220911343e-006
 
 restore [locate_data_file bug698_f.brep] f
 nexplode f e

diff --git a/tests/bugs/modalg_6/bug26896_2 b/tests/bugs/modalg_6/bug26896_2
index 110bab098510a7916126a4ed72415a35d097eba7..5f2a9fa08e4c5007f954534fe0ea23ad53476fc7 100755 (executable)
--- a/tests/bugs/modalg_6/bug26896_2
+++ b/tests/bugs/modalg_6/bug26896_2
@@ -29,7 +29,7 @@ bsection result b1 f2
 
 regexp {Tolerance +MAX=([-0-9.+eE]+)} [tolerance result] full MaxTolerance
 
-set expected_MaxTolerance 0.0068942263850054935
+set expected_MaxTolerance 0.0068942263920076944
 set tol_abs_MaxTolerance 0.0
 set tol_rel_MaxTolerance 1.0e-4
 checkreal "MaxTolerance" ${MaxTolerance} ${expected_MaxTolerance} ${tol_abs_MaxTolerance} ${tol_rel_MaxTolerance}

diff --git a/tests/bugs/modalg_6/bug27282_1 b/tests/bugs/modalg_6/bug27282_1
index 1efe3b05a8ded7534882729251c634fa6cf6a2f9..2dc5a1efb6e45fc2e399190a1a1cd49c518957e7 100644 (file)
--- a/tests/bugs/modalg_6/bug27282_1
+++ b/tests/bugs/modalg_6/bug27282_1
@@ -1,5 +1,3 @@
-puts "TODO OCC27300 ALL: ERROR. result is not valid for BOP"
-
 puts "============"
 puts "OCC27282"
 puts "============"