From: emv Date: Fri, 12 Jul 2013 08:42:42 +0000 (+0400) Subject: 0024060: Wrong result done by general fuse algorithm. X-Git-Tag: V6_7_0_beta~206 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=c1746a0ac95425d8fd40dba08ab532adf74ae119 0024060: Wrong result done by general fuse algorithm. Added treatment of the vertex as a single object. Added test case bugs/modalg_5/bug24060 Modified shape's extension in test cases bugs/moddata_3/bug23943_3 bug23943_4 Modified test cases in group de according to new reference data in issue 24035 --- diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx index 2b66c0b826..e4e415e94d 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_2.cxx @@ -80,6 +80,7 @@ } // if (myDS->HasInterfShapeSubShapes(nV, nE)) { + myDS->ChangePaveBlocks(nE); continue; } // diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx index de1b7d263e..456c2d6f1d 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_4.cxx @@ -75,6 +75,7 @@ } // if (myDS->HasInterfShapeSubShapes(nV, nF)) { + myDS->ChangeFaceInfo(nF); continue; } // @@ -102,6 +103,11 @@ aVF.SetUV(aT1, aT2); // 2 myDS->AddInterf(nVx, nF); + // + BOPDS_FaceInfo& aFI=myDS->ChangeFaceInfo(nF); + BOPCol_MapOfInteger& aMVIn=aFI.ChangeVerticesIn(); + aMVIn.Add(nVx); + // if (aTolV < aTolF) { aBB.UpdateVertex(aV, aTolF); BOPDS_ShapeInfo& aSIV = myDS->ChangeShapeInfo(nVx); @@ -118,7 +124,7 @@ aVFs.SetIncrement(iSize); aVFs.Init(); } - // + // TreatVerticesEE(); } diff --git a/tests/bugs/modalg_5/bug24060 b/tests/bugs/modalg_5/bug24060 new file mode 100644 index 0000000000..722a5e6dc9 --- /dev/null +++ b/tests/bugs/modalg_5/bug24060 @@ -0,0 +1,22 @@ +puts "================" +puts "OCC24060" +puts "================" +puts "" +####################################################### +# Wrong result done by general fuse algorithm +####################################################### + +polyline p 0 0 0 0 0 1 1 0 1 1 0 0 0 0 0 +mkplane b1 p +vertex b2 0 0 1 +bclearobjects +bcleartools +baddobjects b1 b2 +bfillds +bbuild result + +set nb_v_good 4 + +set 2dviewer 0 + + diff --git a/tests/bugs/moddata_3/bug23943_3 b/tests/bugs/moddata_3/bug23943_3 index 771446d023..f94320b019 100755 --- a/tests/bugs/moddata_3/bug23943_3 +++ b/tests/bugs/moddata_3/bug23943_3 @@ -8,6 +8,6 @@ puts "" set BugNumber OCC23943 -restore [locate_data_file bug23943_s.brep] s +restore [locate_data_file bug23943_s.draw] s proj s 12.0565, 36.7424, -9.68517 diff --git a/tests/bugs/moddata_3/bug23943_4 b/tests/bugs/moddata_3/bug23943_4 index 3e6f5ae64c..a025f55787 100755 --- a/tests/bugs/moddata_3/bug23943_4 +++ b/tests/bugs/moddata_3/bug23943_4 @@ -8,6 +8,6 @@ puts "" set BugNumber OCC23943 -restore [locate_data_file bug23943_s.brep] s +restore [locate_data_file bug23943_s.draw] s proj s 4.99019, 38.0944, -11.244 diff --git a/tests/de/iges_1/J9 b/tests/de/iges_1/J9 index 4bb3a9d159..3ff8684b74 100644 --- a/tests/de/iges_1/J9 +++ b/tests/de/iges_1/J9 @@ -1,15 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: TPSTAT : Faulty" +puts "TODO CR23096 ALL: TPSTAT : Faulty" + set filename CTS21655.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 1 ) Summary = 0 ( 1 ) -TPSTAT : Faulties = 0 ( 28 ) Warnings = 112 ( 7 ) Summary = 112 ( 35 ) -CHECKSHAPE : Wires = 0 ( 0 ) Faces = 2 ( 0 ) Shells = 0 ( 1 ) Solids = 0 ( 1 ) +TPSTAT : Faulties = 0 ( 28 ) Warnings = 115 ( 7 ) Summary = 115 ( 35 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 1 ) Solids = 0 ( 1 ) NBSHAPES : Solid = 0 ( 18 ) Shell = 0 ( 18 ) Face = 1190 ( 1190 ) Summary = 15073 ( 7693 ) STATSHAPE : Solid = 0 ( 18 ) Shell = 0 ( 18 ) Face = 1190 ( 1190 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 6283 ( 3134 ) -TOLERANCE : MaxTol = 0.2496383637 ( 0.2496258832 ) AvgTol = 0.002193597722 ( 0.004111699584 ) +TOLERANCE : MaxTol = 0.2496383637 ( 0.2496258832 ) AvgTol = 0.002193043247 ( 0.004111699336 ) LABELS : N0Labels = 27 ( 27 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 27 ( 27 ) NameLabels = 27 ( 27 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/iges_1/K3 b/tests/de/iges_1/K3 index a1f4346cbe..1952cb89de 100644 --- a/tests/de/iges_1/K3 +++ b/tests/de/iges_1/K3 @@ -1,6 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO OCC24035 ALL: Error : 1 differences with reference data" +puts "TODO CR23096 ALL: LABELS : Faulty" set filename FRA62468-1.igs @@ -8,10 +7,10 @@ set filename FRA62468-1.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 315 ( 5224 ) Summary = 315 ( 5224 ) -CHECKSHAPE : Wires = 10 ( 16 ) Faces = 14 ( 14 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +CHECKSHAPE : Wires = 12 ( 18 ) Faces = 16 ( 16 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 5163 ( 5163 ) Summary = 68630 ( 68418 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 5163 ( 5163 ) FreeWire = 10 ( 10 ) FreeEdge = 283 ( 283 ) SharedEdge = 29283 ( 29075 ) -TOLERANCE : MaxTol = 0.9874083984 ( 0.9875071265 ) AvgTol = 0.0111433033 ( 0.01115568393 ) +TOLERANCE : MaxTol = 0.9874083984 ( 0.9875071265 ) AvgTol = 0.01114330307 ( 0.01115568387 ) LABELS : N0Labels = 5392 ( 5458 ) N1Labels = 18 ( 4437 ) N2Labels = 0 ( 0 ) TotalLabels = 5410 ( 9895 ) NameLabels = 5392 ( 5458 ) ColorLabels = 5391 ( 9829 ) LayerLabels = 5391 ( 9829 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) diff --git a/tests/de/iges_1/L8 b/tests/de/iges_1/L8 index bc56415a9f..2437e43755 100644 --- a/tests/de/iges_1/L8 +++ b/tests/de/iges_1/L8 @@ -1,20 +1,22 @@ # !!!! This file is generated automatically, do not edit manually! See end script -puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO OCC24035 ALL: CHECKSHAPE : Faulty" -puts "TODO OCC24035 ALL: NBSHAPES : Faulty" -puts "TODO OCC24035 ALL: Error : 4 differences with reference data" +puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" +puts "TODO CR23096 ALL: NBSHAPES : Faulty" +puts "TODO CR23096 ALL: LABELS : Faulty" + + +puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" set LinuxDiff 3 set filename PRO14319.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 2 ( 64 ) Summary = 2 ( 64 ) -CHECKSHAPE : Wires = 3 ( 4 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) Summary = 8014 ( 7831 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 4011 ( 3890 ) -TOLERANCE : MaxTol = 0.3140268251 ( 0.3140268243 ) AvgTol = 0.001089683482 ( 0.0005002891823 ) -LABELS : N0Labels = 61 ( 61 ) N1Labels = 0 ( 1075 ) N2Labels = 0 ( 0 ) TotalLabels = 61 ( 1136 ) NameLabels = 61 ( 61 ) ColorLabels = 61 ( 1136 ) LayerLabels = 0 ( 0 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 6 ( 64 ) Summary = 6 ( 64 ) +CHECKSHAPE : Wires = 21 ( 6 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) Summary = 7773 ( 7802 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 61 ( 61 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 3864 ( 3865 ) +TOLERANCE : MaxTol = 0.3140268251 ( 0.3140268243 ) AvgTol = 0.001161767154 ( 0.0004883627047 ) +LABELS : N0Labels = 61 ( 61 ) N1Labels = 0 ( 1050 ) N2Labels = 0 ( 0 ) TotalLabels = 61 ( 1111 ) NameLabels = 61 ( 61 ) ColorLabels = 61 ( 1111 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) COLORS : Colors = CYAN1 GREEN WHITE ( CYAN1 GREEN WHITE ) diff --git a/tests/de/iges_1/P5 b/tests/de/iges_1/P5 index 1b3ef496a4..0e7d33e1f3 100644 --- a/tests/de/iges_1/P5 +++ b/tests/de/iges_1/P5 @@ -1,17 +1,19 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO OCC24035 ALL: Error : 2 differences with reference data" + + +puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" set LinuxDiff 2 set filename brazo1.igs set ref_data { DATA : Faulties = 0 ( 2 ) Warnings = 0 ( 0 ) Summary = 0 ( 2 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 185 ( 453 ) Summary = 185 ( 453 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 187 ( 454 ) Summary = 187 ( 454 ) CHECKSHAPE : Wires = 6 ( 8 ) Faces = 6 ( 8 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) Summary = 4647 ( 4551 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2125 ( 2071 ) -TOLERANCE : MaxTol = 0.991254355 ( 0.991254355 ) AvgTol = 0.01133264862 ( 0.01225484849 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) Summary = 4659 ( 4555 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 223 ( 223 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 2133 ( 2075 ) +TOLERANCE : MaxTol = 0.991254355 ( 0.991254355 ) AvgTol = 0.01129351736 ( 0.01223705309 ) LABELS : N0Labels = 223 ( 223 ) N1Labels = 0 ( 256 ) N2Labels = 0 ( 0 ) TotalLabels = 223 ( 479 ) NameLabels = 223 ( 388 ) ColorLabels = 223 ( 479 ) LayerLabels = 223 ( 479 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) diff --git a/tests/de/iges_1/R8 b/tests/de/iges_1/R8 index a9ec11e01a..bdb6e9a9ff 100644 --- a/tests/de/iges_1/R8 +++ b/tests/de/iges_1/R8 @@ -1,18 +1,20 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO OCC24035 ALL: Error : 5 differences with reference data" + + +puts "TODO CR23096 Mandriva2010: Error : 5 differences with reference data found :" set LinuxDiff 5 set filename BUC60743.igs set ref_data { DATA : Faulties = 0 ( 2 ) Warnings = 0 ( 0 ) Summary = 0 ( 2 ) -TPSTAT : Faulties = 3 ( 59 ) Warnings = 1199 ( 4654 ) Summary = 1202 ( 4713 ) -CHECKSHAPE : Wires = 6 ( 16 ) Faces = 6 ( 11 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3349 ( 2837 ) Summary = 45825 ( 39090 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3349 ( 3349 ) FreeWire = 6 ( 6 ) FreeEdge = 67 ( 67 ) SharedEdge = 19538 ( 16694 ) -TOLERANCE : MaxTol = 0.9767071585 ( 5.769095076 ) AvgTol = 0.0159362762 ( 0.01730427682 ) -LABELS : N0Labels = 11 ( 11 ) N1Labels = 2891 ( 6263 ) N2Labels = 0 ( 0 ) TotalLabels = 2902 ( 6274 ) NameLabels = 2900 ( 5879 ) ColorLabels = 2891 ( 6263 ) LayerLabels = 2411 ( 5262 ) +TPSTAT : Faulties = 3 ( 59 ) Warnings = 2203 ( 4654 ) Summary = 2206 ( 4713 ) +CHECKSHAPE : Wires = 8 ( 17 ) Faces = 6 ( 11 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3349 ( 2837 ) Summary = 45820 ( 39081 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3349 ( 3349 ) FreeWire = 6 ( 6 ) FreeEdge = 67 ( 67 ) SharedEdge = 19534 ( 16688 ) +TOLERANCE : MaxTol = 4.854604894 ( 5.769095076 ) AvgTol = 0.01657799259 ( 0.01735277012 ) +LABELS : N0Labels = 11 ( 11 ) N1Labels = 2891 ( 6257 ) N2Labels = 0 ( 0 ) TotalLabels = 2902 ( 6268 ) NameLabels = 2900 ( 5879 ) ColorLabels = 2891 ( 6257 ) LayerLabels = 2411 ( 5261 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) COLORS : Colors = BLACK BLUE1 RED YELLOW ( BLACK BLUE1 RED YELLOW ) diff --git a/tests/de/iges_2/A1 b/tests/de/iges_2/A1 index d6aeb92ecb..b57cba7bde 100644 --- a/tests/de/iges_2/A1 +++ b/tests/de/iges_2/A1 @@ -1,16 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: STATSHAPE : Faulty" -puts "TODO OCC24035 ALL: Error : 3 differences with reference data" + set filename CCI60011.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 3 ( 9 ) Summary = 3 ( 9 ) -CHECKSHAPE : Wires = 1 ( 2 ) Faces = 2 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1149 ( 1148 ) Summary = 14676 ( 14675 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1149 ( 1148 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 6199 ( 6199 ) -TOLERANCE : MaxTol = 0.9825787092 ( 0.9825787092 ) AvgTol = 0.04099117502 ( 0.04099036661 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 2 ( 9 ) Summary = 2 ( 9 ) +CHECKSHAPE : Wires = 2 ( 3 ) Faces = 2 ( 3 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1149 ( 1148 ) Summary = 14674 ( 14673 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1149 ( 1148 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 6198 ( 6198 ) +TOLERANCE : MaxTol = 0.9825787092 ( 0.9825787092 ) AvgTol = 0.04096923729 ( 0.04100486587 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/iges_2/B8 b/tests/de/iges_2/B8 index 148311e129..86a6fd307e 100644 --- a/tests/de/iges_2/B8 +++ b/tests/de/iges_2/B8 @@ -1,7 +1,9 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" -puts "TODO OCC24035 ALL: Error : 1 differences with reference data" + + +puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" set LinuxDiff 1 set filename FRA62468-2.igs @@ -9,10 +11,10 @@ set filename FRA62468-2.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 257 ( 4991 ) Summary = 257 ( 4991 ) -CHECKSHAPE : Wires = 10 ( 15 ) Faces = 10 ( 9 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +CHECKSHAPE : Wires = 12 ( 17 ) Faces = 12 ( 11 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4729 ( 4729 ) Summary = 63198 ( 63144 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 4729 ( 4729 ) FreeWire = 18 ( 18 ) FreeEdge = 452 ( 452 ) SharedEdge = 26838 ( 26793 ) -TOLERANCE : MaxTol = 0.9804479161 ( 0.9805459497 ) AvgTol = 0.01153096918 ( 0.01154873541 ) +TOLERANCE : MaxTol = 0.9804479161 ( 0.9805459497 ) AvgTol = 0.0115309439 ( 0.01154870945 ) LABELS : N0Labels = 5089 ( 5165 ) N1Labels = 26 ( 3844 ) N2Labels = 0 ( 0 ) TotalLabels = 5115 ( 9009 ) NameLabels = 5089 ( 5165 ) ColorLabels = 5086 ( 8933 ) LayerLabels = 5086 ( 8933 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) diff --git a/tests/de/iges_2/C5 b/tests/de/iges_2/C5 index 5ceae213fb..aaa0e452b7 100644 --- a/tests/de/iges_2/C5 +++ b/tests/de/iges_2/C5 @@ -1,17 +1,17 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: TOLERANCE : Faulty" -puts "TODO OCC24035 ALL: Error : 3 differences with reference data" + set filename sim6049.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 6 ( 2821 ) Summary = 6 ( 2821 ) -CHECKSHAPE : Wires = 4 ( 4 ) Faces = 4 ( 4 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3785 ( 3785 ) Summary = 69460 ( 69479 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3785 ( 3785 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 30983 ( 30993 ) -TOLERANCE : MaxTol = 0.08172710091 ( 0.05040240237 ) AvgTol = 0.0006058646657 ( 0.0006024456212 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 6 ( 2819 ) Summary = 6 ( 2819 ) +CHECKSHAPE : Wires = 4 ( 6 ) Faces = 4 ( 6 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3785 ( 3785 ) Summary = 69460 ( 69485 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 3785 ( 3785 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 30983 ( 30997 ) +TOLERANCE : MaxTol = 0.08172710091 ( 0.05040240237 ) AvgTol = 0.0006058646692 ( 0.0006023709171 ) LABELS : N0Labels = 3785 ( 3785 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 3785 ( 3785 ) NameLabels = 3785 ( 3785 ) ColorLabels = 3785 ( 3785 ) LayerLabels = 3785 ( 3785 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) diff --git a/tests/de/iges_2/G5 b/tests/de/iges_2/G5 index 93b0930e06..6a549fbc3c 100644 --- a/tests/de/iges_2/G5 +++ b/tests/de/iges_2/G5 @@ -2,7 +2,9 @@ puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" -puts "TODO OCC24035 ALL: Error : 3 differences with reference data" + + +puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" set LinuxDiff 4 set filename PRO11641.igs @@ -11,10 +13,10 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 68 ( 1653 ) Summary = 68 ( 1653 ) CHECKSHAPE : Wires = 21 ( 14 ) Faces = 7 ( 7 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1424 ( 1424 ) Summary = 25321 ( 24502 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1424 ( 1424 ) FreeWire = 23 ( 23 ) FreeEdge = 461 ( 461 ) SharedEdge = 11249 ( 10724 ) -TOLERANCE : MaxTol = 0.01698924283 ( 0.04210111627 ) AvgTol = 0.0004712655806 ( 0.0008247631181 ) -LABELS : N0Labels = 1784 ( 1784 ) N1Labels = 0 ( 2178 ) N2Labels = 0 ( 0 ) TotalLabels = 1784 ( 3962 ) NameLabels = 1784 ( 1784 ) ColorLabels = 1761 ( 3962 ) LayerLabels = 1761 ( 1784 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1424 ( 1424 ) Summary = 25258 ( 24523 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 1424 ( 1424 ) FreeWire = 23 ( 23 ) FreeEdge = 461 ( 461 ) SharedEdge = 11200 ( 10738 ) +TOLERANCE : MaxTol = 0.01698924283 ( 0.04210111627 ) AvgTol = 0.0004756358901 ( 0.00051218143 ) +LABELS : N0Labels = 1784 ( 1784 ) N1Labels = 0 ( 2192 ) N2Labels = 0 ( 0 ) TotalLabels = 1784 ( 3976 ) NameLabels = 1784 ( 1784 ) ColorLabels = 1761 ( 3976 ) LayerLabels = 1761 ( 1784 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 8 ) COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ( BLACK BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) diff --git a/tests/de/iges_3/A2 b/tests/de/iges_3/A2 index ba61150ed4..dc7c67caf2 100644 --- a/tests/de/iges_3/A2 +++ b/tests/de/iges_3/A2 @@ -2,18 +2,20 @@ puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" puts "TODO CR23096 ALL: LAYERS : Faulty" -puts "TODO OCC24035 ALL: Error : 3 differences with reference data" + + +puts "TODO CR23096 Mandriva2010: Error : 5 differences with reference data found :" set LinuxDiff 5 set filename UKI60094.igs set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 4 ( 33 ) Warnings = 115 ( 322 ) Summary = 119 ( 355 ) -CHECKSHAPE : Wires = 0 ( 4 ) Faces = 1 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 159 ) Summary = 7845 ( 4462 ) -STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 419 ) FreeWire = 66 ( 114 ) FreeEdge = 430 ( 430 ) SharedEdge = 3347 ( 1895 ) -TOLERANCE : MaxTol = 5.365866916 ( 2716.882548 ) AvgTol = 0.0223796226 ( 5.135986013 ) +TPSTAT : Faulties = 4 ( 33 ) Warnings = 128 ( 321 ) Summary = 132 ( 354 ) +CHECKSHAPE : Wires = 0 ( 4 ) Faces = 0 ( 2 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 159 ) Summary = 7849 ( 4462 ) +STATSHAPE : Solid = 0 ( 0 ) Shell = 0 ( 0 ) Face = 419 ( 419 ) FreeWire = 66 ( 114 ) FreeEdge = 430 ( 430 ) SharedEdge = 3349 ( 1895 ) +TOLERANCE : MaxTol = 5.365866916 ( 2716.882548 ) AvgTol = 0.02543917817 ( 5.140512589 ) LABELS : N0Labels = 3 ( 3 ) N1Labels = 325 ( 1838 ) N2Labels = 0 ( 0 ) TotalLabels = 328 ( 1841 ) NameLabels = 328 ( 424 ) ColorLabels = 325 ( 1838 ) LayerLabels = 193 ( 1573 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) diff --git a/tests/de/step_1/D7 b/tests/de/step_1/D7 index e0e2f226e8..733938922f 100644 --- a/tests/de/step_1/D7 +++ b/tests/de/step_1/D7 @@ -1,6 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: TPSTAT : Faulty" + set filename obtu.stp set ref_data { @@ -9,7 +10,7 @@ TPSTAT : Faulties = 0 ( 0 ) Warnings = 21 ( 20 ) Summary = 21 ( 20 ) CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 0 ( 0 ) Shell = 1 ( 1 ) Face = 72 ( 72 ) Summary = 464 ( 464 ) STATSHAPE : Solid = 0 ( 0 ) Shell = 1 ( 1 ) Face = 72 ( 72 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 200 ( 200 ) -TOLERANCE : MaxTol = 0.5804595017 ( 0.157293174 ) AvgTol = 0.04113072985 ( 0.04644710495 ) +TOLERANCE : MaxTol = 0.09179894095 ( 0.157293174 ) AvgTol = 0.03046352927 ( 0.04644710495 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_2/A6 b/tests/de/step_2/A6 index a0cede5126..be50680bea 100644 --- a/tests/de/step_2/A6 +++ b/tests/de/step_2/A6 @@ -1,15 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: NBSHAPES : Faulty" + set filename t3d_opt.stp set ref_data { DATA : Faulties = 0 ( 84 ) Warnings = 0 ( 0 ) Summary = 0 ( 84 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 4 ( 85 ) Summary = 4 ( 85 ) -CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) NBSHAPES : Solid = 34 ( 34 ) Shell = 34 ( 34 ) Face = 254 ( 254 ) Summary = 1470 ( 1508 ) STATSHAPE : Solid = 34 ( 34 ) Shell = 34 ( 34 ) Face = 254 ( 254 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 539 ( 577 ) -TOLERANCE : MaxTol = 4.686868233 ( 4.686868233 ) AvgTol = 0.06017485437 ( 0.05835526529 ) +TOLERANCE : MaxTol = 4.686868233 ( 4.686868233 ) AvgTol = 0.06006973237 ( 0.05835526534 ) LABELS : N0Labels = 42 ( 42 ) N1Labels = 41 ( 41 ) N2Labels = 0 ( 0 ) TotalLabels = 83 ( 83 ) NameLabels = 83 ( 83 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_3/C6 b/tests/de/step_3/C6 index f1045c951d..83fd885db6 100644 --- a/tests/de/step_3/C6 +++ b/tests/de/step_3/C6 @@ -1,16 +1,16 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" -puts "TODO OCC24035 ALL: Error : 3 differences with reference data" + set filename trj3_pm1-ug-203.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 0 ( 0 ) Warnings = 51 ( 499 ) Summary = 51 ( 499 ) -CHECKSHAPE : Wires = 1 ( 0 ) Faces = 1 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 98 ( 98 ) Shell = 98 ( 98 ) Face = 3829 ( 3829 ) Summary = 22288 ( 22282 ) -STATSHAPE : Solid = 116 ( 116 ) Shell = 116 ( 116 ) Face = 4144 ( 4144 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 8837 ( 8833 ) -TOLERANCE : MaxTol = 0.2639103319 ( 0.0004303985328 ) AvgTol = 0.0001273786325 ( 2.455976875e-006 ) +CHECKSHAPE : Wires = 1 ( 0 ) Faces = 2 ( 1 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 98 ( 98 ) Shell = 98 ( 98 ) Face = 3829 ( 3829 ) Summary = 22282 ( 22282 ) +STATSHAPE : Solid = 116 ( 116 ) Shell = 116 ( 116 ) Face = 4144 ( 4144 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 8833 ( 8833 ) +TOLERANCE : MaxTol = 0.0002435409967 ( 0.0004303985328 ) AvgTol = 6.880316188e-07 ( 2.455976875e-06 ) LABELS : N0Labels = 14 ( 14 ) N1Labels = 25 ( 25 ) N2Labels = 0 ( 0 ) TotalLabels = 39 ( 39 ) NameLabels = 39 ( 39 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9 index edb2c5e21d..97ed16b8d8 100644 --- a/tests/de/step_3/D9 +++ b/tests/de/step_3/D9 @@ -3,18 +3,20 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: STATSHAPE : Faulty" puts "TODO CR23096 ALL: TOLERANCE : Faulty" -puts "TODO OCC24035 ALL: Error : 2 differences with reference data" + + +puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" set LinuxDiff 3 set filename 53921163S0.stp set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) -TPSTAT : Faulties = 0 ( 0 ) Warnings = 51 ( 35 ) Summary = 51 ( 35 ) -CHECKSHAPE : Wires = 0 ( 14 ) Faces = 9 ( 15 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 568 ( 566 ) Summary = 3706 ( 3711 ) -STATSHAPE : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 568 ( 566 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1543 ( 1546 ) -TOLERANCE : MaxTol = 61.30318124 ( 60.87483475 ) AvgTol = 1.474406352 ( 1.657562353 ) +TPSTAT : Faulties = 0 ( 0 ) Warnings = 45 ( 34 ) Summary = 45 ( 34 ) +CHECKSHAPE : Wires = 0 ( 14 ) Faces = 9 ( 14 ) Shells = 0 ( 0 ) Solids = 0 ( 0 ) +NBSHAPES : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 566 ( 564 ) Summary = 3692 ( 3701 ) +STATSHAPE : Solid = 1 ( 1 ) Shell = 3 ( 3 ) Face = 566 ( 564 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 1535 ( 1542 ) +TOLERANCE : MaxTol = 61.30318124 ( 60.87483475 ) AvgTol = 1.466585036 ( 1.651570456 ) LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 ) diff --git a/tests/de/step_3/E6 b/tests/de/step_3/E6 index 964b2f5674..1e8ab8459e 100644 --- a/tests/de/step_3/E6 +++ b/tests/de/step_3/E6 @@ -1,8 +1,10 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: STATSHAPE : Faulty" -puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" -puts "TODO OCC24035 ALL: Error : 2 differences with reference data" +puts "TODO CR23096 ALL: TOLERANCE : Faulty" + + +puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" set LinuxDiff 3 set filename Z8M6SAT.stp @@ -11,9 +13,9 @@ set ref_data { DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 ) TPSTAT : Faulties = 3 ( 0 ) Warnings = 977 ( 3138 ) Summary = 980 ( 3138 ) CHECKSHAPE : Wires = 77 ( 77 ) Faces = 61 ( 63 ) Shells = 0 ( 7 ) Solids = 0 ( 0 ) -NBSHAPES : Solid = 28 ( 28 ) Shell = 778 ( 38 ) Face = 3253 ( 3249 ) Summary = 29551 ( 28726 ) +NBSHAPES : Solid = 28 ( 28 ) Shell = 778 ( 38 ) Face = 3253 ( 3249 ) Summary = 29550 ( 28726 ) STATSHAPE : Solid = 28 ( 28 ) Shell = 778 ( 38 ) Face = 3253 ( 3249 ) FreeWire = 0 ( 0 ) FreeEdge = 0 ( 0 ) SharedEdge = 12674 ( 12610 ) -TOLERANCE : MaxTol = 40.73070494 ( 20.46526799 ) AvgTol = 0.03506007035 ( 0.03196812549 ) +TOLERANCE : MaxTol = 40.73070494 ( 20.46526799 ) AvgTol = 0.03573677223 ( 0.03196812549 ) LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 5 ( 5 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 0 )