Ticket #126: dim2_bounding_box_2ccb860dfdcb.patch

lemon/dim2.h

@@ -261 +261 @@
 
 
 
-  /// A class to calculate or store the bounding box of plainvectors.
+    /// A class to calculate or store the bounding box of plain vectors.
 
-  /// A class to calculate or store the bounding box of plainvectors.
-  ///
+    /// A class to calculate or store the bounding box of plain vectors.
+    ///
     template<typename T>
     class BoundingBox {
-      Point<T> bottom_left, top_right;
+      Point<T> _bottom_left, _top_right;
       bool _empty;
     public:
 
@@ -275 +275 @@
       BoundingBox() { _empty = true; }
 
       ///Construct an instance from one point
-      BoundingBox(Point<T> a) { bottom_left=top_right=a; _empty = false; }
+      BoundingBox(Point<T> a) {
+        _bottom_left = _top_right = a;
+        _empty = false;
+      }
 
       ///Construct an instance from two points
 
       ///Construct an instance from two points.
       ///\param a The bottom left corner.
       ///\param b The top right corner.
-      ///\warning The coordinates of the bottom left corner must be no more
+      ///\warning The coordinates of the bottom left corner should be no more
       ///than those of the top right one.
       BoundingBox(Point<T> a,Point<T> b)
       {
-        bottom_left=a;
-        top_right=b;
+        _bottom_left = a;
+        _top_right = b;
         _empty = false;
       }
 
@@ -298 +301 @@
       ///\param b The bottom of the box.
       ///\param r The right side of the box.
       ///\param t The top of the box.
-      ///\warning The left side must be no more than the right side and
-      ///bottom must be no more than the top.
+      ///\warning The left side should be no more than the right side and
+      ///bottom should be no more than the top.
       BoundingBox(T l,T b,T r,T t)
       {
-        bottom_left=Point<T>(l,b);
-        top_right=Point<T>(r,t);
+        _bottom_left=Point<T>(l,b);
+        _top_right=Point<T>(r,t);
         _empty = false;
       }
 
@@ -311 +314 @@
 
       ///Return \c true if the bounding box is empty (i.e. return \c false
       ///if at least one point was added to the box or the coordinates of
-      ///the box were set).
+      ///the box were set correctly).
       ///
       ///The coordinates of an empty bounding box are not defined.
       bool empty() const {
-        return _empty;
+        return _empty || _bottom_left.x > _top_right.x 
+                      || _bottom_left.y > _top_right.y;
       }
 
       ///Make the BoundingBox empty
       void clear() {
-        _empty=1;
+        _empty = true;
       }
 
       ///Give back the bottom left corner of the box
@@ -328 +332 @@
       ///Give back the bottom left corner of the box.
       ///If the bounding box is empty, then the return value is not defined.
       Point<T> bottomLeft() const {
-        return bottom_left;
+        return _bottom_left;
       }
 
       ///Set the bottom left corner of the box
@@ -336 +340 @@
       ///Set the bottom left corner of the box.
       ///It should only be used for non-empty box.
       void bottomLeft(Point<T> p) {
-        bottom_left = p;
+        _bottom_left = p;
+        _empty = false;
       }
 
       ///Give back the top right corner of the box
@@ -344 +349 @@
       ///Give back the top right corner of the box.
       ///If the bounding box is empty, then the return value is not defined.
       Point<T> topRight() const {
-        return top_right;
+        return _top_right;
       }
 
       ///Set the top right corner of the box
@@ -352 +357 @@
       ///Set the top right corner of the box.
       ///It should only be used for non-empty box.
       void topRight(Point<T> p) {
-        top_right = p;
+        _top_right = p;
+        _empty = false;
       }
 
       ///Give back the bottom right corner of the box
@@ -360 +366 @@
       ///Give back the bottom right corner of the box.
       ///If the bounding box is empty, then the return value is not defined.
       Point<T> bottomRight() const {
-        return Point<T>(top_right.x,bottom_left.y);
+        return Point<T>(_top_right.x,_bottom_left.y);
       }
 
       ///Set the bottom right corner of the box
@@ -368 +374 @@
       ///Set the bottom right corner of the box.
       ///It should only be used for non-empty box.
       void bottomRight(Point<T> p) {
-        top_right.x = p.x;
-        bottom_left.y = p.y;
+        _top_right.x = p.x;
+        _bottom_left.y = p.y;
+        _empty = false;
       }
 
       ///Give back the top left corner of the box
@@ -377 +384 @@
       ///Give back the top left corner of the box.
       ///If the bounding box is empty, then the return value is not defined.
       Point<T> topLeft() const {
-        return Point<T>(bottom_left.x,top_right.y);
+        return Point<T>(_bottom_left.x,_top_right.y);
       }
 
       ///Set the top left corner of the box
@@ -385 +392 @@
       ///Set the top left corner of the box.
       ///It should only be used for non-empty box.
       void topLeft(Point<T> p) {
-        top_right.y = p.y;
-        bottom_left.x = p.x;
+        _top_right.y = p.y;
+        _bottom_left.x = p.x;
+        _empty = false;
       }
 
       ///Give back the bottom of the box
@@ -394 +402 @@
       ///Give back the bottom of the box.
       ///If the bounding box is empty, then the return value is not defined.
       T bottom() const {
-        return bottom_left.y;
+        return _bottom_left.y;
       }
 
       ///Set the bottom of the box
@@ -402 +410 @@
       ///Set the bottom of the box.
       ///It should only be used for non-empty box.
       void bottom(T t) {
-        bottom_left.y = t;
+        _bottom_left.y = t;
+        _empty = false;
       }
 
       ///Give back the top of the box
@@ -410 +419 @@
       ///Give back the top of the box.
       ///If the bounding box is empty, then the return value is not defined.
       T top() const {
-        return top_right.y;
+        return _top_right.y;
       }
 
       ///Set the top of the box
@@ -418 +427 @@
       ///Set the top of the box.
       ///It should only be used for non-empty box.
       void top(T t) {
-        top_right.y = t;
+        _top_right.y = t;
+        _empty = false;
       }
 
       ///Give back the left side of the box
@@ -426 +436 @@
       ///Give back the left side of the box.
       ///If the bounding box is empty, then the return value is not defined.
       T left() const {
-        return bottom_left.x;
+        return _bottom_left.x;
       }
 
       ///Set the left side of the box
@@ -434 +444 @@
       ///Set the left side of the box.
       ///It should only be used for non-empty box.
       void left(T t) {
-        bottom_left.x = t;
+        _bottom_left.x = t;
+        _empty = false;
       }
 
       /// Give back the right side of the box
@@ -442 +453 @@
       /// Give back the right side of the box.
       ///If the bounding box is empty, then the return value is not defined.
       T right() const {
-        return top_right.x;
+        return _top_right.x;
       }
 
       ///Set the right side of the box
@@ -450 +461 @@
       ///Set the right side of the box.
       ///It should only be used for non-empty box.
       void right(T t) {
-        top_right.x = t;
+        _top_right.x = t;
+        _empty = false;
       }
 
       ///Give back the height of the box
@@ -458 +470 @@
       ///Give back the height of the box.
       ///If the bounding box is empty, then the return value is not defined.
       T height() const {
-        return top_right.y-bottom_left.y;
+        return _top_right.y-_bottom_left.y;
       }
 
       ///Give back the width of the box
@@ -466 +478 @@
       ///Give back the width of the box.
       ///If the bounding box is empty, then the return value is not defined.
       T width() const {
-        return top_right.x-bottom_left.x;
+        return _top_right.x-_bottom_left.x;
       }
 
       ///Checks whether a point is inside a bounding box
       bool inside(const Point<T>& u) const {
-        if (_empty)
+        if ( empty() )
           return false;
-        else{
-          return ((u.x-bottom_left.x)*(top_right.x-u.x) >= 0 &&
-              (u.y-bottom_left.y)*(top_right.y-u.y) >= 0 );
+        else {
+          return ( (u.x-_bottom_left.x)*(_top_right.x-u.x) >= 0 &&
+                   (u.y-_bottom_left.y)*(_top_right.y-u.y) >= 0 );
         }
       }
 
@@ -484 +496 @@
       ///Increments a bounding box with a point.
       ///
       BoundingBox& add(const Point<T>& u){
-        if (_empty){
-          bottom_left=top_right=u;
+        if ( empty() ) {
+          _bottom_left = _top_right = u;
           _empty = false;
         }
-        else{
-          if (bottom_left.x > u.x) bottom_left.x = u.x;
-          if (bottom_left.y > u.y) bottom_left.y = u.y;
-          if (top_right.x < u.x) top_right.x = u.x;
-          if (top_right.y < u.y) top_right.y = u.y;
+        else {
+          if (_bottom_left.x > u.x) _bottom_left.x = u.x;
+          if (_bottom_left.y > u.y) _bottom_left.y = u.y;
+          if (_top_right.x < u.x) _top_right.x = u.x;
+          if (_top_right.y < u.y) _top_right.y = u.y;
         }
         return *this;
       }
@@ -503 +515 @@
       ///
       BoundingBox& add(const BoundingBox &u){
         if ( !u.empty() ){
-          this->add(u.bottomLeft());
-          this->add(u.topRight());
+          add(u._bottom_left);
+          add(u._top_right);
         }
         return *this;
       }
@@ -515 +527 @@
       ///
       BoundingBox operator&(const BoundingBox& u) const {
         BoundingBox b;
-        if (this->_empty || u._empty) {
+        if ( empty() || u.empty() ) {
           b._empty = true;
         } else {
-          b.bottom_left.x = std::max(this->bottom_left.x,u.bottom_left.x);
-          b.bottom_left.y = std::max(this->bottom_left.y,u.bottom_left.y);
-          b.top_right.x = std::min(this->top_right.x,u.top_right.x);
-          b.top_right.y = std::min(this->top_right.y,u.top_right.y);
-          b._empty = b.bottom_left.x > b.top_right.x ||
-                     b.bottom_left.y > b.top_right.y;
+          b._empty = false;
+          b._bottom_left.x = std::max(_bottom_left.x, u._bottom_left.x);
+          b._bottom_left.y = std::max(_bottom_left.y, u._bottom_left.y);
+          b._top_right.x = std::min(_top_right.x, u._top_right.x);
+          b._top_right.y = std::min(_top_right.y, u._top_right.y);
         }
         return b;
       }