LEMON/LEMON-official Changeset - r15:062f361aa520

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r15:062f361aa520

« 14:8685ef

16:22696f »

r15:062f361aa520

Thu, 03 Jan 2008 01:08:23

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Improved and fixed dim2.h. Improved and fixed documentation. Bug fix in BoundingBox<>::operator&. Removed \author tags.

0 1 0

default

1 file changed with 72 insertions and 52 deletions:

lemon/dim2.h

↑ Collapse diff ↑

lemon/dim2.h

Show inline comments

@@ -36,5 +36,2 @@
 		/// \ref lemon::dim2::Point "dim2::Point"'s.
 		///
 		///\author Attila Bernath
@@ -64,5 +61,5 @@
-		      ///First co-ordinate
+		      ///First coordinate
 		      T x;
-		      ///Second co-ordinate
+		      ///Second coordinate
 		      T y;
@@ -77,4 +74,4 @@
 		      ///This class give back always 2.
 		      ///
 		      ///The dimension of the vector.
 		      ///This function always returns 2.
 		      int size() const { return 2; }
@@ -140,3 +137,3 @@
-		      ///Return the neg of the vectors
+		      ///Return the negative of the vector
 		      Point<T> operator-() const {
@@ -177,5 +174,5 @@
-		  ///Return an Point
+		  ///Return a Point
-		  ///Return an Point
+		  ///Return a Point.
 		  ///\relates Point
@@ -188,3 +185,3 @@
 		  ///Return a vector multiplied by a scalar
+		  ///Return a vector multiplied by a scalar.
 		  ///\relates Point
@@ -196,3 +193,3 @@
 		  ///Read a plainvector from a stream
+		  ///Read a plainvector from a stream.
 		  ///\relates Point
@@ -224,3 +221,3 @@
 		  ///Write a plainvector to a stream
+		  ///Write a plainvector to a stream.
 		  ///\relates Point
@@ -236,3 +233,3 @@
-		  ///Returns its parameter rotated by 90 degrees in positive direction.
+		  ///Returns the parameter rotated by 90 degrees in positive direction.
 		  ///\relates Point
@@ -247,3 +244,3 @@
-		  ///Returns its parameter rotated by 180 degrees.
+		  ///Returns the parameter rotated by 180 degrees.
 		  ///\relates Point
@@ -258,3 +255,3 @@
-		  ///Returns its parameter rotated by 90 degrees in negative direction.
+		  ///Returns the parameter rotated by 90 degrees in negative direction.
 		  ///\relates Point
@@ -273,3 +270,2 @@
 		  ///
 		  ///\author Attila Bernath
 		    template<typename T>
@@ -288,5 +284,7 @@
 		      ///Construct an instance from two points
 		      ///\warning The coordinates of the bottom-left corner must be no more
-		      ///than those of the top-right one
+		      ///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
 		      ///than those of the top right one.
 		      BoundingBox(Point<T> a,Point<T> b)
@@ -300,5 +298,9 @@
 		      ///Construct an instance from four numbers
 		      ///\warning The coordinates of the bottom-left corner must be no more
-		      ///than those of the top-right one
+		      ///Construct an instance from four numbers.
 		      ///\param l The left side of the box.
 		      ///\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.
 		      BoundingBox(T l,T b,T r,T t)
@@ -310,3 +312,8 @@
-		      ///Were any points added?
+		      ///Return \c true if the bounding box is empty.
 		      ///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 coordinates of an empty bounding box are not defined.
 		      bool empty() const {
@@ -331,3 +338,3 @@
 		      ///Set the bottom left corner.
-		      ///It should only bee used for non-empty box.
+		      ///It should only be used for non-empty box.
 		      void bottomLeft(Point<T> p) {
@@ -347,3 +354,3 @@
 		      ///Set the top right corner.
-		      ///It should only bee used for non-empty box.
+		      ///It should only be used for non-empty box.
 		      void topRight(Point<T> p) {
@@ -363,3 +370,3 @@
 		      ///Set the bottom right corner.
-		      ///It should only bee used for non-empty box.
+		      ///It should only be used for non-empty box.
 		      void bottomRight(Point<T> p) {
@@ -380,3 +387,3 @@
 		      ///Set the top left corner.
-		      ///It should only bee used for non-empty box.
+		      ///It should only be used for non-empty box.
 		      void topLeft(Point<T> p) {
@@ -397,3 +404,3 @@
 		      ///Set the bottom of the box.
-		      ///It should only bee used for non-empty box.
+		      ///It should only be used for non-empty box.
 		      void bottom(T t) {
@@ -413,3 +420,3 @@
 		      ///Set the top of the box.
-		      ///It should only bee used for non-empty box.
+		      ///It should only be used for non-empty box.
 		      void top(T t) {
@@ -429,3 +436,3 @@
 		      ///Set the left side of the box.
-		      ///It should only bee used for non-empty box
+		      ///It should only be used for non-empty box.
 		      void left(T t) {
@@ -445,3 +452,3 @@
 		      ///Set the right side of the box.
-		      ///It should only bee used for non-empty box
+		      ///It should only be used for non-empty box.
 		      void right(T t) {
@@ -467,3 +474,3 @@
 		      ///Checks whether a point is inside a bounding box
 		      bool inside(const Point<T>& u){
+		      bool inside(const Point<T>& u) const {
 		        if (_empty)
@@ -477,2 +484,5 @@
 		      ///Increments a bounding box with a point
 		      ///Increments a bounding box with a point.
 		      ///
 		      BoundingBox& add(const Point<T>& u){
@@ -491,3 +501,6 @@
 		      ///Increments a bounding to contain another bounding box
+		      ///Increments a bounding box to contain another bounding box
 		      ///Increments a bounding box to contain another bounding box.
 		      ///
 		      BoundingBox& add(const BoundingBox &u){
@@ -501,10 +514,17 @@
 		      ///Intersection of two bounding boxes
-		      BoundingBox operator &(const BoundingBox& u){
 		      ///Intersection of two bounding boxes.
 		      ///
 		      BoundingBox operator&(const BoundingBox& u) const {
 		        BoundingBox b;
 			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 = this->_empty || u._empty ||
 			  b.bottom_left.x>top_right.x && b.bottom_left.y>top_right.y;
 		        if (this->_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;
+			}
 		        return b;
@@ -515,6 +535,6 @@
-		  ///Map of x-coordinates of a dim2::Point<>-map
+		  ///Map of x-coordinates of a \ref Point "Point"-map
 		  ///\ingroup maps
-		  ///Map of x-coordinates of a dim2::Point<>-map
+		  ///Map of x-coordinates of a \ref Point "Point"-map.
 		  ///
@@ -572,3 +592,3 @@
-		  ///This function just returns an \ref ConstXMap class.
+		  ///This function just returns a \ref ConstXMap class.
 		  ///
@@ -582,6 +602,6 @@
-		  ///Map of y-coordinates of a dim2::Point<>-map
+		  ///Map of y-coordinates of a \ref Point "Point"-map
 		  ///\ingroup maps
-		  ///Map of y-coordinates of a dim2::Point<>-map
+		  ///Map of y-coordinates of a \ref Point "Point"-map.
 		  ///
@@ -601,5 +621,5 @@
-		  ///Returns an \ref YMap class
+		  ///Returns a \ref YMap class
-		  ///This function just returns an \ref YMap class.
+		  ///This function just returns a \ref YMap class.
 		  ///
@@ -639,3 +659,3 @@
-		  ///This function just returns an \ref ConstYMap class.
+		  ///This function just returns a \ref ConstYMap class.
 		  ///
@@ -651,6 +671,6 @@
 		    ///\brief Map of the \ref Point::normSquare() "normSquare()"
-		    ///of an \ref Point "Point"-map
+		    ///of a \ref Point "Point"-map
 		    ///
 		    ///Map of the \ref Point::normSquare() "normSquare()"
-		    ///of an \ref Point "Point"-map
+		    ///of a \ref Point "Point"-map.
 		    ///\ingroup maps
@@ -672,3 +692,3 @@
-		  ///This function just returns an \ref NormSquareMap class.
+		  ///This function just returns a \ref NormSquareMap class.
 		  ///

0 comments (0 inline)

RhodeCode

Login to your account