Changes in lemon/dim2.h [241:92f046dd7f6c:220:a5d8c039f218] in lemon-1.0

File:

• lemon/dim2.h (modified) (31 diffs)

lemon/dim2.h

@@ -21 +21 @@
 
 #include <iostream>
+#include <lemon/core.h>
 
 ///\ingroup misc
@@ -45 +46 @@
   /// @{
 
-  /// A simple two dimensional vector (plain vector) implementation
-
-  /// A simple two dimensional vector (plain vector) implementation
+  /// A simple two dimensional vector (plainvector) implementation
+
+  /// A simple two dimensional vector (plainvector) implementation
   /// with the usual vector operations.
   template<typename T>
@@ -186 +187 @@
   }
 
-  ///Read a plain vector from a stream
-
-  ///Read a plain vector from a stream.
+  ///Read a plainvector from a stream
+
+  ///Read a plainvector from a stream.
   ///\relates Point
   ///
@@ -214 +215 @@
   }
 
-  ///Write a plain vector to a stream
-
-  ///Write a plain vector to a stream.
+  ///Write a plainvector to a stream
+
+  ///Write a plainvector to a stream.
   ///\relates Point
   ///
@@ -261 +262 @@
 
 
-    /// A class to calculate or store the bounding box of plain vectors.
-
-    /// 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 plainvectors.
+  ///
     template<typename T>
     class BoundingBox {
-      Point<T> _bottom_left, _top_right;
+      Point<T> bottom_left, top_right;
       bool _empty;
     public:
@@ -275 +276 @@
 
       ///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
@@ -289 +287 @@
       BoundingBox(Point<T> a,Point<T> b)
       {
-        _bottom_left = a;
-        _top_right = b;
+        bottom_left=a;
+        top_right=b;
         _empty = false;
       }
@@ -305 +303 @@
       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;
       }
@@ -323 +321 @@
       ///Make the BoundingBox empty
       void clear() {
-        _empty = true;
+        _empty=1;
       }
 
@@ -331 +329 @@
       ///If the bounding box is empty, then the return value is not defined.
       Point<T> bottomLeft() const {
-        return _bottom_left;
+        return bottom_left;
       }
 
@@ -337 +335 @@
 
       ///Set the bottom left corner of the box.
-      ///\pre The box must not be empty.
+      ///It should only be used for non-empty box.
       void bottomLeft(Point<T> p) {
-        _bottom_left = p;
+        bottom_left = p;
       }
 
@@ -347 +345 @@
       ///If the bounding box is empty, then the return value is not defined.
       Point<T> topRight() const {
-        return _top_right;
+        return top_right;
       }
 
@@ -353 +351 @@
 
       ///Set the top right corner of the box.
-      ///\pre The box must not be empty.
+      ///It should only be used for non-empty box.
       void topRight(Point<T> p) {
-        _top_right = p;
+        top_right = p;
       }
 
@@ -363 +361 @@
       ///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);
       }
 
@@ -369 +367 @@
 
       ///Set the bottom right corner of the box.
-      ///\pre The box must not be empty.
+      ///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;
       }
 
@@ -380 +378 @@
       ///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);
       }
 
@@ -386 +384 @@
 
       ///Set the top left corner of the box.
-      ///\pre The box must not be empty.
+      ///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;
       }
 
@@ -397 +395 @@
       ///If the bounding box is empty, then the return value is not defined.
       T bottom() const {
-        return _bottom_left.y;
+        return bottom_left.y;
       }
 
@@ -403 +401 @@
 
       ///Set the bottom of the box.
-      ///\pre The box must not be empty.
+      ///It should only be used for non-empty box.
       void bottom(T t) {
-        _bottom_left.y = t;
+        bottom_left.y = t;
       }
 
@@ -413 +411 @@
       ///If the bounding box is empty, then the return value is not defined.
       T top() const {
-        return _top_right.y;
+        return top_right.y;
       }
 
@@ -419 +417 @@
 
       ///Set the top of the box.
-      ///\pre The box must not be empty.
+      ///It should only be used for non-empty box.
       void top(T t) {
-        _top_right.y = t;
+        top_right.y = t;
       }
 
@@ -429 +427 @@
       ///If the bounding box is empty, then the return value is not defined.
       T left() const {
-        return _bottom_left.x;
+        return bottom_left.x;
       }
 
@@ -435 +433 @@
 
       ///Set the left side of the box.
-      ///\pre The box must not be empty.
+      ///It should only be used for non-empty box.
       void left(T t) {
-        _bottom_left.x = t;
+        bottom_left.x = t;
       }
 
@@ -445 +443 @@
       ///If the bounding box is empty, then the return value is not defined.
       T right() const {
-        return _top_right.x;
+        return top_right.x;
       }
 
@@ -451 +449 @@
 
       ///Set the right side of the box.
-      ///\pre The box must not be empty.
+      ///It should only be used for non-empty box.
       void right(T t) {
-        _top_right.x = t;
+        top_right.x = t;
       }
 
@@ -461 +459 @@
       ///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;
       }
 
@@ -469 +467 @@
       ///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;
       }
 
@@ -476 +474 @@
         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 );
         }
       }
@@ -487 +485 @@
       ///
       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;
@@ -506 +504 @@
       BoundingBox& add(const BoundingBox &u){
         if ( !u.empty() ){
-          add(u._bottom_left);
-          add(u._top_right);
+          this->add(u.bottomLeft());
+          this->add(u.topRight());
         }
         return *this;
@@ -518 +516 @@
       BoundingBox operator&(const BoundingBox& u) const {
         BoundingBox b;
-        if (_empty || u._empty) {
+        if (this->_empty || u._empty) {
           b._empty = true;
         } else {
-          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);
-          b._empty = b._bottom_left.x > b._top_right.x ||
-                     b._bottom_left.y > b._top_right.y;
+          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;
         }
         return b;