Changeset 1391:5b46af577b23 in lemon-0.x for src/lemon/xy.h

Timestamp:

04/26/05 17:50:30 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1846

Message:

• BoundingBox::clear() added
• More "-pedantic" code

File:

• src/lemon/xy.h (modified) (16 diffs)

src/lemon/xy.h

@@ -68 +68 @@
       T normSquare() const {
         return x*x+y*y;
-      };
+      }
   
       ///Increments the left hand side by u
@@ -75 +75 @@
         y += u.y;
         return *this;
-      };
+      }
   
       ///Decrements the left hand side by u
@@ -82 +82 @@
         y -= u.y;
         return *this;
-      };
+      }
 
       ///Multiplying the left hand side with a scalar
@@ -89 +89 @@
         y *= u;
         return *this;
-      };
+      }
 
       ///Dividing the left hand side by a scalar
@@ -96 +96 @@
         y /= u;
         return *this;
-      };
+      }
   
       ///Returns the scalar product of two vectors
       T operator *(const xy<T>& u) const {
         return x*u.x+y*u.y;
-      };
+      }
   
       ///Returns the sum of two vectors
@@ -107 +107 @@
         xy<T> b=*this;
         return b+=u;
-      };
+      }
 
       ///Returns the neg of the vectors
@@ -114 +114 @@
         b.x=-b.x; b.y=-b.y;
         return b;
-      };
+      }
 
       ///Returns the difference of two vectors
@@ -120 +120 @@
         xy<T> b=*this;
         return b-=u;
-      };
+      }
 
       ///Returns a vector multiplied by a scalar
@@ -126 +126 @@
         xy<T> b=*this;
         return b*=u;
-      };
+      }
 
       ///Returns a vector divided by a scalar
@@ -132 +132 @@
         xy<T> b=*this;
         return b/=u;
-      };
+      }
 
       ///Testing equality
       bool operator==(const xy<T> &u) const {
         return (x==u.x) && (y==u.y);
-      };
+      }
 
       ///Testing inequality
       bool operator!=(xy u) const {
         return  (x!=u.x) || (y!=u.y);
-      };
+      }
 
     };
@@ -152 +152 @@
   template<typename T> xy<T> operator*(const T &u,const xy<T> &x) {
     return x*u;
-  };
+  }
 
   ///Read a plainvector from a stream
@@ -227 +227 @@
       }
 
+      ///Makes the BoundingBox empty
+      void clear() {
+        _empty=1;
+      }
+
       ///Gives back the bottom left corner (if the bounding box is empty, then the return value is not defined) 
       xy<T> bottomLeft() const {
         return bottom_left;
-      };
+      }
 
       ///Gives back the top right corner (if the bounding box is empty, then the return value is not defined) 
       xy<T> topRight() const {
         return top_right;
-      };
+      }
 
       ///Gives back the bottom right corner (if the bounding box is empty, then the return value is not defined) 
       xy<T> bottomRight() const {
         return xy<T>(top_right.x,bottom_left.y);
-      };
+      }
 
       ///Gives back the top left corner (if the bounding box is empty, then the return value is not defined) 
       xy<T> topLeft() const {
         return xy<T>(bottom_left.x,top_right.y);
-      };
+      }
 
       ///Gives 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;
-      };
+      }
 
       ///Gives 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;
-      };
+      }
 
       ///Gives 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;
-      };
+      }
 
       ///Gives 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;
-      };
+      }
 
       ///Gives 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;
-      };
+      }
 
       ///Gives 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;
-      };
+      }
 
       ///Checks whether a point is inside a bounding box
@@ -300 +305 @@
         }
         return *this;
-      };
+      }
   
       ///Sums a bounding box and a point
@@ -306 +311 @@
         BoundingBox b = *this;
         return b += u;
-      };
+      }
 
       ///Increments a bounding box with an other bounding box
@@ -315 +320 @@
         }
         return *this;
-      };
+      }
   
       ///Sums two bounding boxes
@@ -321 +326 @@
         BoundingBox b = *this;
         return b += u;
-      };
+      }
 
     };//class Boundingbox