diff --git a/src/IntWalk/IntWalk_PWalking.cxx b/src/IntWalk/IntWalk_PWalking.cxx index a655f7706b..f6234e1e5b 100644 --- a/src/IntWalk/IntWalk_PWalking.cxx +++ b/src/IntWalk/IntWalk_PWalking.cxx @@ -721,7 +721,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep, AddAPoint(line,previousPoint); // - IntWalk_StatusDeflection Status = IntWalk_OK; + IntWalk_StatusDeflection Status = IntWalk_OK, aPrevStatus = IntWalk_OK; Standard_Boolean NoTestDeflection = Standard_False; Standard_Real SvParam[4], f; Standard_Integer LevelOfEmptyInmyIntersectionOn2S=0; @@ -736,6 +736,8 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep, Arrive = Standard_False; while(!Arrive) //010 { + aPrevStatus = Status; + LevelOfIterWithoutAppend++; if(LevelOfIterWithoutAppend>20) { @@ -1126,7 +1128,13 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep, Param(3)=SvParam[2]; Param(4)=SvParam[3]; - LevelOfIterWithoutAppend = 0; + // In order to avoid cyclic changes + // (PasTropGrand --> Decrease step --> + // StepTooSmall --> Increase step --> PasTropGrand...) + // nullify LevelOfIterWithoutAppend only if the condition + // is satisfied: + if (aPrevStatus != IntWalk_PasTropGrand) + LevelOfIterWithoutAppend = 0; break; } @@ -2952,7 +2960,7 @@ IntWalk_StatusDeflection IntWalk_PWalking::TestDeflection(const IntImp_ConstIso SquareDistance(CurrentPoint.Value()); - if (aSqDist < tolconf*tolconf) { + if (aSqDist < Precision::SquareConfusion()) { pasInit[0] = Max(pasInit[0], 5.0*ResoU1); pasInit[1] = Max(pasInit[1], 5.0*ResoV1); pasInit[2] = Max(pasInit[2], 5.0*ResoU2); diff --git a/tests/boolean/bopfuse_complex/J6 b/tests/boolean/bopfuse_complex/J6 index f2d8d188a2..b714d0f729 100644 --- a/tests/boolean/bopfuse_complex/J6 +++ b/tests/boolean/bopfuse_complex/J6 @@ -1,10 +1,8 @@ -puts "TODO #22911 ALL: Error : The area of result shape is" - restore [locate_data_file a350] a restore [locate_data_file b350] b bop a b bopfuse result -checkprops result -s 0 +checkprops result -s 120.576 checkview -display result -2d -otherwise { a b } -s -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_5/bug25319_1 b/tests/bugs/modalg_5/bug25319_1 index 1cfc1e5cba..1ac303b1c3 100644 --- a/tests/bugs/modalg_5/bug25319_1 +++ b/tests/bugs/modalg_5/bug25319_1 @@ -14,5 +14,5 @@ bcommon result b1 b2 checkprops result -s 1690.81 checkshape result -checknbshapes result -vertex 21 -edge 32 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 82 +checknbshapes result -vertex 20 -edge 31 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 80 checkview -display result -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_5/bug25319_2 b/tests/bugs/modalg_5/bug25319_2 index 8072e1f329..0430e7dbfa 100644 --- a/tests/bugs/modalg_5/bug25319_2 +++ b/tests/bugs/modalg_5/bug25319_2 @@ -17,5 +17,5 @@ bcommon result b1 b2 checkprops result -s 1690.81 checkshape result -checknbshapes result -vertex 21 -edge 32 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 82 +checknbshapes result -vertex 20 -edge 31 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 80 checkview -display result -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug27896 b/tests/bugs/modalg_6/bug27896 index 47e1c18bc9..a0af479d00 100644 --- a/tests/bugs/modalg_6/bug27896 +++ b/tests/bugs/modalg_6/bug27896 @@ -26,7 +26,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log1} full Tolerance regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log2} full Tolerance_Reached2 NbCurv2 set expected_Tolerance_Reached1 2.2611960020325053e-007 -set expected_Tolerance_Reached2 5.6963104817869286e-006 +set expected_Tolerance_Reached2 7.6423429413334924e-006 checkreal "Tolerance Reached" ${Tolerance_Reached1} ${expected_Tolerance_Reached1} ${tol_abs_Tolerance_Reached} ${tol_rel_Tolerance_Reached} checkreal "Tolerance Reached" ${Tolerance_Reached2} ${expected_Tolerance_Reached2} ${tol_abs_Tolerance_Reached} ${tol_rel_Tolerance_Reached} diff --git a/tests/bugs/modalg_6/bug28492_1 b/tests/bugs/modalg_6/bug28492_1 new file mode 100644 index 0000000000..794170344a --- /dev/null +++ b/tests/bugs/modalg_6/bug28492_1 @@ -0,0 +1,21 @@ +puts "========" +puts "OCC28492" +puts "========" +puts "" +########################################## +## Boolean common does not produce expected result +########################################## + +restore [locate_data_file bug28492_case1.brep] a +explode a +bcommon result a_1 a_2 + +checknbshapes result -wire 2 -face 1 -t +checkprops result -s 1882.29 +checkshape result + +if {! [regexp "to be valid for BOP" [bopargcheck result] ] } { + puts "Error: bopargcheck failed" +} + +checkview -display result -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/bugs/modalg_6/bug28492_2 b/tests/bugs/modalg_6/bug28492_2 new file mode 100644 index 0000000000..1668abfd1f --- /dev/null +++ b/tests/bugs/modalg_6/bug28492_2 @@ -0,0 +1,21 @@ +puts "========" +puts "OCC28492" +puts "========" +puts "" +########################################## +## Boolean common does not produce expected result +########################################## + +restore [locate_data_file bug28492_case2.brep] a +explode a +bcommon result a_1 a_2 + +checknbshapes result -wire 1 -face 1 -t +checkprops result -s 77.8077 +checkshape result + +if {! [regexp "to be valid for BOP" [bopargcheck result] ] } { + puts "Error: bopargcheck failed" +} + +checkview -display result -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/bugs/modalg_6/bug28492_3 b/tests/bugs/modalg_6/bug28492_3 new file mode 100644 index 0000000000..de6404918e --- /dev/null +++ b/tests/bugs/modalg_6/bug28492_3 @@ -0,0 +1,27 @@ +puts "========" +puts "OCC28492" +puts "========" +puts "" +########################################## +## Boolean common does not produce expected result +########################################## + +restore [locate_data_file a350] a +restore [locate_data_file b350] b + +bclearobjects +bcleartools +baddobjects a +baddtools b +bfillds +bbuild result + +checknbshapes result -solid 3 -shell 3 -t +checkprops result -s 253.741 -v 82.9156 +checkshape result + +if {! [regexp "to be valid for BOP" [bopargcheck result] ] } { + puts "Error: bopargcheck failed" +} + +checkview -display result -2d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/chamfer/data/complex/C1 b/tests/chamfer/data/complex/C1 index 22a9c54241..636f90bf01 100644 --- a/tests/chamfer/data/complex/C1 +++ b/tests/chamfer/data/complex/C1 @@ -4,5 +4,7 @@ set chamf_dist_angle [list "0.01 30" "0.008 30" "0.01 60" "0.015 60" set chamf_dist_dist [list "0.01 0.006" "0.008 0.006" "0.01 0.012" "0.015 0.012" "0.01 0.006" "0.008 0.006" "0.01 0.012" "0.008 0.012"] set chamf_equal_dist [list "0.01 " "0.008 " "0.01 " "0.015 " "0.01 " "0.008 " "0.01 " "0.008 "] if { [string compare $command chamf] == 0 } { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + if { [string compare $group equal_dist] != 0 } { + puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + } }