0026607: Wrong value of area.

Test case for issue CR26607

Fix regressions

Correction of test cases for issue CR26607

diff --git a/src/BRepGProp/BRepGProp.cxx b/src/BRepGProp/BRepGProp.cxx
index c2f363d1212a05c22593fc20ec6106c0047c42b2..8367ddaa30f5044f0f0dc251bf64ae41de88c900 100644 (file)
--- a/src/BRepGProp/BRepGProp.cxx
+++ b/src/BRepGProp/BRepGProp.cxx
@@ -47,7 +47,7 @@ void  BRepGProp::LinearProperties(const TopoDS_Shape& S, GProp_GProps& SProps){
   SProps = GProp_GProps(P);
 
   BRepAdaptor_Curve   BAC;
-//  Standard_Integer n,i;
+  //  Standard_Integer n,i;
   TopExp_Explorer ex;
   for (ex.Init(S,TopAbs_EDGE); ex.More(); ex.Next()) {
     BAC.Initialize(TopoDS::Edge(ex.Current()));
@@ -72,7 +72,9 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
   for (ex.Init(S,TopAbs_FACE), i = 1; ex.More(); ex.Next(), i++) {
     const TopoDS_Face& F = TopoDS::Face(ex.Current());
     BF.Load(F);
-    if(!BF.NaturalRestriction()) BD.Init(F);
+    TopoDS_Iterator aWIter(F);
+    Standard_Boolean IsNatRestr = !aWIter.More();
+    if(!IsNatRestr) BD.Init(F);
     if(Eps < 1.0) {
       G.Perform(BF, BD, Eps); 
       Error = G.GetEpsilon();
@@ -83,7 +85,7 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
 #endif
       }
     } else {
-      if(BF.NaturalRestriction()) G.Perform(BF);
+      if(IsNatRestr) G.Perform(BF);
       else G.Perform(BF, BD);
     }
     Props.Add(G);
@@ -133,20 +135,22 @@ static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props
     const TopoDS_Face& F = TopoDS::Face(ex.Current());
     if ((F.Orientation() == TopAbs_FORWARD) || (F.Orientation() == TopAbs_REVERSED)){
       BF.Load(F);
-      if(!BF.NaturalRestriction()) BD.Init(F);
+      TopoDS_Iterator aWIter(F);
+      Standard_Boolean IsNatRestr = !aWIter.More();
+      if(!IsNatRestr) BD.Init(F);
       if(Eps < 1.0) {
-       G.Perform(BF, BD, Eps); 
-       Error = G.GetEpsilon();
-       if(ErrorMax < Error) {
-         ErrorMax = Error;
+        G.Perform(BF, BD, Eps); 
+        Error = G.GetEpsilon();
+        if(ErrorMax < Error) {
+          ErrorMax = Error;
 #ifdef OCCT_DEBUG
-         iErrorMax = i;
+          iErrorMax = i;
 #endif
-       }
+        }
       }
       else {
-       if(BF.NaturalRestriction()) G.Perform(BF);
-       else G.Perform(BF, BD);
+        if(IsNatRestr) G.Perform(BF);
+        else G.Perform(BF, BD);
       }
       Props.Add(G);
 #ifdef OCCT_DEBUG
@@ -178,7 +182,7 @@ void  BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, co
 //=======================================================================
 
 Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, 
-                                         const Standard_Real Eps, const Standard_Boolean OnlyClosed)
+  const Standard_Real Eps, const Standard_Boolean OnlyClosed)
 { 
   // find the origin
   gp_Pnt P(0,0,0);  P.Transform(S.Location());
@@ -193,13 +197,13 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
     for (i = 1; ex.More(); ex.Next(), i++) {
       const TopoDS_Shape& Sh = ex.Current();
       if(BRep_Tool::IsClosed(Sh)) {
-       Error = volumeProperties(Sh,Props,Eps);
-       if(ErrorMax < Error) {
-         ErrorMax = Error;
+        Error = volumeProperties(Sh,Props,Eps);
+        if(ErrorMax < Error) {
+          ErrorMax = Error;
 #ifdef OCCT_DEBUG
-         iErrorMax = i;
+          iErrorMax = i;
 #endif
-       }
+        }
       }
     }
   } else ErrorMax = volumeProperties(S,Props,Eps);
@@ -218,15 +222,15 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
 //=======================================================================
 
 static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
-                                             GProp_GProps     &theProps,
-                                       const Standard_Real     theTol,
-                                       const Standard_Boolean  IsUseSpan,
-                                       const Standard_Boolean  CGFlag,
-                                       const Standard_Boolean  IFlag)
+  GProp_GProps     &theProps,
+  const Standard_Real     theTol,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 {
   TopExp_Explorer  anExp;
   anExp.Init(theShape, TopAbs_FACE);
- 
+
   Standard_Real aTol = theTol;
 
   // Compute properties.
@@ -243,21 +247,23 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
     TopoDS_Face aFace = TopoDS::Face(anExp.Current());
 
     if (aFace.Orientation() == TopAbs_FORWARD ||
-       aFace.Orientation() == TopAbs_REVERSED) {
-      aPropFace.Load(aFace);
-
-      if(aPropFace.NaturalRestriction())
-       aLocalError = aVProps.Perform(aPropFace, aTol, CGFlag, IFlag);
-      else {
-       aPropDomain.Init(aFace);
-       aLocalError = aVProps.Perform(aPropFace, aPropDomain, aTol, CGFlag, IFlag);
-      }
-
-      if (aLocalError < 0.)
-       return aLocalError;
-
-      anError += aLocalError;
-      theProps.Add(aVProps);
+      aFace.Orientation() == TopAbs_REVERSED) {
+        aPropFace.Load(aFace);
+
+        TopoDS_Iterator aWIter(aFace);
+        Standard_Boolean IsNatRestr = !aWIter.More();
+        if(IsNatRestr)
+          aLocalError = aVProps.Perform(aPropFace, aTol, CGFlag, IFlag);
+        else {
+          aPropDomain.Init(aFace);
+          aLocalError = aVProps.Perform(aPropFace, aPropDomain, aTol, CGFlag, IFlag);
+        }
+
+        if (aLocalError < 0.)
+          return aLocalError;
+
+        anError += aLocalError;
+        theProps.Add(aVProps);
     }
   }
 
@@ -270,12 +276,12 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
 //=======================================================================
 
 Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
-                                                 GProp_GProps     &Props, 
-                                           const Standard_Real     Eps,
-                                           const Standard_Boolean  OnlyClosed,
-                                           const Standard_Boolean  IsUseSpan,
-                                           const Standard_Boolean  CGFlag,
-                                           const Standard_Boolean  IFlag)
+  GProp_GProps     &Props, 
+  const Standard_Real     Eps,
+  const Standard_Boolean  OnlyClosed,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 { 
   gp_Pnt        P(0,0,0);
   Standard_Real anError = 0.;
@@ -297,7 +303,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       BRepCheck_Status aStatus = aChecker.Closed(Standard_False);
 
       if(aStatus == BRepCheck_NoError) 
-       aClosedShells.Append(aShell);
+        aClosedShells.Append(aShell);
 
     }
 
@@ -315,11 +321,11 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       aLocalError = volumePropertiesGK(aShell, Props, aTol, IsUseSpan, CGFlag, IFlag);
 
       if (aLocalError < 0)
-       return aLocalError;
+        return aLocalError;
 
       anError += aLocalError;
     }
-  
+
   } else
     anError = volumePropertiesGK(S, Props, Eps, IsUseSpan, CGFlag, IFlag);
 
@@ -334,12 +340,12 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
 //=======================================================================
 
 static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
-                                             GProp_GProps     &theProps,
-                                       const gp_Pln           &thePln,
-                                       const Standard_Real     theTol,
-                                       const Standard_Boolean  IsUseSpan,
-                                       const Standard_Boolean  CGFlag,
-                                       const Standard_Boolean  IFlag)
+  GProp_GProps     &theProps,
+  const gp_Pln           &thePln,
+  const Standard_Real     theTol,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 {
   TopExp_Explorer  anExp;
   anExp.Init(theShape, TopAbs_FACE);
@@ -360,21 +366,23 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
     TopoDS_Face aFace = TopoDS::Face(anExp.Current());
 
     if (aFace.Orientation() == TopAbs_FORWARD ||
-       aFace.Orientation() == TopAbs_REVERSED) {
-      aPropFace.Load(aFace);
-
-      if(aPropFace.NaturalRestriction())
-       aLocalError = aVProps.Perform(aPropFace, thePln, aTol, CGFlag, IFlag);
-      else {
-       aPropDomain.Init(aFace);
-       aLocalError = aVProps.Perform(aPropFace, aPropDomain, thePln, aTol, CGFlag, IFlag);
-      }
-
-      if (aLocalError < 0.)
-       return aLocalError;
-
-      anError += aLocalError;
-      theProps.Add(aVProps);
+      aFace.Orientation() == TopAbs_REVERSED) {
+        aPropFace.Load(aFace);
+
+        TopoDS_Iterator aWIter(aFace);
+        Standard_Boolean IsNatRestr = !aWIter.More();
+        if(IsNatRestr)
+          aLocalError = aVProps.Perform(aPropFace, thePln, aTol, CGFlag, IFlag);
+        else {
+          aPropDomain.Init(aFace);
+          aLocalError = aVProps.Perform(aPropFace, aPropDomain, thePln, aTol, CGFlag, IFlag);
+        }
+
+        if (aLocalError < 0.)
+          return aLocalError;
+
+        anError += aLocalError;
+        theProps.Add(aVProps);
     }
   }
 
@@ -387,13 +395,13 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape     &theShape,
 //=======================================================================
 
 Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
-                                                 GProp_GProps     &Props,
-                                           const gp_Pln           &thePln,
-                                           const Standard_Real     Eps,
-                                           const Standard_Boolean  OnlyClosed,
-                                           const Standard_Boolean  IsUseSpan,
-                                           const Standard_Boolean  CGFlag,
-                                           const Standard_Boolean  IFlag)
+  GProp_GProps     &Props,
+  const gp_Pln           &thePln,
+  const Standard_Real     Eps,
+  const Standard_Boolean  OnlyClosed,
+  const Standard_Boolean  IsUseSpan,
+  const Standard_Boolean  CGFlag,
+  const Standard_Boolean  IFlag)
 { 
   gp_Pnt        P(0,0,0);
   Standard_Real anError = 0.;
@@ -415,7 +423,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       BRepCheck_Status aStatus = aChecker.Closed(Standard_False);
 
       if(aStatus == BRepCheck_NoError) 
-       aClosedShells.Append(aShell);
+        aClosedShells.Append(aShell);
 
     }
 
@@ -433,7 +441,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape     &S,
       aLocalError = volumePropertiesGK(aShell, Props, thePln, aTol, IsUseSpan, CGFlag, IFlag);
 
       if (aLocalError < 0)
-       return aLocalError;
+        return aLocalError;
 
       anError += aLocalError;
     }

diff --git a/src/BRepGProp/BRepGProp_Face.hxx b/src/BRepGProp/BRepGProp_Face.hxx
index 96416f936af1ec2d196b9cec72df1ca5904cc361..855d7de7cd79dd373da0bcd5b096a0a8b95c0158 100644 (file)
--- a/src/BRepGProp/BRepGProp_Face.hxx
+++ b/src/BRepGProp/BRepGProp_Face.hxx
@@ -65,6 +65,9 @@ public:
   
   //! Returns Standard_True if the face is not trimmed.
     Standard_Boolean NaturalRestriction() const;
+
+  //! Returns the TopoDS face.
+  const TopoDS_Face& GetFace() const; 
   
   //! Returns the value of the boundary curve of the face.
     gp_Pnt2d Value2d (const Standard_Real U) const;

diff --git a/src/BRepGProp/BRepGProp_Face.lxx b/src/BRepGProp/BRepGProp_Face.lxx
index e403e45d4dc5ab412fb6dde25c6da0e483a87574..4c5661c3ae7c6a584e5aeaa84a9ee0c97b16e833 100644 (file)
--- a/src/BRepGProp/BRepGProp_Face.lxx
+++ b/src/BRepGProp/BRepGProp_Face.lxx
@@ -48,6 +48,16 @@ inline Standard_Boolean BRepGProp_Face::NaturalRestriction() const
 {
   return BRep_Tool::NaturalRestriction(mySurface.Face());
 }
+//
+//=======================================================================
+//function : GetFace
+//purpose  : Returns TopoDS Face.
+//=======================================================================
+
+inline const TopoDS_Face& BRepGProp_Face::GetFace() const
+{
+  return mySurface.Face();
+}
 
 //=======================================================================
 //function : Value2d

diff --git a/src/BRepGProp/BRepGProp_Gauss.cxx b/src/BRepGProp/BRepGProp_Gauss.cxx
index 2db9abbc3b4076ec595b3ce4ddbfa75eb15540e9..039513fc588286afcec42c37a8bcb3d21bbfc23d 100644 (file)
--- a/src/BRepGProp/BRepGProp_Gauss.cxx
+++ b/src/BRepGProp/BRepGProp_Gauss.cxx
@@ -584,7 +584,9 @@ Standard_Real BRepGProp_Gauss::Compute(
 
   //
   const Standard_Integer NumSubs = SUBS_POWER;
-  const Standard_Boolean isNaturalRestriction = theSurface.NaturalRestriction();
+  const TopoDS_Face& aF = theSurface.GetFace(); 
+  TopoDS_Iterator aWIter(aF);
+  const Standard_Boolean isNaturalRestriction = !aWIter.More(); //theSurface.NaturalRestriction();
 
   Standard_Real CIx, CIy, CIz, CIxy, CIxz, CIyz;
   Standard_Real CDim[2], CIxx[2], CIyy[2], CIzz[2];
@@ -1111,9 +1113,11 @@ void BRepGProp_Gauss::Compute(BRepGProp_Face&   theSurface,
   {
     theSurface.Load(theDomain.Value());
 
-    const Standard_Integer NbCGaussgp_Pnts =
+    Standard_Integer NbCGaussgp_Pnts =
       Min(theSurface.IntegrationOrder(), math::GaussPointsMax());
 
+    NbCGaussgp_Pnts = Max(NbCGaussgp_Pnts, NbGaussgp_Pnts);
+
     math_Vector GaussCP(1, NbCGaussgp_Pnts);
     math_Vector GaussCW(1, NbCGaussgp_Pnts);
     math::GaussPoints (NbCGaussgp_Pnts, GaussCP);

diff --git a/tests/blend/bfuseblend/B7 b/tests/blend/bfuseblend/B7
index 8fc8db94afe50a123725365799bfaf93df7462bc..526ed30a1afc1628431aef54e2e3870e4d02f11c 100644 (file)
--- a/tests/blend/bfuseblend/B7
+++ b/tests/blend/bfuseblend/B7
@@ -6,4 +6,4 @@ tscale s1 0 0 0 SCALE1
 tscale s2 0 0 0 SCALE1
 bfuseblend result s1 s2 1*SCALE1
 
-set square 53457.8
+set square 52754.1

diff --git a/tests/blend/buildevol/F1 b/tests/blend/buildevol/F1
index d28d3538f82afb40ef8469c236dce37799fed3f3..db3472acdcc7e37410e1bfabf10dd25e52f12af0 100644 (file)
--- a/tests/blend/buildevol/F1
+++ b/tests/blend/buildevol/F1
@@ -9,4 +9,4 @@ mkevol result s
 updatevol s_3 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
 buildevol
  
-set square 78053.9
+set square 76962.6

diff --git a/tests/blend/encoderegularity/A3 b/tests/blend/encoderegularity/A3
index 0a8312f923fb351ad9cd71ce3d59d1f79457f3ed..49cfeb2fe5af8d967c383252e0a40c7e4570436d 100644 (file)
--- a/tests/blend/encoderegularity/A3
+++ b/tests/blend/encoderegularity/A3
@@ -9,4 +9,4 @@ blend result m 10 m_5 10 m_6 \
 explode result Sh
 renamevar result_1 result
 
-set square 5824.68
+set square 5884.39

diff --git a/tests/blend/simple/U5 b/tests/blend/simple/U5
index 1e0fc26c7ca9f1e84e812ac50c012839d2ade883..f1f2776e16dbf2b51a9cc8cbf8ecc94e30c5fd71 100644 (file)
--- a/tests/blend/simple/U5
+++ b/tests/blend/simple/U5
@@ -10,4 +10,4 @@ tscale s 0 0 0 SCALE2
 explode s E
 blend result s 2.5*SCALE2 s_6
 
-set square 652.96
+set square 638.478

diff --git a/tests/bugs/modalg_1/buc60531_1 b/tests/bugs/modalg_1/buc60531_1
index 6bc69bb76aee6e89dfcbb0f0f5f9abfd36a2b1ad..441772ea89f5a26806998d6df565667c282c3206 100755 (executable)
--- a/tests/bugs/modalg_1/buc60531_1
+++ b/tests/bugs/modalg_1/buc60531_1
@@ -10,6 +10,6 @@ checkshape pl1
 
 bcut result r1 pl1
 
-set square 115935
+set square 119983
 set 2dviewer 0
 

diff --git a/tests/bugs/modalg_1/buc60533 b/tests/bugs/modalg_1/buc60533
index 6d6a276cc7e736a7ba1e423a8a663ac25417ab85..fffdb9fb9a1e7d39cde7fe0b951a4b5bd61d4797 100755 (executable)
--- a/tests/bugs/modalg_1/buc60533
+++ b/tests/bugs/modalg_1/buc60533
@@ -66,5 +66,5 @@ copy r_1 result
 #  An exception was caught Standard_ConstructionError: 
 #  ** Exception ** Standard_ConstructionError: 
  
-set square 1.65227e+07
+set square 1.59518e+07
 set 2dviewer 0

diff --git a/tests/bugs/modalg_1/buc60555_1 b/tests/bugs/modalg_1/buc60555_1
index 026e2afe2c0cef66f6db9f299cee19b77fdaecc3..8f988fa8be59aa7a18eb8729092dd9b6817812c8 100755 (executable)
--- a/tests/bugs/modalg_1/buc60555_1
+++ b/tests/bugs/modalg_1/buc60555_1
@@ -33,5 +33,5 @@ if { $MaxFaceTolerance > 1 || $MaxEdgeTolerance > 1 || $MaxVertexTolerance > 1 }
     puts "Tolerance of shape is less then 1.0"
 }
 
-set square 4.10276e+007
+set square 4.21741e+007
 set 2dviewer 0

diff --git a/tests/bugs/modalg_1/buc60555_2 b/tests/bugs/modalg_1/buc60555_2
index 855a67d23111733e84e4acb2cf3de711b0d15a70..a9ff829af827069b2ebe15b8bd244dd18467efee 100755 (executable)
--- a/tests/bugs/modalg_1/buc60555_2
+++ b/tests/bugs/modalg_1/buc60555_2
@@ -50,5 +50,5 @@ if { $MaxFaceTolerance > 1 || $MaxEdgeTolerance > 1 || $MaxVertexTolerance > 1 }
 } else {
     puts "Tolerance of shape is less then 1.0"
 }
-set square 3.92639e+007
+set square 4.03996e+007
 set 2dviewer 0

diff --git a/tests/bugs/modalg_1/bug10160_6 b/tests/bugs/modalg_1/bug10160_6
index 029f0ce4783d00b255d290e540d28e863e6c8c80..9613a5437435dd9c9bddda19e26ca121f64a0a9a 100755 (executable)
--- a/tests/bugs/modalg_1/bug10160_6
+++ b/tests/bugs/modalg_1/bug10160_6
@@ -39,7 +39,7 @@ puts "CPU_user_time=${CPU_user_time}"
 set CPU_user_time [expr ${CPU_user_time} / ${NbTests}]
 puts "CPU_user_time=${CPU_user_time}"
 
-set square 3.61484e+07
+set square 3.65961e+07
 
 # Analysis of "nbshapes res"
 set nb_v_good 121

diff --git a/tests/bugs/modalg_1/bug10160_7 b/tests/bugs/modalg_1/bug10160_7
index bbbc95e988141a2bd51c769fbc1b682e9c5cf281..751c3ed39b20aa2f92f2fdc1cdfe51efd81710f0 100755 (executable)
--- a/tests/bugs/modalg_1/bug10160_7
+++ b/tests/bugs/modalg_1/bug10160_7
@@ -40,7 +40,7 @@ puts "CPU_user_time=${CPU_user_time}"
 set CPU_user_time [expr ${CPU_user_time} / ${NbTests}]
 puts "CPU_user_time=${CPU_user_time}"
 
-set square 3.00597e+07
+set square 3.05118e+07
 
 # Analysis of "nbshapes res"
 set nb_v_good 61

diff --git a/tests/bugs/modalg_1/bug13140 b/tests/bugs/modalg_1/bug13140
index 4f6182227dc0c2f44c02c7d17d068f3f23c6413f..8feff981e4c9a6d2379804b3e52bd414eaef582f 100755 (executable)
--- a/tests/bugs/modalg_1/bug13140
+++ b/tests/bugs/modalg_1/bug13140
@@ -11,7 +11,7 @@ restore [locate_data_file OCC13140_Profile.brep] Profile
 
 pipe result Spine Profile
 
-set square 3.48689
+set square 3.68518
 set good_vertex 2
 set good_edge 3
 set good_wire 1

diff --git a/tests/bugs/modalg_2/bug21261_16 b/tests/bugs/modalg_2/bug21261_16
index 89c81c4b610160c780d7a9afce09354465c743dd..55d1c839dc922589fb3ebcb933351b7fd8751610 100755 (executable)
--- a/tests/bugs/modalg_2/bug21261_16
+++ b/tests/bugs/modalg_2/bug21261_16
@@ -12,7 +12,7 @@ restore [locate_data_file OCC21261-1988_ellipsepipesrf_1.brep] s
 
 thickshell result s -5
 
-set square 17366.2
+set square 17592.2
 
 set nb_v_good 4
 set nb_e_good 8

diff --git a/tests/bugs/modalg_2/bug22586 b/tests/bugs/modalg_2/bug22586
index 041b449a8eed68d7cd60feb9d3a775065af02e56..c0a48273ba096ea3662ae52a248c2bad8cae768a 100755 (executable)
--- a/tests/bugs/modalg_2/bug22586
+++ b/tests/bugs/modalg_2/bug22586
@@ -19,4 +19,4 @@ if { [catch { OCC22586 shape result } catch_result] } {
 }
 
 set 3dviewer 1 
-set square 11275.7
+set square 10975

diff --git a/tests/bugs/modalg_2/bug22727 b/tests/bugs/modalg_2/bug22727
index 7946cd245d98a676de0dde71e4c8af5a4c924048..b6dea86a77bc08ecabf137d25e32a733ab1bb451 100755 (executable)
--- a/tests/bugs/modalg_2/bug22727
+++ b/tests/bugs/modalg_2/bug22727
@@ -14,7 +14,7 @@ tscale t 0.0507219 -0.0399294 -0.00324254 1000
 explode t e
 blend result t 2. t_3
 
-set square 3471.94
+set square 3545.26
 
 set nb_v_good 12
 set nb_e_good 14

diff --git a/tests/bugs/modalg_2/bug22818_1 b/tests/bugs/modalg_2/bug22818_1
index 47bfffd9ae4f8d2002f768df9ae907ddac1d3021..03048d583f76c7cedc4b7e4886809bf9c6e44a1e 100755 (executable)
--- a/tests/bugs/modalg_2/bug22818_1
+++ b/tests/bugs/modalg_2/bug22818_1
@@ -1,5 +1,3 @@
-puts "TODO OCC23832 ALL: Error   : area by triangles differs from the actual area by"
-
 puts "================"
 puts "OCC22818"
 puts "================"
@@ -24,7 +22,7 @@ don f1
 revol result f1 0 10 0 0 0 1 180
 checkshape result
 
-set square 823.385
+set square 673.385
 
 set nb_v_good 3
 set nb_e_good 8

diff --git a/tests/bugs/modalg_2/bug22818_2 b/tests/bugs/modalg_2/bug22818_2
index 6e89e4d4bec281b53978e6cafdc07613164c514f..676b5bdab2e9dc4413b6acdd014300785ffd1b60 100755 (executable)
--- a/tests/bugs/modalg_2/bug22818_2
+++ b/tests/bugs/modalg_2/bug22818_2
@@ -1,5 +1,3 @@
-puts "TODO OCC23832 ALL: Error   : area by triangles differs from the actual area by"
-
 puts "================"
 puts "OCC22818"
 puts "================"
@@ -25,7 +23,7 @@ don f1
 revol result f1 0 10 0 0 0 1 180
 checkshape result
 
-set square 186.072
+set square 161.072
 
 set nb_v_good 3
 set nb_e_good 8

diff --git a/tests/bugs/modalg_2/bug22864 b/tests/bugs/modalg_2/bug22864
index a6162db40d15bd0ab9847a9d8ccd2f4b1bde6b9a..26e4fc8cebdbcbff3dfae77ef49442be80a436a0 100755 (executable)
--- a/tests/bugs/modalg_2/bug22864
+++ b/tests/bugs/modalg_2/bug22864
@@ -95,7 +95,5 @@ if {${status} == 0} {
     puts "Faulty ${BugNumber}"
 }
 
-set square 6606.88
+set square 8464.91
 set 2dviewer 0
-
-

diff --git a/tests/bugs/modalg_4/bug636 b/tests/bugs/modalg_4/bug636
index 88f5cf23c32784c415c1925ca5e5f25db8414144..ef86394fb167868804dca794f56269a2895b5fb6 100755 (executable)
--- a/tests/bugs/modalg_4/bug636
+++ b/tests/bugs/modalg_4/bug636
@@ -26,6 +26,5 @@ if [catch { buildsweep result } catch_result] {
     puts "OCC636 OK: function buildsweep works properly"
 }
 
-set square 3836.92
+set square 3934.22
 set 2dviewer 0
-

diff --git a/tests/bugs/modalg_5/bug22981 b/tests/bugs/modalg_5/bug22981
index 12738b02aae57488fc205ead2e32efc942ebae80..add8e016605e8afec2f9af84015c69bdf2a67ff7 100644 (file)
--- a/tests/bugs/modalg_5/bug22981
+++ b/tests/bugs/modalg_5/bug22981
@@ -12,7 +12,7 @@ explode t
 thrusections result 0 0 t_1 t_2
 thrusections result 0 0 t_2 t_3 t_4 t_5 t_6 t_7 t_8 t_9 t_10 t_11
 
-set square 6733.76
+set square 6234.87
 set 2dviewer 0
 
 

diff --git a/tests/bugs/modalg_5/bug23706_2 b/tests/bugs/modalg_5/bug23706_2
index e7c594bbfd2b6aa13433a3190933e41f6e6e15b8..d7d1715525747bb51d0fc7f767c677397aa10f50 100755 (executable)
--- a/tests/bugs/modalg_5/bug23706_2
+++ b/tests/bugs/modalg_5/bug23706_2
@@ -19,7 +19,7 @@ offset o1 ss 2
 mkface res o1
 set info [sprops res]
 regexp {Mass +: +([-0-9.+eE]+)} $info full sq
-set sq_check 248.667
+set sq_check 240.865
 
 if { [expr 1.*abs($sq_check - $sq)/$sq_check] > 0.01 } {
    puts "Error : The square of result shape is $sq"

diff --git a/tests/bugs/modalg_5/bug23706_3 b/tests/bugs/modalg_5/bug23706_3
index 71c5592d2cb0cd22eb770007a5db4febfc13f3ea..de051df1466c80a714c806f5277f976ee1bd565b 100755 (executable)
--- a/tests/bugs/modalg_5/bug23706_3
+++ b/tests/bugs/modalg_5/bug23706_3
@@ -16,8 +16,4 @@ don result
 fit
 checkshape result
 
-set square 1.86489
-
-
-
-
+set square 1.67216

diff --git a/tests/bugs/modalg_5/bug23870_2 b/tests/bugs/modalg_5/bug23870_2
index 8e042418b33c8c14397e7f6eca83d46942f8ce16..56773f8ce6285fef36511cc8dab5dfb8e1c2397d 100755 (executable)
--- a/tests/bugs/modalg_5/bug23870_2
+++ b/tests/bugs/modalg_5/bug23870_2
@@ -20,7 +20,7 @@ wire profile profile
 
 pipe result spine profile 2 approx
 
-set square 8997.97
+set square 8772.95
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/bugs/modalg_6/bug26607 b/tests/bugs/modalg_6/bug26607
new file mode 100644 (file)
index 0000000..c3f8228
--- /dev/null
+++ b/tests/bugs/modalg_6/bug26607
@@ -0,0 +1,21 @@
+puts "=========="
+puts "OCC26607"
+puts "=========="
+puts ""
+###########################################
+# Wrong value of area.
+###########################################
+
+box b1 10 10 10
+box b2 20 0 0 10 10 10
+explode b1 f
+explode b2 f
+explode b1_5 
+explode b2_5 
+ 
+mksurface s b1_5 
+mkface fs s
+add b1_5_1 fs
+add b2_5_1 fs
+ 
+checkarea fs -200 1e-06 0.01

diff --git a/tests/bugs/moddata_3/bug20866 b/tests/bugs/moddata_3/bug20866
index 8b814149c47bf58b093e46b02196ad75cb3a85cf..c56a19dbc865bf06b4fafd516ca0557ce49106ef 100644 (file)
--- a/tests/bugs/moddata_3/bug20866
+++ b/tests/bugs/moddata_3/bug20866
@@ -26,7 +26,7 @@ if [catch { buildsweep result } ] {
   puts "Faulty ${BugNumber} : buildsweep is wrong"
 } else {
 
-    set square 1.87535e+06
+    set square 1.94998e+06
 
     set nb_v_good 161
     set nb_e_good 299

diff --git a/tests/bugs/vis/bug22188 b/tests/bugs/vis/bug22188
index e7d8b9898e9f1e3e041453fee2fb27b530835626..cf6edd90081dd2885bbac714a3ed8386ea6d6613 100755 (executable)
--- a/tests/bugs/vis/bug22188
+++ b/tests/bugs/vis/bug22188
@@ -75,7 +75,7 @@ if { ${deflection_percent} > ${percent_max} } {
    puts "deflection: OK ${BugNumber}"
 }
 
-set square 33561.4
+set square 32416.7
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/bugs/vis/bug288_10 b/tests/bugs/vis/bug288_10
index 3ef962e15add1a8f332e48a8d1fdb1778eab2c54..0ce4cc27114b5fd1098f89bba693962260500e6e 100755 (executable)
--- a/tests/bugs/vis/bug288_10
+++ b/tests/bugs/vis/bug288_10
@@ -10,7 +10,7 @@ set BugNumber OCC288
 
 restore [locate_data_file shading_151.brep] result
 
-set square 54328.8
+set square 52620.1
 
 set nb_v_good 20
 set nb_e_good 37

diff --git a/tests/bugs/xde/bug22492 b/tests/bugs/xde/bug22492
index 3b6ff9a5f90fd26d218880fee2a3bb692242a7d8..4ebef2d7a700888fba957b2a321b523c81579f6f 100755 (executable)
--- a/tests/bugs/xde/bug22492
+++ b/tests/bugs/xde/bug22492
@@ -19,7 +19,7 @@ stepread $imagedir/${test_image}.step sc2 *
 tpcompound sc2
 renamevar sc2 result
 
-set square 285636
+set square 271280
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/bugs/xde/bug22805 b/tests/bugs/xde/bug22805
index 08cdd1c392a92c0b39cf93dbe6e1276eba016c1e..0a83c758be6727f503f294adca8f7c99770dbbec 100755 (executable)
--- a/tests/bugs/xde/bug22805
+++ b/tests/bugs/xde/bug22805
@@ -20,6 +20,6 @@ if { [regexp {This shape seems to be valid} $info]} {
 }
 
 renamevar result_1 result
-set square 15121.2
+set square 14447.5
 set 3dviewer 0
 

diff --git a/tests/heal/data/advanced/U9 b/tests/heal/data/advanced/U9
index 4578bf26d837a7ec9b76cdfbd2dc17285da1182c..844920a061e1bd351ae4033ab00e73eaa010b580 100644 (file)
--- a/tests/heal/data/advanced/U9
+++ b/tests/heal/data/advanced/U9
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 if {[string compare $command "SplitAngle"] == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_3 "
 }

diff --git a/tests/heal/data/advanced/V4 b/tests/heal/data/advanced/V4
index 7336a0757553dceed3f29b2dbca89cb79ad4da23..34b8aad935374ebd3dec0fb89e8725c864c6bc1a 100644 (file)
--- a/tests/heal/data/advanced/V4
+++ b/tests/heal/data/advanced/V4
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 
 restore [locate_data_file BORNIER80.brep] a
 

diff --git a/tests/heal/data/advanced/V5 b/tests/heal/data/advanced/V5
index 174cd65dc86c6037c33c95402f0fc27333fadca3..93d4a91cdbfaeb8fece28fc17da7354971688034 100644 (file)
--- a/tests/heal/data/advanced/V5
+++ b/tests/heal/data/advanced/V5
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 if {[string compare $command "SplitAngle"] == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_4 "
 }

diff --git a/tests/heal/data/advanced/Y3 b/tests/heal/data/advanced/Y3
index bfb4398f7eb6d52336ae37da6c2572d3059012e3..76936e3bcf68d29e642d73e2db91de63879ca4f7 100644 (file)
--- a/tests/heal/data/advanced/Y3
+++ b/tests/heal/data/advanced/Y3
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file METABO11.brep] a
 

diff --git a/tests/heal/data/advanced/Y5 b/tests/heal/data/advanced/Y5
index ed68e31d3f45f0b9e58e9263d2a3a60142d65a46..9921f5c2b37869cbbe83aa3a894a2a36d4ec59bd 100644 (file)
--- a/tests/heal/data/advanced/Y5
+++ b/tests/heal/data/advanced/Y5
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file METABO2.brep] a
 

diff --git a/tests/heal/data/advanced/Z7 b/tests/heal/data/advanced/Z7
index b60d0901831f4014a7484162f4bdd89abc570555..424a8398e0fbc1894459d4d8045a6d10ae4a7669 100644 (file)
--- a/tests/heal/data/advanced/Z7
+++ b/tests/heal/data/advanced/Z7
@@ -1,5 +1,5 @@
-if {[string compare $command "ShapeConvertRev"] == 0 } {
-    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is "
-}
+#if {[string compare $command "ShapeConvertRev"] == 0 } {
+#    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is "
+#}
 restore [locate_data_file PB_COPCOLL.brep] a
 

diff --git a/tests/heal/data/advanced/ZB1 b/tests/heal/data/advanced/ZB1
index 89d632e425221de43012d3b2871b6ba47f0af5bc..67c0caefae10bab41a4eadc61c1abedd06828bae 100644 (file)
--- a/tests/heal/data/advanced/ZB1
+++ b/tests/heal/data/advanced/ZB1
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file SFR2.brep] a
 

diff --git a/tests/heal/data/advanced/ZB5 b/tests/heal/data/advanced/ZB5
index aa8bb65c073cfe3843fffc97ef38ce718ee3b654..952d8fa6745e98401aa2fb20f07e8f54416591a4 100644 (file)
--- a/tests/heal/data/advanced/ZB5
+++ b/tests/heal/data/advanced/ZB5
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file TOP01245_2.brep] a
 

diff --git a/tests/heal/data/standard/A5 b/tests/heal/data/standard/A5
index f3df7d2418aae29a384037cb5e60105fd2d29885..e934d54e969fdca2b07787d2d3c4308132f5f98c 100644 (file)
--- a/tests/heal/data/standard/A5
+++ b/tests/heal/data/standard/A5
@@ -1,2 +1,3 @@
 restore [locate_data_file arx.rle] a
 
+set rel_tol 0.015

diff --git a/tests/heal/data/standard/C8 b/tests/heal/data/standard/C8
index 4e68d53c67df7f12646965df85158316f9161238..b618dc16e1aba14b4b9ebdd7082cb310833c55e2 100644 (file)
--- a/tests/heal/data/standard/C8
+++ b/tests/heal/data/standard/C8
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file heal-Face1.rle] a
 

diff --git a/tests/heal/data/standard/E5 b/tests/heal/data/standard/E5
index 7baffee5dc4591fa58ed7529534677255514ef2e..9e7add3ec0423db16fc14c71cfcd5308e2174401 100644 (file)
--- a/tests/heal/data/standard/E5
+++ b/tests/heal/data/standard/E5
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file ma-test2.rle] a
 

diff --git a/tests/heal/data/standard/ZW1 b/tests/heal/data/standard/ZW1
index 77db1287bc1d3df6e6e86660f1ba120e196f8581..b6ab694b53ca682921e38aa4639e22ce8a0abfdd 100644 (file)
--- a/tests/heal/data/standard/ZW1
+++ b/tests/heal/data/standard/ZW1
@@ -1,6 +1,6 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#    puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file heal-Face1.rle] a
 
 

diff --git a/tests/heal/data/standard/ZZ4 b/tests/heal/data/standard/ZZ4
index f949c590850cd792890a825d45626abd41bd5194..83746592ac6dd1eab42bcefb1f297c7cb41aa281 100644 (file)
--- a/tests/heal/data/standard/ZZ4
+++ b/tests/heal/data/standard/ZZ4
@@ -1,5 +1,5 @@
-if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
-}
+#if { [string compare $command "ShapeConvertRev"] == 0 } {
+#   puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
+#}
 restore [locate_data_file BUG-CAPAR.brep] a
 

diff --git a/tests/heal/surface_to_revolution_advanced/begin b/tests/heal/surface_to_revolution_advanced/begin
index ccfadb87c18409e9dfe578ff30d2ef4239f2d063..ec39fef7c4f8bd3c3718af81ecbac443e79a2c3b 100644 (file)
--- a/tests/heal/surface_to_revolution_advanced/begin
+++ b/tests/heal/surface_to_revolution_advanced/begin
@@ -1,2 +1,3 @@
 set command ShapeConvertRev
 
+set rel_tol 0.01

diff --git a/tests/heal/surface_to_revolution_advanced/end b/tests/heal/surface_to_revolution_advanced/end
index eea980d3ad819667ae6107637bb2d13c88fa2845..63ab3db33e0bc4283f53f8d924aa913142a4021d 100644 (file)
--- a/tests/heal/surface_to_revolution_advanced/end
+++ b/tests/heal/surface_to_revolution_advanced/end
@@ -15,9 +15,8 @@ if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0}
 regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
 
-if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
+if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > $rel_tol) || ($mass == 0 && $m != 0) } {
    puts "Error : The area of the resulting shape is $m"
 } else {
    puts "The areas of the initial and the resulting shape are equal"
 }
-

diff --git a/tests/heal/surface_to_revolution_standard/begin b/tests/heal/surface_to_revolution_standard/begin
index ccfadb87c18409e9dfe578ff30d2ef4239f2d063..ec39fef7c4f8bd3c3718af81ecbac443e79a2c3b 100644 (file)
--- a/tests/heal/surface_to_revolution_standard/begin
+++ b/tests/heal/surface_to_revolution_standard/begin
@@ -1,2 +1,3 @@
 set command ShapeConvertRev
 
+set rel_tol 0.01

diff --git a/tests/heal/surface_to_revolution_standard/end b/tests/heal/surface_to_revolution_standard/end
index 09b53a644e8fcf91b8d376f7b012705e5ca19233..63ab3db33e0bc4283f53f8d924aa913142a4021d 100644 (file)
--- a/tests/heal/surface_to_revolution_standard/end
+++ b/tests/heal/surface_to_revolution_standard/end
@@ -15,9 +15,8 @@ if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0}
 regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
 
-if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
+if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > $rel_tol) || ($mass == 0 && $m != 0) } {
    puts "Error : The area of the resulting shape is $m"
 } else {
-   puts "The areas the initial and the resulting shape are equal"
+   puts "The areas of the initial and the resulting shape are equal"
 }
-

diff --git a/tests/mesh/data/advanced/B4 b/tests/mesh/data/advanced/B4
index 8073f936f354813dccdb295c7ebbbabf21b089e5..01a1cd802c17919555f5bffce36b5e39d6bca3dc 100755 (executable)
--- a/tests/mesh/data/advanced/B4
+++ b/tests/mesh/data/advanced/B4
@@ -1,3 +1,7 @@
 set TheFileName OCC22188.brep
 set bug_area "OCC22687"
-set rel_tol 3.3
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.793
+} else {
+   set rel_tol 0.052
+}

diff --git a/tests/mesh/data/standard/K4 b/tests/mesh/data/standard/K4
index a50e8d9dc506d39de5d59ee1e2ef73cd52e592ae..89b1e726b94700b67ad4316a16fdb550509c5edf 100755 (executable)
--- a/tests/mesh/data/standard/K4
+++ b/tests/mesh/data/standard/K4
@@ -1,3 +1,7 @@
 set TheFileName shading_094.brep
 set bug_area "OCC22687"
-set rel_tol 3.5
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.21
+} else {
+   set rel_tol 0.67
+}

diff --git a/tests/mesh/data/standard/K9 b/tests/mesh/data/standard/K9
index a26b2be1cfaa26de317bddabf97d14e3c3445414..51ba71221b3a5ec5f2d072f8ccf8b107d569d89d 100755 (executable)
--- a/tests/mesh/data/standard/K9
+++ b/tests/mesh/data/standard/K9
@@ -1,3 +1,3 @@
 set TheFileName shading_099.brep
 set bug_area "OCC22687"
-set rel_tol 1.5
+set rel_tol 0.298

diff --git a/tests/mesh/data/standard/M3 b/tests/mesh/data/standard/M3
index db15ca6189b47fff9ce449ce700c2475acc8dd22..9d6fe327d809261a419a565c82b9082e23dc072f 100755 (executable)
--- a/tests/mesh/data/standard/M3
+++ b/tests/mesh/data/standard/M3
@@ -1,3 +1,7 @@
 set TheFileName shading_111.brep
 set bug_area "OCC22687"
-set rel_tol 2.8
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.317
+} else {
+   set rel_tol 0.103
+}

diff --git a/tests/mesh/data/standard/M4 b/tests/mesh/data/standard/M4
index b6a258a17ed2a8296858be94da608713529e3724..14a7e2a3384e5cc1706551e19dbff27bcdba5df1 100755 (executable)
--- a/tests/mesh/data/standard/M4
+++ b/tests/mesh/data/standard/M4
@@ -1,3 +1,7 @@
 set TheFileName shading_112.brep
 set bug_area "OCC22687"
-set rel_tol 10.9
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 1.71
+} else {
+   set rel_tol 1.55
+}

diff --git a/tests/mesh/data/standard/O5 b/tests/mesh/data/standard/O5
index b47213ab5ff8cef1e9bfe325fb43809121087f21..230baecfe9bd31141148ce0a82fb5fb429731347 100755 (executable)
--- a/tests/mesh/data/standard/O5
+++ b/tests/mesh/data/standard/O5
@@ -1,5 +1,9 @@
 set TheFileName shading_131.brep
 set bug_area "OCC22687"
-set rel_tol 1.34
 set bug_withouttri "OCC22687"
 set nbwithouttri(ALL) 1
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.13
+} else {
+   set rel_tol 0.21
+}

diff --git a/tests/mesh/data/standard/Q7 b/tests/mesh/data/standard/Q7
index a18ed5e62db316d533a087d6c5b719e22d25d864..287ff8de3db4524ba90f258a4a4665f20dfa27db 100755 (executable)
--- a/tests/mesh/data/standard/Q7
+++ b/tests/mesh/data/standard/Q7
@@ -1,3 +1,7 @@
 set TheFileName shading_151.brep
 set bug_area "OCC22687"
-set rel_tol 3.15
+if { [string compare $command "shading"] == 0 } {
+   set rel_tol 0.018
+} else {
+   set rel_tol 0.631
+}

diff --git a/tests/pipe/specific/K3 b/tests/pipe/specific/K3
index 160cc3ba23204aee0caf282888c5f54aef35c62f..457b83f90e25aee368f83486c408c5deaf3b796d 100755 (executable)
--- a/tests/pipe/specific/K3
+++ b/tests/pipe/specific/K3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 32077.2
+set square 30253.5
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/K5 b/tests/pipe/specific/K5
index 58480ef6dfc0b92aa58a17b0921b5cef03845b44..7f9f3bccb20e79c1a6bd174e70363028a7152929 100755 (executable)
--- a/tests/pipe/specific/K5
+++ b/tests/pipe/specific/K5
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 33790.1
+set square 32349.5
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/K6 b/tests/pipe/specific/K6
index 65875120d4c6dd8dd13ce03b4def4d7b2a5a5d18..577876ee07f6c3d77f01ff877f93ae0f1d144151 100755 (executable)
--- a/tests/pipe/specific/K6
+++ b/tests/pipe/specific/K6
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions "-R"
 
-set square 34911.3
+set square 33467.5
 
 set nb_v_good 3
 set nb_e_good 8

diff --git a/tests/pipe/specific/K9 b/tests/pipe/specific/K9
index 8fae85277c10067eff2385f21f52c7cd7d76cb26..4cbbeaad19ed4b26b910615d58685391f8015b6d 100755 (executable)
--- a/tests/pipe/specific/K9
+++ b/tests/pipe/specific/K9
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 32119.4
+set square 30131.6
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/L2 b/tests/pipe/specific/L2
index ab478460d16531c9d39ae744cd0d35eebb85ccbc..ca68a5e34cc1a3bb569513e34e1e64ea306456f4 100755 (executable)
--- a/tests/pipe/specific/L2
+++ b/tests/pipe/specific/L2
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 33656
+set square 32064.4
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/L3 b/tests/pipe/specific/L3
index 3c524d03a76c8a4e8168397420a24d87bd417ed7..dac18dc65e8e5002b6e18250945575cbf0755369 100755 (executable)
--- a/tests/pipe/specific/L3
+++ b/tests/pipe/specific/L3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions "-R"
 
-set square 37899.3
+set square 36309.2
 
 set nb_v_good 4
 set nb_e_good 9

diff --git a/tests/pipe/specific/L6 b/tests/pipe/specific/L6
index a9e0502189da2533f348e8a09ee29e7ae3f968f2..baf7c49f216153ccde46b2850300d7618e49aea1 100755 (executable)
--- a/tests/pipe/specific/L6
+++ b/tests/pipe/specific/L6
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 29675.6
+set square 27860.8
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/L8 b/tests/pipe/specific/L8
index 6dc9488e29ae7e758c1e9c823b4b6e30d0521dc0..d2d3a322cbe2422a2b0ef2096157a83a1061f4c4 100755 (executable)
--- a/tests/pipe/specific/L8
+++ b/tests/pipe/specific/L8
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 31762.6
+set square 30617.5
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/M1 b/tests/pipe/specific/M1
index 30b78c7cffdfa94e1f7bf11dc9bd0f6a288a0b98..06573b600bdc5126059bdf0be7f87c868b75e76d 100755 (executable)
--- a/tests/pipe/specific/M1
+++ b/tests/pipe/specific/M1
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 32119.4
+set square 30131.6
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/M3 b/tests/pipe/specific/M3
index f22691d2a04bf63d4d5844d50532c2553e8bcab9..0ba5f78f43829c6597d9b9ec526449a7bd6dcc4a 100755 (executable)
--- a/tests/pipe/specific/M3
+++ b/tests/pipe/specific/M3
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 34023.2
+set square 32800.5
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/M5 b/tests/pipe/specific/M5
index 54257b3d1b57cefa75b8362c6d63d413eb5ffd70..1af117f5f48be99896bb9c933d990a4578418628 100755 (executable)
--- a/tests/pipe/specific/M5
+++ b/tests/pipe/specific/M5
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 32077.2
+set square 30253.5
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/M7 b/tests/pipe/specific/M7
index 148a62f97eb47e5f6cef918dcc67f447d4960ad9..890003416727d05696fb2592c76cda8b61b013b1 100755 (executable)
--- a/tests/pipe/specific/M7
+++ b/tests/pipe/specific/M7
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 33790.1
+set square 32349.5
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/M8 b/tests/pipe/specific/M8
index bbbe4df4ce58132a79e34c0bd241f571b2ededb2..6d2cc425b6541f9abdb25aa66a755bd1f37b8996 100755 (executable)
--- a/tests/pipe/specific/M8
+++ b/tests/pipe/specific/M8
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions "-R"
 
-set square 34911.3
+set square 33467.5
 
 set nb_v_good 3
 set nb_e_good 8

diff --git a/tests/pipe/specific/N2 b/tests/pipe/specific/N2
index a2bb9921a8d90a57f52c759b9d3e8ff416b08f0e..4ef007393f59a83ce2b7a6f9268bee4dd0414f57 100755 (executable)
--- a/tests/pipe/specific/N2
+++ b/tests/pipe/specific/N2
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 32119.4
+set square 30131.6
 
 set nb_v_good 3
 set nb_e_good 5

diff --git a/tests/pipe/specific/N3 b/tests/pipe/specific/N3
index b34216282b95b9d07b2f1df277db03ead1030d9e..df82af09b8131eb4fb8773f526ce193f23c714d7 100755 (executable)
--- a/tests/pipe/specific/N3
+++ b/tests/pipe/specific/N3
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T -R"
 set buildsweepOptions "-R"
 
-set square 37899.3
+set square 36309.2
 
 set nb_v_good 4
 set nb_e_good 9

diff --git a/tests/pipe/specific/N6 b/tests/pipe/specific/N6
index a0cd9d8ecc49b70091180a1a453cb7381fe7fa13..a9c662ef36f695a6c0ea003c1bfee13adb5786bc 100755 (executable)
--- a/tests/pipe/specific/N6
+++ b/tests/pipe/specific/N6
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 29697.4
+set square 28006.9
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/N8 b/tests/pipe/specific/N8
index 99e167c6ad3216f9166d3af714222d07f06fddbe..2ff36f6058e7a1371d67fe5b4c60d79c5f796f2a 100755 (executable)
--- a/tests/pipe/specific/N8
+++ b/tests/pipe/specific/N8
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 30656.7
+set square 29295.4
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/O1 b/tests/pipe/specific/O1
index b9227d01502379d2c3a7e4cedbb7de48906d70ca..feb7d20687364ba4a1516b416dbf302a8dcb59bf 100755 (executable)
--- a/tests/pipe/specific/O1
+++ b/tests/pipe/specific/O1
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29764.3
+set square 27924.2
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/O3 b/tests/pipe/specific/O3
index d5267dd5fce686ecbbc901360689da51ee095fa3..b87c2f611c535d8339f2a1d93b562f1c6cf36e7d 100755 (executable)
--- a/tests/pipe/specific/O3
+++ b/tests/pipe/specific/O3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30745.8
+set square 29267.5
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/O5 b/tests/pipe/specific/O5
index ad8a0a1b36740d2c31f24afb0fd525595e17d909..4bf5fe843a6e55c04d35b11e4657913fcea08099 100755 (executable)
--- a/tests/pipe/specific/O5
+++ b/tests/pipe/specific/O5
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 27506.6
+set square 25814.6
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/O7 b/tests/pipe/specific/O7
index aa3a8b43d364d7b7e2da038eeabfd9aa7715518e..68d4cc0b6ac882a8657c29b8dcf51546f75db168 100755 (executable)
--- a/tests/pipe/specific/O7
+++ b/tests/pipe/specific/O7
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 27367.2
+set square 25419.9
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/O9 b/tests/pipe/specific/O9
index 3f81697cb3f981468da9bb01bfdd1aae9d65495a..3ff5140944f460e6938aa40bc11904751fb98e0c 100755 (executable)
--- a/tests/pipe/specific/O9
+++ b/tests/pipe/specific/O9
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29732.8
+set square 27882.1
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/P2 b/tests/pipe/specific/P2
index 104c283cbac2b49b4418f707c9c83f631ed56090..ab8997ecd18c93a4c723ca03e03c5496c1d81cbb 100755 (executable)
--- a/tests/pipe/specific/P2
+++ b/tests/pipe/specific/P2
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 29264.2
+set square 27282.7
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/P4 b/tests/pipe/specific/P4
index 29a6ac90b8865396019a9b6c131cbbbf8696d5ff..8a1693804b11faa64c42c168ab7213e2489ce19f 100755 (executable)
--- a/tests/pipe/specific/P4
+++ b/tests/pipe/specific/P4
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 29697.4
+set square 28006.9
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/P6 b/tests/pipe/specific/P6
index 84d16304db5ff27f1dcf9fb0d696d591c2b107a9..0480585717b64c6b19c355d57e2e4492c9d45fe5 100755 (executable)
--- a/tests/pipe/specific/P6
+++ b/tests/pipe/specific/P6
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 30656.7
+set square 29295.4
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/P8 b/tests/pipe/specific/P8
index 06684afc3560b1070e150878ba6a0d4a4373c108..39609b2b379b7219b3fd7e7bec06ed859deef40d 100755 (executable)
--- a/tests/pipe/specific/P8
+++ b/tests/pipe/specific/P8
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29764.3
+set square 27924.2
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/Q1 b/tests/pipe/specific/Q1
index fe55bc7f146c4a6976f8259862847b20fb9accca..6740af080d8da6138c819ee881e1b800cb380c14 100755 (executable)
--- a/tests/pipe/specific/Q1
+++ b/tests/pipe/specific/Q1
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30745.8
+set square 29267.5
 
 set nb_v_good 15
 set nb_e_good 25

diff --git a/tests/pipe/specific/Q3 b/tests/pipe/specific/Q3
index 4e4fa9262fb3548fa2ee989776b1fcf30875f2f3..40694d46e5e8c635017e3044547a7dbf02af9bd8 100755 (executable)
--- a/tests/pipe/specific/Q3
+++ b/tests/pipe/specific/Q3
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 28767.8
+set square 27135.6
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/Q5 b/tests/pipe/specific/Q5
index fb1bb40205d805a4cb4233280f283981ca62f77e..a7e473c59d3ebaac790a9a7a618cecd615a154f1 100755 (executable)
--- a/tests/pipe/specific/Q5
+++ b/tests/pipe/specific/Q5
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 29829.6
+set square 28434.6
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/Q7 b/tests/pipe/specific/Q7
index ef69bbdf587791507d6436305422e799275af1f6..e932fab7170cba9189f27185ce82d795cd6828e7 100755 (executable)
--- a/tests/pipe/specific/Q7
+++ b/tests/pipe/specific/Q7
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29069.5
+set square 27289.6
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/Q9 b/tests/pipe/specific/Q9
index d88e9b7518f1b11a462a66c4d756275137f9c02e..1398d0aa2b745a49ff1a60e2b68f8d5e449462b8 100755 (executable)
--- a/tests/pipe/specific/Q9
+++ b/tests/pipe/specific/Q9
@@ -19,7 +19,7 @@ set setsweepOptions ""
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30024.7
+set square 28489.1
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/R2 b/tests/pipe/specific/R2
index 4d196db4e54012938296104185db9195b6383c8c..6ed21cff62623d5c12b463da4de1c7695623a80d 100755 (executable)
--- a/tests/pipe/specific/R2
+++ b/tests/pipe/specific/R2
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 27154.8
+set square 25522.2
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/R4 b/tests/pipe/specific/R4
index 54e60da83357c9bfe48fb9d3fe59f81a82a4a081..49f89afff9cd204b8cb40e736f923204303829fa 100755 (executable)
--- a/tests/pipe/specific/R4
+++ b/tests/pipe/specific/R4
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 28422
+set square 27210.9
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/R6 b/tests/pipe/specific/R6
index b62bca81ceddbe882480ca6621bccfdecede36d9..70508b61761c510d93e4f497607555c9f377577b 100755 (executable)
--- a/tests/pipe/specific/R6
+++ b/tests/pipe/specific/R6
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29081.3
+set square 27294.9
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/R8 b/tests/pipe/specific/R8
index 210d199c7153661548b822feef391a1997a22bbf..2e7b843b0d6e52e7d84e5e46b6396ba78db45c95 100755 (executable)
--- a/tests/pipe/specific/R8
+++ b/tests/pipe/specific/R8
@@ -19,7 +19,7 @@ set setsweepOptions "-FR"
 set addsweepOptions "-T -R"
 set buildsweepOptions ""
 
-set square 30243.2
+set square 28939
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/S1 b/tests/pipe/specific/S1
index ea48f6e6a477fea7a9ac13dc00147714f6848d97..1c8b70e397c8b63d7897953c5ec76c6c3dec7a15 100755 (executable)
--- a/tests/pipe/specific/S1
+++ b/tests/pipe/specific/S1
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions ""
 set buildsweepOptions ""
 
-set square 28767.8
+set square 27135.6
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/S3 b/tests/pipe/specific/S3
index 4f3c4ed1a9338f13e50917ab92052f37ecd32c9b..cec0b807dc25e0202beffb6a4a9432c16cb82e59 100755 (executable)
--- a/tests/pipe/specific/S3
+++ b/tests/pipe/specific/S3
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-T"
 set buildsweepOptions ""
 
-set square 29829.6
+set square 28434.6
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/specific/S5 b/tests/pipe/specific/S5
index a8a1bebed031139be67176c8c7243244b637dc53..707b8888c8d211d656ed3edfed94626321579023 100755 (executable)
--- a/tests/pipe/specific/S5
+++ b/tests/pipe/specific/S5
@@ -19,7 +19,7 @@ set setsweepOptions "-CF"
 set addsweepOptions "-R"
 set buildsweepOptions ""
 
-set square 29069.5
+set square 27289.6
 
 set nb_v_good 12
 set nb_e_good 20

diff --git a/tests/pipe/standard/A2 b/tests/pipe/standard/A2
index 161999b3201863442d80395f99f94828aca26b83..d56a2146823c9ab1c70c634d072988da45f3e133 100644 (file)
--- a/tests/pipe/standard/A2
+++ b/tests/pipe/standard/A2
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 7516.8
+set square 7833.49

diff --git a/tests/pipe/standard/A3 b/tests/pipe/standard/A3
index 973530afecc4a3b25698e0c67ea6ce70e8c7995e..e1024761b526eef394ffb615bb9c4915635aab15 100644 (file)
--- a/tests/pipe/standard/A3
+++ b/tests/pipe/standard/A3
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 113874
+set square 168406

diff --git a/tests/pipe/standard/A4 b/tests/pipe/standard/A4
index a466f32805a99217cd3f90770899196de512bbae..2c7c6df8a01c9076534de443e0f5ed63044a92df 100644 (file)
--- a/tests/pipe/standard/A4
+++ b/tests/pipe/standard/A4
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 8385.98
+set square 8497.19

diff --git a/tests/pipe/standard/A5 b/tests/pipe/standard/A5
index 1466bcc693d27ff0a9c5d36f2b6fed1d7a47183e..b453fc7fc8a95d4d7fd9506f120093ecb23f06bf 100644 (file)
--- a/tests/pipe/standard/A5
+++ b/tests/pipe/standard/A5
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 7767.04
+set square 7262.6

diff --git a/tests/pipe/standard/B2 b/tests/pipe/standard/B2
index 54b3ddb87d289aaca50f65a0e504e4f6c9489a18..f6e28ff9e310a60c212149507006de8ce9790e18 100644 (file)
--- a/tests/pipe/standard/B2
+++ b/tests/pipe/standard/B2
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 12789.7
+set square 12045

diff --git a/tests/pipe/standard/B3 b/tests/pipe/standard/B3
index 9ad56f4848966914499704beb38aae81a60d13fd..6359c7028b8b682c91b7ba04cb39e46124c16f96 100644 (file)
--- a/tests/pipe/standard/B3
+++ b/tests/pipe/standard/B3
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 5094.14
+set square 4755.96

diff --git a/tests/pipe/standard/C5 b/tests/pipe/standard/C5
index e3e21ccea938ab7f7ae1b7267b40d2687fa9d06e..0001790cc71ac8298f8397d3ddf7695e093ff263 100644 (file)
--- a/tests/pipe/standard/C5
+++ b/tests/pipe/standard/C5
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 149159
+set square 156102

diff --git a/tests/pipe/standard/C6 b/tests/pipe/standard/C6
index 1ed4efc17e4b6ef5bc4a39370b0a0bea0da44de0..77c3c1928a0d69b56880f2fd8bcb5c3024984573 100644 (file)
--- a/tests/pipe/standard/C6
+++ b/tests/pipe/standard/C6
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 192613
+set square 187196

diff --git a/tests/pipe/standard/C8 b/tests/pipe/standard/C8
index 3c9f92ad17e9e4434ce32affce48f9677d8de922..b4105748ebc957ea591fa5b6737fd20c62461166 100644 (file)
--- a/tests/pipe/standard/C8
+++ b/tests/pipe/standard/C8
@@ -4,4 +4,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 580.979
+set square 527.039

diff --git a/tests/pipe/standard/D3 b/tests/pipe/standard/D3
index 0b62cadcb7c64ee94a3529e37d3a93732f6680af..cf4198735da3c7aa9c5bec51347c71e05eba2261 100644 (file)
--- a/tests/pipe/standard/D3
+++ b/tests/pipe/standard/D3
@@ -4,4 +4,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 7950.38
+set square 8049.06

diff --git a/tests/pipe/standard/D4 b/tests/pipe/standard/D4
index 93ff0ab3ebefd290df67b5f07483808a89aa37bd..37391895a352026659ba849f19145b767f426cba 100644 (file)
--- a/tests/pipe/standard/D4
+++ b/tests/pipe/standard/D4
@@ -4,4 +4,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 2565.03
+set square 2669.45

diff --git a/tests/pipe/standard/D6 b/tests/pipe/standard/D6
index 561732c9789916e7318659442a3da05f48307848..090c7a74454186735a3c8577040cc4ff549bad78 100644 (file)
--- a/tests/pipe/standard/D6
+++ b/tests/pipe/standard/D6
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 123710
+set square 115411

diff --git a/tests/pipe/standard/E2 b/tests/pipe/standard/E2
index 853c600ab40f4231ddc5d0cb829f6b7c63bbabc1..0bae0f810b890fcc2634ed32c75f8e58ed494c7f 100644 (file)
--- a/tests/pipe/standard/E2
+++ b/tests/pipe/standard/E2
@@ -6,4 +6,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 328270
+set square 318347

diff --git a/tests/pipe/standard/E3 b/tests/pipe/standard/E3
index 6e7a7a8fd60561e5b1c7e5cfc892de13c0a465f1..cea4dab12f3a23097405f736073b7503841b89ec 100644 (file)
--- a/tests/pipe/standard/E3
+++ b/tests/pipe/standard/E3
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 354.016
+set square 329.199

diff --git a/tests/pipe/standard/E4 b/tests/pipe/standard/E4
index 071807ec86887608cbef849d36df88514fe64fec..38f9d3353db733308a5e814cb8a3c4aa3774c007 100644 (file)
--- a/tests/pipe/standard/E4
+++ b/tests/pipe/standard/E4
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 510.092
+set square 482.227

diff --git a/tests/pipe/standard/E9 b/tests/pipe/standard/E9
index f02352ef3dbd837c699c80640ec1411e944ca8e6..660a7a0b0cb444e622a962b0779b016e69c80b39 100644 (file)
--- a/tests/pipe/standard/E9
+++ b/tests/pipe/standard/E9
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 309430
+set square 304960

diff --git a/tests/pipe/standard/F1 b/tests/pipe/standard/F1
index c0232673587695a48ceea31e9d98138d4158cb97..2708880ddf68041dae8f4d1ceb03180a4b94aaa4 100644 (file)
--- a/tests/pipe/standard/F1
+++ b/tests/pipe/standard/F1
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 30818.9
+set square 29584.3

diff --git a/tests/pipe/standard/F2 b/tests/pipe/standard/F2
index 848f1a1fcea11ccd2a03d066c4c8e11970997a26..77ceacb4a29b177db97abac2f53fc9c06f889276 100644 (file)
--- a/tests/pipe/standard/F2
+++ b/tests/pipe/standard/F2
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 45793.5
+set square 43171.5

diff --git a/tests/pipe/standard/F7 b/tests/pipe/standard/F7
index fc77e959b43f6c18ee2f15fa5199ca67fcef73d2..e7525ef8aca888d21dfdd275f202e984242e21dc 100644 (file)
--- a/tests/pipe/standard/F7
+++ b/tests/pipe/standard/F7
@@ -7,4 +7,4 @@ mkedge w w
 wire w w
 pipe result w profile
 
-set square 305504
+set square 301365

diff --git a/tests/thrusection/specific/B6 b/tests/thrusection/specific/B6
index efe40fe891dc42841b1706a90299bac8f0a3cc45..085b9f56b00afb16f3212a58695fce461958f880 100755 (executable)
--- a/tests/thrusection/specific/B6
+++ b/tests/thrusection/specific/B6
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 
-set square 2598.48
+set square 2556.25
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/thrusection/specific/B7 b/tests/thrusection/specific/B7
index 74c6d8a36caaab726678f4ebf4522c8e56cde472..9c9b6c374780f45adc4a1ff8dedd0f76ef7c68be 100755 (executable)
--- a/tests/thrusection/specific/B7
+++ b/tests/thrusection/specific/B7
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 
 
-set square 2597.01
+set square 2556.25
 
 
 set nb_v_good 2

diff --git a/tests/thrusection/specific/D4 b/tests/thrusection/specific/D4
index 334c2b286a49182d0ef5c8356ba6122e99509cf9..a71b075c21162ba7258d3206788f47b582d473ea 100755 (executable)
--- a/tests/thrusection/specific/D4
+++ b/tests/thrusection/specific/D4
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 
-set square 892.672
+set square 881.045
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/thrusection/specific/D5 b/tests/thrusection/specific/D5
index cff590ae34fbfe768fa6a5b141a4829d07fc9e83..23acfb37a522e8edcef19902731ae8e33dc7e77d 100755 (executable)
--- a/tests/thrusection/specific/D5
+++ b/tests/thrusection/specific/D5
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 
 
-set square 892.672
+set square 881.045
 
 
 set nb_v_good 2

diff --git a/tests/thrusection/specific/E3 b/tests/thrusection/specific/E3
index 50013dd795835065339dedc8bb522a376f755a59..79b01cbe41c5fcddc2d4f963e3a6446214fc935e 100755 (executable)
--- a/tests/thrusection/specific/E3
+++ b/tests/thrusection/specific/E3
@@ -20,7 +20,7 @@ set isruled 0
 catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 
-set square 485.498
+set square 478.063
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/thrusection/specific/J2 b/tests/thrusection/specific/J2
index cdc1ac4cd3d7e101322819826036ede28357f7e2..2740023149dc13e6cb3dbb882670f876a1377818 100755 (executable)
--- a/tests/thrusection/specific/J2
+++ b/tests/thrusection/specific/J2
@@ -31,7 +31,7 @@ addsweep v2
 buildsweep result
 
 
-set square 1277.32
+set square 1259.14
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/thrusection/specific/L4 b/tests/thrusection/specific/L4
index a05c8af6b9082321a4d0621bc1ab997d8c344dff..d871bba098ad07992c684ce9c1677d9145394c6a 100755 (executable)
--- a/tests/thrusection/specific/L4
+++ b/tests/thrusection/specific/L4
@@ -31,7 +31,7 @@ addsweep v2
 buildsweep result
 
 
-set square 892.672
+set square 881.045
 
 set nb_v_good 2
 set nb_e_good 3

diff --git a/tests/thrusection/specific/M6 b/tests/thrusection/specific/M6
index cb9292f291a1ebb54a1d8ccff674c6e6c44f6e96..3715686e86c177787d708bfaa48f8cc117ac9b98 100755 (executable)
--- a/tests/thrusection/specific/M6
+++ b/tests/thrusection/specific/M6
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 89897.2
+set square 181746
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/M7 b/tests/thrusection/specific/M7
index 85ad70136d9394bb581fe26a83fd5c2c78607dc3..cc169434eb4ef95eb4d8d5243441eb429b9cab0a 100755 (executable)
--- a/tests/thrusection/specific/M7
+++ b/tests/thrusection/specific/M7
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 270505
+set square 591941
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/M8 b/tests/thrusection/specific/M8
index 2ea1ae8109e85b24e659e1e547fdf3a865b11d2a..952e5f0295484f3c31a5cdcfc9a3790873e96d4c 100755 (executable)
--- a/tests/thrusection/specific/M8
+++ b/tests/thrusection/specific/M8
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 89897.2
+set square 181746
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/M9 b/tests/thrusection/specific/M9
index 2f759229457f9199cec97f90df5bb7869bb5d21c..35e04777c7f08e5a783b6aff8ac11addd5d56831 100755 (executable)
--- a/tests/thrusection/specific/M9
+++ b/tests/thrusection/specific/M9
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 270505
+set square 591941
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/N1 b/tests/thrusection/specific/N1
index 35ae096468969a60afee07517ef2cbce8eac7d94..b909fa854e052d0a41ba6e7336a4c362ffe64766 100755 (executable)
--- a/tests/thrusection/specific/N1
+++ b/tests/thrusection/specific/N1
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 91551
+set square 182717
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/N2 b/tests/thrusection/specific/N2
index 6560edbbd8076090a8379047ac160a58d3eedd21..a6dd4cd22de9a9760a31f473cf2596d6a51da71e 100755 (executable)
--- a/tests/thrusection/specific/N2
+++ b/tests/thrusection/specific/N2
@@ -104,7 +104,7 @@ addsweep v5
 catch {buildsweep result}
 
 
-set square 254037
+set square 592023
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/N3 b/tests/thrusection/specific/N3
index f0d8911471d9f520de582145135d6338959a0510..0035bfbbbee3ce62ff403cf587cc1b1e6466b5a7 100755 (executable)
--- a/tests/thrusection/specific/N3
+++ b/tests/thrusection/specific/N3
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 89897.2
+set square 181746
 
 set nb_v_good 2
 set nb_e_good 33

diff --git a/tests/thrusection/specific/N4 b/tests/thrusection/specific/N4
index 85e63e24551c0026903f66aa41d36aa51964775f..59b577ce205f76d187af9376591b9929f0f45aa6 100755 (executable)
--- a/tests/thrusection/specific/N4
+++ b/tests/thrusection/specific/N4
@@ -104,7 +104,7 @@ addsweep v5 -T
 catch {buildsweep result}
 
 
-set square 270505
+set square 591941
 
 set nb_v_good 2
 set nb_e_good 33