Test for 0028196: Algorithm 'Extrema_GenLocateExtPS' failed to find the extremum in a case

Draw command 'proj' has been improved:
- Add possibility to pass the starting point. If it is passed than the algorithm Extrema_GenLocateExtPS is used instead of standard projection.
- Make the output of the command more clear.

Test case bugs/moddata_3/bug28196 has been added.

src/GeometryTest/GeometryTest_APICommands.cxx

@@ -23,6 +23,7 @@
 #include <GeometryTest.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <Extrema_GenLocateExtPS.hxx>
 #include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <GeomAPI_ExtremaCurveSurface.hxx>
 #include <GeomAPI_ExtremaSurfaceSurface.hxx>
@@ -39,6 +40,7 @@
 #include <TColStd_Array2OfReal.hxx>
 #include <Precision.hxx>
 #include <stdio.h>
+
 #ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
 #endif
@@ -48,18 +50,52 @@ Standard_IMPORT Draw_Viewer dout;
 //purpose  : 
 //=======================================================================
 
+static void showProjSolution(Draw_Interpretor& di,
+                             const Standard_Integer i,
+                             const gp_Pnt& P, const gp_Pnt& P1,
+                             const Standard_Real U, const Standard_Real V,
+                             const Standard_Boolean isSurface)
+{
+  char name[100];
+  Sprintf(name, "%s%d", "ext_", i);
+  di << name << " ";
+  char* temp = name; // portage WNT
+  if (P.Distance(P1) > Precision::Confusion())
+  {
+    Handle(Geom_Line) L = new Geom_Line(P, gp_Vec(P, P1));
+    Handle(Geom_TrimmedCurve) CT =
+      new Geom_TrimmedCurve(L, 0., P.Distance(P1));
+    DrawTrSurf::Set(temp, CT);
+  }
+  else
+  {
+    DrawTrSurf::Set(temp, P1);
+    if (isSurface)
+      di << " Point on surface ";
+    else
+      di << " Point on curve ";
+  }
+  if (isSurface)
+    di << " Parameters: " << U << " " << V << "\n";
+  else
+    di << " parameter " << i << " = " << U << "\n";
+}
+
+//=======================================================================
+//function : proj
+//purpose  : 
+//=======================================================================
+
 static Standard_Integer proj (Draw_Interpretor& di, Standard_Integer n, const char** a)
 {
   if ( n < 5)
   {
-    cout << " Use proj curve/surf x y z [extrema algo: g(grad)/t(tree)]" << endl;
+    cout << " Use proj curve/surf x y z [{extrema algo: g(grad)/t(tree)}|{u v}]" << endl;
     return 1;
   }
 
   gp_Pnt P(Draw::Atof(a[2]),Draw::Atof(a[3]),Draw::Atof(a[4]));
 
-  char name[100];
-
   Handle(Geom_Curve) GC = DrawTrSurf::GetCurve(a[1]);
   Handle(Geom_Surface) GS;
   Extrema_ExtAlgo aProjAlgo = Extrema_ExtAlgo_Grad;
@@ -74,37 +110,43 @@ static Standard_Integer proj (Draw_Interpretor& di, Standard_Integer n, const ch
     if (GS.IsNull())
       return 1;
 
-    Standard_Real U1, U2, V1, V2;
+    if (n <= 6)
-    GS->Bounds(U1,U2,V1,V2);
-
-    GeomAPI_ProjectPointOnSurf proj(P,GS,U1,U2,V1,V2,aProjAlgo);
-
-    Standard_Real UU,VV;
-    for ( Standard_Integer i = 1; i <= proj.NbPoints(); i++)
     {
-      gp_Pnt P1 = proj.Point(i);
+      Standard_Real U1, U2, V1, V2;
-      if ( P.Distance(P1) > Precision::Confusion())
+      GS->Bounds(U1,U2,V1,V2);
+
+      GeomAPI_ProjectPointOnSurf proj(P,GS,U1,U2,V1,V2,aProjAlgo);
+      if (!proj.IsDone())
       {
-        Handle(Geom_Line) L = new Geom_Line(P,gp_Vec(P,P1));
+        di << "projection failed.";
-        Handle(Geom_TrimmedCurve) CT = 
+        return 0;
-          new Geom_TrimmedCurve(L, 0., P.Distance(P1));
-        Sprintf(name,"%s%d","ext_",i);
-        char* temp = name; // portage WNT
-        DrawTrSurf::Set(temp, CT);
-        di << name << " ";
       }
-      else
+
+      Standard_Real UU,VV;
+      for ( Standard_Integer i = 1; i <= proj.NbPoints(); i++)
       {
-        Sprintf(name,"%s%d","ext_",i);
+        gp_Pnt P1 = proj.Point(i);
-        di << name << " ";
+        proj.Parameters(i, UU, VV);
-        char* temp = name; // portage WNT
+        showProjSolution(di, i, P, P1, UU, VV, Standard_True);
-        DrawTrSurf::Set(temp, P1);
-        proj.Parameters(i,UU,VV);
-        di << " Le point est sur la surface.\n";
-        di << " Ses parametres sont:  UU = " << UU << "\n";
-        di << "                       VV = " << VV << "\n";
       }
     }
+    else if (n == 7)
+    {
+      const gp_XY aP2d(Draw::Atof(a[5]), Draw::Atof(a[6]));
+      GeomAdaptor_Surface aGAS(GS);
+      Extrema_GenLocateExtPS aProjector(aGAS, Precision::PConfusion(), Precision::PConfusion());
+      aProjector.Perform(P, aP2d.X(), aP2d.Y());
+      if (!aProjector.IsDone())
+      {
+        di << "projection failed.";
+        return 0;
+      }
+
+      const Extrema_POnSurf& aP = aProjector.Point();
+      Standard_Real UU, VV;
+      aP.Parameter(UU, VV);
+      showProjSolution(di, 1, P, aP.Value(), UU, VV, Standard_True);
+    }
   }
   else
   {
@@ -121,27 +163,7 @@ static Standard_Integer proj (Draw_Interpretor& di, Standard_Integer n, const ch
     {
       gp_Pnt P1 = proj.Point(i);
       Standard_Real UU = proj.Parameter(i);
-      di << " parameter " << i << " = " << UU << "\n";
+      showProjSolution(di, i, P, P1, UU, UU, Standard_False);
-      if ( P.Distance(P1) > Precision::Confusion())
-      {
-        Handle(Geom_Line) L = new Geom_Line(P,gp_Vec(P,P1));
-        Handle(Geom_TrimmedCurve) CT = 
-          new Geom_TrimmedCurve(L, 0., P.Distance(P1));
-        Sprintf(name,"%s%d","ext_",i);
-        char* temp = name; // portage WNT
-        DrawTrSurf::Set(temp, CT);
-        di << name << " ";
-      }
-      else
-      {
-        Sprintf(name,"%s%d","ext_",i);
-        char* temp = name; // portage WNT
-        DrawTrSurf::Set(temp, P1);
-        di << name << " ";
-        UU = proj.Parameter(i);
-        di << " Le point est sur la courbe.\n";
-        di << " Son parametre est U = " << UU << "\n";
-      }
     }
   }
 
@@ -579,7 +601,9 @@ void GeometryTest::APICommands(Draw_Interpretor& theCommands)
 
   done = Standard_True;
 
-  theCommands.Add("proj", "proj curve/surf x y z [extrema algo: g(grad)/t(tree)]",__FILE__, proj);
+  theCommands.Add("proj", "proj curve/surf x y z [{extrema algo: g(grad)/t(tree)}|{u v}]\n"
+                  "\t\tOptional parameters are relevant to surf only.\n"
+                  "\t\tIf initial {u v} are given then local extrema is called",__FILE__, proj);
 
   theCommands.Add("appro", "appro result nbpoint [curve]",__FILE__, appro);
   theCommands.Add("surfapp","surfapp result nbupoint nbvpoint x y z ....",

tests/bugs/modalg_6/bug27762_2

@@ -7,7 +7,7 @@ puts ""
 
 torus s 0 10
 set out [proj s 1 0 0]
-if {[llength $out] != 4} {
+if {[llength [lmatch $out ext_*]] != 4} {
   puts "Error: projection failed"
 } else {
   puts "OK : projection passed"

tests/bugs/moddata_2/bug2755

@@ -13,6 +13,7 @@ checkshape a
 explode a f
 mksurface gs a_1
 set list [proj gs 0 10 50]
+set list [lmatch $list ext_*]
 set ll 4
 
 set good_Parameter1List [list 0 0 0 0]

tests/bugs/moddata_3/bug28196

@@ -0,0 +1,35 @@
+puts "============"
+puts "CR28196"
+puts "==========="
+puts ""
+###############################################################################
+# Algorithm 'Extrema_GenLocateExtPS' failed to find the extremum in a case
+###############################################################################
+
+puts "TODO OCC28196 ALL: Error: projection with starting point is worse"
+
+pload MODELING
+
+restore [locate_data_file bug28196.brep] f
+
+mksurface s f
+dset x 5.97447220497284
+dset y 0.0187851531995338
+dset z 0.433545417254429
+dset u 13140.3030987283
+dset v 28.5494495724281
+set max_error 1e-5
+
+proj s x y z
+set dist_proj [lindex [length ext_1] end]
+proj s x y z u v
+set dist_proj_uv [lindex [length ext_1] end]
+
+puts "Distance of standard projection $dist_proj"
+puts "Distance of projection with starting point $dist_proj_uv"
+
+if {[expr $dist_proj_uv - $dist_proj] > $max_error} {
+  puts "Error: projection with starting point is worse than standard projection"
+} else {
+  puts "OK: well projection with starting point"
+}