0029582: Coding Rules, Bnd_Range - inconsistent methods pair GetMin()/GetMAX()

Cosmetics - removed redundant semicolons.
Method ::GetMAX() has been renamed to ::GetMax().
Added method ::Add() taking another Bnd_Range as argument.
Added methods ::IsOut() mimicing a Bnd_Box interface.
Methods ::Shift() and ::Shifted() no more modify Void range.

diff --git a/src/Bnd/Bnd_Range.hxx b/src/Bnd/Bnd_Range.hxx
index 01021b159d03c0bfcb26319b5a81b3041ce1e73b..53fcee6c96bde39517f4bca178712526e04d8f47 100644 (file)
--- a/src/Bnd/Bnd_Range.hxx
+++ b/src/Bnd/Bnd_Range.hxx
@@ -24,15 +24,12 @@
 //! This class describes a range in 1D space restricted
 //! by two real values.
 //! A range can be void indicating there is no point included in the range.
-
 class Bnd_Range
 {
 public:
 
   //! Default constructor. Creates VOID range.
-  Bnd_Range() : myFirst(0.0), myLast(-1.0)
-  {
-  };
+  Bnd_Range() : myFirst(0.0), myLast(-1.0) {}
 
   //! Constructor. Never creates VOID range.
   Bnd_Range(const Standard_Real theMin, const Standard_Real theMax) : 
@@ -40,7 +37,7 @@ public:
   {
     if(myLast < myFirst)
       throw Standard_ConstructionError("Last < First");
-  };
+  }
 
   //! Replaces <this> with common-part of <this> and theOther
   Standard_EXPORT void Common(const Bnd_Range& theOther);
@@ -49,6 +46,7 @@ public:
   //! Replaces *this to the result.
   //! Returns false if the operation cannot be done (e.g.
   //! input arguments are empty or separated).
+  //! @sa use method ::Add() to merge two ranges unconditionally
   Standard_EXPORT Standard_Boolean Union(const Bnd_Range& theOther);
 
   //! Splits <this> to several sub-ranges by theVal value
@@ -91,6 +89,22 @@ public:
     myLast = Max(myLast, theParameter);
   }
 
+  //! Extends this range to include both ranges.
+  //! @sa use method ::Union() to check if two ranges overlap method merging
+  void Add (const Bnd_Range& theRange)
+  {
+    if (theRange.IsVoid())
+    {
+      return;
+    }
+    else if (IsVoid())
+    {
+      *this = theRange;
+    }
+    myFirst = Min(myFirst, theRange.myFirst);
+    myLast  = Max(myLast,  theRange.myLast);
+  }
+
   //! Obtain MIN boundary of <this>.
   //! If <this> is VOID the method returns false.
   Standard_Boolean GetMin(Standard_Real& thePar) const
@@ -106,7 +120,7 @@ public:
 
   //! Obtain MAX boundary of <this>.
   //! If <this> is VOID the method returns false.
-  Standard_Boolean GetMAX(Standard_Real& thePar) const
+  Standard_Boolean GetMax(Standard_Real& thePar) const
   {
     if(IsVoid())
     {
@@ -166,14 +180,34 @@ public:
   //! Returns the copy of <*this> shifted by theVal
   Bnd_Range Shifted(const Standard_Real theVal) const
   {
-    return Bnd_Range(myFirst + theVal, myLast + theVal);
+    return !IsVoid() ? Bnd_Range(myFirst + theVal, myLast + theVal) : Bnd_Range();
   }
 
   //! Shifts <*this> by theVal
   void Shift(const Standard_Real theVal)
   {
-    myFirst += theVal;
-    myLast += theVal;
+    if (!IsVoid())
+    {
+      myFirst += theVal;
+      myLast  += theVal;
+    }
+  }
+
+  //! Returns True if the value is out of this range.
+  Standard_Boolean IsOut (Standard_Real theValue) const
+  {
+    return IsVoid()
+        || theValue < myFirst
+        || theValue > myLast;
+  }
+
+  //! Returns True if the given range is out of this range.
+  Standard_Boolean IsOut (const Bnd_Range& theRange) const
+  {
+    return IsVoid()
+        || theRange.IsVoid()
+        || theRange.myLast  < myFirst
+        || theRange.myFirst > myLast;
   }
 
   //! Returns TRUE if theOther is equal to <*this>
@@ -183,11 +217,10 @@ public:
   }
 
 private:
-  //! Start of range
-  Standard_Real myFirst;
 
-  //! End of range
-  Standard_Real myLast;
+  Standard_Real myFirst; //!< Start of range
+  Standard_Real myLast;  //!< End   of range
+
 };
 
-#endif
\ No newline at end of file
+#endif

diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
index 27c5f6acc8803ad66b01c1f2319036cd639952ee..cbd5928e6958baa4e4629b57ecd55fa39e5fa185 100644 (file)
--- a/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
+++ b/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
@@ -1763,7 +1763,7 @@ static Standard_Boolean InscribeInterval(const Standard_Real theUfTarget,
   }
   else 
   {
-    if (!theRange.GetMAX(anUpar))
+    if (!theRange.GetMax (anUpar))
     {
       return Standard_False;
     }