From 6b52f1253e49fcd43464bc22e3d9c5bd870d18c2 Mon Sep 17 00:00:00 2001 From: aml Date: Thu, 19 May 2016 12:54:18 +0300 Subject: [PATCH] 0025623: Some tests become worse after 22598 fix Tolerance of line / line analytical intersection is fixed. Test cases are updated to the new behavior. Update of test case according to the current behavior --- src/IntCurve/IntCurve_IntConicConic_1.cxx | 4 ++-- tests/boolean/volumemaker/C4 | 1 - tests/boolean/volumemaker/D2 | 2 -- tests/de/iges_1/L8 | 2 +- tests/de/iges_2/A9 | 5 +++-- tests/de/iges_2/G1 | 4 ++-- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/IntCurve/IntCurve_IntConicConic_1.cxx b/src/IntCurve/IntCurve_IntConicConic_1.cxx index 4cc5be9a53..15622b4d65 100644 --- a/src/IntCurve/IntCurve_IntConicConic_1.cxx +++ b/src/IntCurve/IntCurve_IntConicConic_1.cxx @@ -1234,8 +1234,8 @@ void IntCurve_IntConicConic::Perform(const gp_Lin2d& L1 IntRes2d_IntersectionPoint PtSeg1,PtSeg2; Standard_Real aHalfSinL1L2; Standard_Real Tol = TolR; - if(TolR< 1e-10) Tol = 1e-10; - + if(Tol < Precision::PConfusion()) + Tol = Precision::PConfusion(); LineLineGeometricIntersection(L1,L2,Tol,U1,U2,aHalfSinL1L2,nbsol); diff --git a/tests/boolean/volumemaker/C4 b/tests/boolean/volumemaker/C4 index 03b5e09448..b928b991b6 100644 --- a/tests/boolean/volumemaker/C4 +++ b/tests/boolean/volumemaker/C4 @@ -1,7 +1,6 @@ # test script on make volume operation # cylinder plane -puts "TODO OCC26737 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "TODO OCC26737 ALL: Error: bopcheck failed" # planar face diff --git a/tests/boolean/volumemaker/D2 b/tests/boolean/volumemaker/D2 index 3828782057..5e211c510b 100644 --- a/tests/boolean/volumemaker/D2 +++ b/tests/boolean/volumemaker/D2 @@ -1,5 +1,3 @@ -puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" - # test script on make volume operation # cylinder plane unstable diff --git a/tests/de/iges_1/L8 b/tests/de/iges_1/L8 index 11622673aa..b8c5514eea 100755 --- a/tests/de/iges_1/L8 +++ b/tests/de/iges_1/L8 @@ -10,7 +10,7 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 1 ( 0 ) Warnings = 3 ( 64 ) Summary = 4 ( 64 ) CHECKSHAPE : Wires = 3 ( 5 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) Summary = 7731 ( 7831 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) Summary = 7732 ( 7831 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 3842 ( 3895 ) TOLERANCE : MaxTol = 0.3140268251 ( 0.3140268243 ) AvgTol = 0.0009762560334 ( 0.000488212708 ) LABELS : N0Labels = 61 ( 61 ) N1Labels = 0 ( 1080 ) N2Labels = 0 ( 0 ) TotalLabels = 61 ( 1141 ) NameLabels = 61 ( 61 ) ColorLabels = 61 ( 1141 ) LayerLabels = 0 ( 0 ) diff --git a/tests/de/iges_2/A9 b/tests/de/iges_2/A9 index 8da46e6ce3..ea9b78bed2 100755 --- a/tests/de/iges_2/A9 +++ b/tests/de/iges_2/A9 @@ -2,6 +2,7 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO 0025623 ALL: CHECKSHAPE : Faulty" +puts "TODO 0025623 ALL: STATSHAPE : Faulty" set LinuxDiff 3 set filename Amino_172448-65210.igs @@ -10,8 +11,8 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 56 ( 12 ) Summary = 56 ( 12 ) CHECKSHAPE : Wires = 2 ( 1 ) Faces = 2 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2342 ( 1106 ) Summary = 59777 ( 25968 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2342 ( 2342 ) FreeWire = 2328 ( 2328 ) FreeEdge = 14016 ( 14016 ) SharedEdge = 24558 ( 10686 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2344 ( 1106 ) Summary = 59783 ( 25968 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 2344 ( 2342 ) FreeWire = 2328 ( 2328 ) FreeEdge = 14016 ( 14016 ) SharedEdge = 24558 ( 10686 ) TOLERANCE : MaxTol = 0.9711309062 ( 0.9711309063 ) AvgTol = 0.01916076754 ( 0.01948753951 ) LABELS : N0Labels = 250 ( 250 ) N1Labels = 2268 ( 3204 ) N2Labels = 0 ( 0 ) TotalLabels = 2518 ( 3454 ) NameLabels = 2518 ( 3454 ) ColorLabels = 2512 ( 3448 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1 index eebb4afdd2..77220f4529 100755 --- a/tests/de/iges_2/G1 +++ b/tests/de/iges_2/G1 @@ -11,8 +11,8 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 78 ( 54 ) Summary = 78 ( 54 ) CHECKSHAPE : Wires = 11 ( 3 ) Faces = 11 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 2312 ) Summary = 112063 ( 71734 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 3592 ) FreeWire = 4024 ( 4024 ) FreeEdge = 28849 ( 28849 ) SharedEdge = 44967 ( 28774 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 2312 ) Summary = 112057 ( 71733 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3592 ( 3592 ) FreeWire = 4024 ( 4024 ) FreeEdge = 28849 ( 28849 ) SharedEdge = 44964 ( 28773 ) TOLERANCE : MaxTol = 0.9133007093 ( 0.9133008813 ) AvgTol = 0.005659495327 ( 0.005903880786 ) LABELS : N0Labels = 24 ( 24 ) N1Labels = 5153 ( 6559 ) N2Labels = 0 ( 0 ) TotalLabels = 5177 ( 6583 ) NameLabels = 5177 ( 6583 ) ColorLabels = 5153 ( 6559 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) -- 2.20.1