From 12f139fde8d6e5f17c9a2b45f909957b31758a29 Mon Sep 17 00:00:00 2001 From: ifv Date: Thu, 16 May 2013 11:38:13 +0400 Subject: [PATCH] 0022766: Wrong results done by several algorithms for the case of intersection between a surface of revolution and a plane Add test case for this fix --- src/math/math_FunctionSetRoot.cxx | 7 +++++++ tests/bugs/modalg_5/bug22766 | 15 +++++++++++++++ 2 files changed, 22 insertions(+) create mode 100755 tests/bugs/modalg_5/bug22766 diff --git a/src/math/math_FunctionSetRoot.cxx b/src/math/math_FunctionSetRoot.cxx index e6da6430ea..9904fbb0e2 100755 --- a/src/math/math_FunctionSetRoot.cxx +++ b/src/math/math_FunctionSetRoot.cxx @@ -180,6 +180,13 @@ Standard_Boolean MyDirFunction::Value(const math_Vector& Sol, F2 = 0.5 * (FF.Norm2()); GH.TMultiply(DF, FF); + for(Standard_Integer i = GH.Lower(); i <= GH.Upper(); i++) + { + if(Precision::IsInfinite((GH.Value(i)))) + { + return Standard_False; + } + } Gnr1 = GH.Norm2(); return Standard_True; } diff --git a/tests/bugs/modalg_5/bug22766 b/tests/bugs/modalg_5/bug22766 new file mode 100755 index 0000000000..73118ab088 --- /dev/null +++ b/tests/bugs/modalg_5/bug22766 @@ -0,0 +1,15 @@ +puts "============" +puts "CR22766" +puts "============" +puts "" +##################################################################################################################### +# Wrong results done by several algorithms for the case of intersection between a surface of revolution and a plane +##################################################################################################################### + +restore [locate_data_file bug22766_f1] f1 +restore [locate_data_file bug22766_f2] f2 + +mksurface s1 f1 +mksurface s2 f2 + +intersect result s1 s2