LEMON/LEMON-official Changeset - r253:dbe309b5e855

Repositories » LEMON » LEMON-official

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

Changeset - r253:dbe309b5e855

« 250:d0aae1

254:43500a »

r253:dbe309b5e855

Sat, 30 Aug 2008 22:19:43

[Not Reviewed]

0 comments (0 inline)

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

Rename BoundingBox to Box (ticket #126)

0 3 0

default

3 files changed with 71 insertions and 72 deletions:

lemon/dim2.h

lemon/graph_to_eps.h

test/dim_test.cc

↑ Collapse diff ↑

lemon/dim2.h

Show inline comments

@@ -7,65 +7,64 @@
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_DIM2_H
 		#define LEMON_DIM2_H
 		#include <iostream>
 		///\ingroup misc
 		///\file
 		///\brief A simple two dimensional vector and a bounding box implementation
 		///
 		/// The class \ref lemon::dim2::Point "dim2::Point" implements
 		/// a two dimensional vector with the usual operations.
 		///
 		/// The class \ref lemon::dim2::BoundingBox "dim2::BoundingBox"
 		/// can be used to determine
 		/// The class \ref lemon::dim2::Box "dim2::Box" can be used to determine
 		/// the rectangular bounding box of a set of
 		/// \ref lemon::dim2::Point "dim2::Point"'s.
 		namespace lemon {
 		  ///Tools for handling two dimensional coordinates
 		  ///This namespace is a storage of several
 		  ///tools for handling two dimensional coordinates
 		  namespace dim2 {
 		  /// \addtogroup misc
 		  /// @{
-		  /// A simple two dimensional vector (plain vector) implementation
+		  /// Two dimensional vector (plain vector)
 		  /// A simple two dimensional vector (plain vector) implementation
 		  /// with the usual vector operations.
 		  template<typename T>
 		    class Point {
 		    public:
 		      typedef T Value;
 		      ///First coordinate
 		      T x;
 		      ///Second coordinate
 		      T y;
 		      ///Default constructor
 		      Point() {}
 		      ///Construct an instance from coordinates
 		      Point(T a, T b) : x(a), y(b) { }
 		      ///Returns the dimension of the vector (i.e. returns 2).
 		      ///The dimension of the vector.
@@ -239,357 +238,357 @@
 		  ///Rotate by 180 degrees
 		  ///Returns the parameter rotated by 180 degrees.
 		  ///\relates Point
 		  ///
 		  template<typename T>
 		  inline Point<T> rot180(const Point<T> &z)
+		  {
 		    return Point<T>(-z.x,-z.y);
+		  }
 		  ///Rotate by 270 degrees
 		  ///Returns the parameter rotated by 90 degrees in negative direction.
 		  ///\relates Point
 		  ///
 		  template<typename T>
 		  inline Point<T> rot270(const Point<T> &z)
+		  {
 		    return Point<T>(z.y,-z.x);
+		  }
-		    /// A class to calculate or store the bounding box of plain vectors.
+		  /// Bounding box of plain vectors (\ref Point points).
 		    /// A class to calculate or store the bounding box of plain vectors.
 		    ///
 		    template<typename T>
 		    class BoundingBox {
 		  /// A class to calculate or store the bounding box of plain vectors
 		  /// (\ref Point points).
 		  template<typename T>
 		  class Box {
 		      Point<T> _bottom_left, _top_right;
 		      bool _empty;
 		    public:
 		      ///Default constructor: creates an empty bounding box
 		      BoundingBox() { _empty = true; }
 		      ///Default constructor: creates an empty box
 		      Box() { _empty = true; }
 		      ///Construct an instance from one point
 		      BoundingBox(Point<T> a) {
 		      ///Construct a box from one point
 		      Box(Point<T> a) {
 		        _bottom_left = _top_right = a;
 		        _empty = false;
+		      }
-		      ///Construct an instance from two points
+		      ///Construct a box from two points
-		      ///Construct an instance from two points.
+		      ///Construct a box 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)
+		      Box(Point<T> a,Point<T> b)
+		      {
 		        _bottom_left = a;
 		        _top_right = b;
 		        _empty = false;
+		      }
-		      ///Construct an instance from four numbers
+		      ///Construct a box from four numbers
-		      ///Construct an instance from four numbers.
+		      ///Construct a box 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)
+		      Box(T l,T b,T r,T t)
+		      {
 		        _bottom_left=Point<T>(l,b);
 		        _top_right=Point<T>(r,t);
 		        _empty = false;
+		      }
-		      ///Return \c true if the bounding box is empty.
 		      ///Return \c true if the box is empty.
-		      ///Return \c true if the bounding box is empty (i.e. return \c false
 		      ///Return \c true if the 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.
 		      ///The coordinates of an empty box are not defined.
 		      bool empty() const {
 		        return _empty;
+		      }
-		      ///Make the BoundingBox empty
+		      ///Make the box empty
 		      void clear() {
 		        _empty = true;
+		      }
 		      ///Give back the bottom left corner of the box
 		      ///Give back the bottom left corner of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      Point<T> bottomLeft() const {
 		        return _bottom_left;
+		      }
 		      ///Set the bottom left corner of the box
 		      ///Set the bottom left corner of the box.
 		      ///\pre The box must not be empty.
 		      void bottomLeft(Point<T> p) {
 		        _bottom_left = p;
+		      }
 		      ///Give back the top right corner of the box
 		      ///Give back the top right corner of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      Point<T> topRight() const {
 		        return _top_right;
+		      }
 		      ///Set the top right corner of the box
 		      ///Set the top right corner of the box.
 		      ///\pre The box must not be empty.
 		      void topRight(Point<T> p) {
 		        _top_right = p;
+		      }
 		      ///Give back the bottom right corner of the box
 		      ///Give back the bottom right corner of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      Point<T> bottomRight() const {
 		        return Point<T>(_top_right.x,_bottom_left.y);
+		      }
 		      ///Set the bottom right corner of the box
 		      ///Set the bottom right corner of the box.
 		      ///\pre The box must not be empty.
 		      void bottomRight(Point<T> p) {
 		        _top_right.x = p.x;
 		        _bottom_left.y = p.y;
+		      }
 		      ///Give back the top left corner of the box
 		      ///Give back the top left corner of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      Point<T> topLeft() const {
 		        return Point<T>(_bottom_left.x,_top_right.y);
+		      }
 		      ///Set the top left corner of the box
 		      ///Set the top left corner of the box.
 		      ///\pre The box must not be empty.
 		      void topLeft(Point<T> p) {
 		        _top_right.y = p.y;
 		        _bottom_left.x = p.x;
+		      }
 		      ///Give back the bottom of the box
 		      ///Give back the bottom of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      T bottom() const {
 		        return _bottom_left.y;
+		      }
 		      ///Set the bottom of the box
 		      ///Set the bottom of the box.
 		      ///\pre The box must not be empty.
 		      void bottom(T t) {
 		        _bottom_left.y = t;
+		      }
 		      ///Give back the top of the box
 		      ///Give back the top of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      T top() const {
 		        return _top_right.y;
+		      }
 		      ///Set the top of the box
 		      ///Set the top of the box.
 		      ///\pre The box must not be empty.
 		      void top(T t) {
 		        _top_right.y = t;
+		      }
 		      ///Give back the left side of the box
 		      ///Give back the left side of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      T left() const {
 		        return _bottom_left.x;
+		      }
 		      ///Set the left side of the box
 		      ///Set the left side of the box.
 		      ///\pre The box must not be empty.
 		      void left(T t) {
 		        _bottom_left.x = t;
+		      }
 		      /// Give back the right side of the box
 		      /// Give back the right side of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      T right() const {
 		        return _top_right.x;
+		      }
 		      ///Set the right side of the box
 		      ///Set the right side of the box.
 		      ///\pre The box must not be empty.
 		      void right(T t) {
 		        _top_right.x = t;
+		      }
 		      ///Give back the height of the box
 		      ///Give back the height of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the box is empty, then the return value is not defined.
 		      T height() const {
 		        return _top_right.y-_bottom_left.y;
+		      }
 		      ///Give back the width of the box
 		      ///Give back the width of the box.
-		      ///If the bounding box is empty, then the return value is not defined.
 		      ///If the 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
+		      ///Checks whether a point is inside the box
 		      bool inside(const Point<T>& u) const {
 		        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 );
+		        }
+		      }
-		      ///Increments a bounding box with a point
+		      ///Increments the box with a point
-		      ///Increments a bounding box with a point.
+		      ///Increments the box with a point.
 		      ///
-		      BoundingBox& add(const Point<T>& u){
+		      Box& add(const Point<T>& 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;
+		        }
 		        return *this;
+		      }
-		      ///Increments a bounding box to contain another bounding box
+		      ///Increments the box to contain another box
-		      ///Increments a bounding box to contain another bounding box.
+		      ///Increments the box to contain another box.
 		      ///
-		      BoundingBox& add(const BoundingBox &u){
+		      Box& add(const Box &u){
 		        if ( !u.empty() ){
 		          add(u._bottom_left);
 		          add(u._top_right);
+		        }
 		        return *this;
+		      }
-		      ///Intersection of two bounding boxes
 		      ///Intersection of two boxes
-		      ///Intersection of two bounding boxes.
 		      ///Intersection of two boxes.
 		      ///
 		      BoundingBox operator&(const BoundingBox& u) const {
 		        BoundingBox b;
 		      Box operator&(const Box& u) const {
 		        Box b;
 		        if (_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;
+		        }
 		        return b;
+		      }
-		    };//class Boundingbox
+		  };//class Box
-		  ///Read a bounding box from a stream
 		  ///Read a box from a stream
 		  ///Read a bounding box from a stream.
 		  ///\relates BoundingBox
 		  ///Read a box from a stream.
 		  ///\relates Box
 		  template<typename T>
-		  inline std::istream& operator>>(std::istream &is, BoundingBox<T>& b) {
+		  inline std::istream& operator>>(std::istream &is, Box<T>& b) {
 		    char c;
 		    Point<T> p;
 		    if (is >> c) {
 		      if (c != '(') is.putback(c);
 		    } else {
 		      is.clear();
+		    }
 		    if (!(is >> p)) return is;
 		    b.bottomLeft(p);
 		    if (is >> c) {
 		      if (c != ',') is.putback(c);
 		    } else {
 		      is.clear();
+		    }
 		    if (!(is >> p)) return is;
 		    b.topRight(p);
 		    if (is >> c) {
 		      if (c != ')') is.putback(c);
 		    } else {
 		      is.clear();
+		    }
 		    return is;
+		  }
-		  ///Write a bounding box to a stream
 		  ///Write a box to a stream
 		  ///Write a bounding box to a stream.
 		  ///\relates BoundingBox
 		  ///Write a box to a stream.
 		  ///\relates Box
 		  template<typename T>
-		  inline std::ostream& operator<<(std::ostream &os, const BoundingBox<T>& b)
+		  inline std::ostream& operator<<(std::ostream &os, const Box<T>& b)
+		  {
 		    os << "(" << b.bottomLeft() << "," << b.topRight() << ")";
 		    return os;
+		  }
 		  ///Map of x-coordinates of a \ref Point "Point"-map
 		  ///\ingroup maps
 		  ///Map of x-coordinates of a \ref Point "Point"-map.
 		  ///
 		  template<class M>
 		  class XMap
+		  {
 		    M& _map;
 		  public:
 		    typedef typename M::Value::Value Value;
 		    typedef typename M::Key Key;
 		    ///\e
 		    XMap(M& map) : _map(map) {}
 		    Value operator[](Key k) const {return _map[k].x;}
 		    void set(Key k,Value v) {_map.set(k,typename M::Value(v,_map[k].y));}
 		  };

lemon/graph_to_eps.h

Show inline comments

@@ -704,82 +704,82 @@
+		    }
 		    if (_autoArcWidthScale) {
 		      double max_w=0;
 		      for(ArcIt e(g);e!=INVALID;++e)
 		        max_w=std::max(double(_arcWidths[e]),max_w);
 		      //\todo better 'epsilon' would be nice here.
 		      if(max_w>EPSILON) {
 		        _arcWidthScale/=max_w;
+		      }
+		    }
 		    if (_autoNodeScale) {
 		      double max_s=0;
 		      for(NodeIt n(g);n!=INVALID;++n)
 		        max_s=std::max(double(_nodeSizes[n]),max_s);
 		      //\todo better 'epsilon' would be nice here.
 		      if(max_s>EPSILON) {
 		        _nodeScale/=max_s;
+		      }
+		    }
 		    double diag_len = 1;
 		    if(!(_absoluteNodeSizes&&_absoluteArcWidths)) {
-		      dim2::BoundingBox<double> bb;
+		      dim2::Box<double> bb;
 		      for(NodeIt n(g);n!=INVALID;++n) bb.add(mycoords[n]);
 		      if (bb.empty()) {
-		        bb = dim2::BoundingBox<double>(dim2::Point<double>(0,0));
+		        bb = dim2::Box<double>(dim2::Point<double>(0,0));
+		      }
 		      diag_len = std::sqrt((bb.bottomLeft()-bb.topRight()).normSquare());
 		      if(diag_len<EPSILON) diag_len = 1;
 		      if(!_absoluteNodeSizes) _nodeScale*=diag_len;
 		      if(!_absoluteArcWidths) _arcWidthScale*=diag_len;
+		    }
-		    dim2::BoundingBox<double> bb;
+		    dim2::Box<double> bb;
 		    for(NodeIt n(g);n!=INVALID;++n) {
 		      double ns=_nodeSizes[n]*_nodeScale;
 		      dim2::Point<double> p(ns,ns);
 		      switch(_nodeShapes[n]) {
 		      case CIRCLE:
 		      case SQUARE:
 		      case DIAMOND:
 		        bb.add(p+mycoords[n]);
 		        bb.add(-p+mycoords[n]);
 		        break;
 		      case MALE:
 		        bb.add(-p+mycoords[n]);
 		        bb.add(dim2::Point<double>(1.5*ns,1.5*std::sqrt(3.0)*ns)+mycoords[n]);
 		        break;
 		      case FEMALE:
 		        bb.add(p+mycoords[n]);
 		        bb.add(dim2::Point<double>(-ns,-3.01*ns)+mycoords[n]);
 		        break;
+		      }
+		    }
 		    if (bb.empty()) {
-		      bb = dim2::BoundingBox<double>(dim2::Point<double>(0,0));
+		      bb = dim2::Box<double>(dim2::Point<double>(0,0));
+		    }
 		    if(_scaleToA4)
 		      os <<"%%BoundingBox: 0 0 596 842\n%%DocumentPaperSizes: a4\n";
 		    else {
 		      if(_preScale) {
 		        //Rescale so that BoundingBox won't be neither to big nor too small.
 		        while(bb.height()*_scale>1000||bb.width()*_scale>1000) _scale/=10;
 		        while(bb.height()*_scale<100||bb.width()*_scale<100) _scale*=10;
+		      }
 		      os << "%%BoundingBox: "
 		         << int(floor(bb.left()   * _scale - _xBorder)) << ' '
 		         << int(floor(bb.bottom() * _scale - _yBorder)) << ' '
 		         << int(ceil(bb.right()  * _scale + _xBorder)) << ' '
 		         << int(ceil(bb.top()    * _scale + _yBorder)) << '\n';
+		    }
 		    os << "%%EndComments\n";
 		    //x1 y1 x2 y2 x3 y3 cr cg cb w
 		    os << "/lb { setlinewidth setrgbcolor newpath moveto\n"
 		       << "      4 2 roll 1 index 1 index curveto stroke } bind def\n";
 		    os << "/l { setlinewidth setrgbcolor newpath moveto lineto stroke }"

test/dim_test.cc

Show inline comments

@@ -29,59 +29,59 @@
 		  Point p;
 		  check(p.size()==2, "Wrong dim2::Point initialization.");
 		  Point a(1,2);
 		  Point b(3,4);
 		  check(a[0]==1 && a[1]==2, "Wrong dim2::Point initialization.");
 		  p = a+b;
 		  check(p.x==4 && p.y==6, "Wrong dim2::Point addition.");
 		  p = a-b;
 		  check(p.x==-2 && p.y==-2, "Wrong dim2::Point subtraction.");
 		  check(a.normSquare()==5,"Wrong dim2::Point norm calculation.");
 		  check(a*b==11, "Wrong dim2::Point scalar product.");
 		  int l=2;
 		  p = a*l;
 		  check(p.x==2 && p.y==4, "Wrong dim2::Point multiplication by a scalar.");
 		  p = b/l;
 		  check(p.x==1 && p.y==2, "Wrong dim2::Point division by a scalar.");
 		  typedef dim2::BoundingBox<int> BB;
 		  BB box1;
-		  check(box1.empty(), "Wrong empty() in dim2::BoundingBox.");
+		  typedef dim2::Box<int> Box;
 		  Box box1;
 		  check(box1.empty(), "Wrong empty() in dim2::Box.");
 		  box1.add(a);
-		  check(!box1.empty(), "Wrong empty() in dim2::BoundingBox.");
+		  check(!box1.empty(), "Wrong empty() in dim2::Box.");
 		  box1.add(b);
 		  check(box1.left()==1 && box1.bottom()==2 &&
 		        box1.right()==3 && box1.top()==4,
-		        "Wrong addition of points to dim2::BoundingBox.");
+		        "Wrong addition of points to dim2::Box.");
 		  check(box1.inside(Point(2,3)), "Wrong inside() in dim2::BoundingBox.");
 		  check(box1.inside(Point(1,3)), "Wrong inside() in dim2::BoundingBox.");
-		  check(!box1.inside(Point(0,3)), "Wrong inside() in dim2::BoundingBox.");
+		  check(box1.inside(Point(2,3)), "Wrong inside() in dim2::Box.");
 		  check(box1.inside(Point(1,3)), "Wrong inside() in dim2::Box.");
 		  check(!box1.inside(Point(0,3)), "Wrong inside() in dim2::Box.");
 		  BB box2(Point(2,2));
 		  check(!box2.empty(), "Wrong empty() in dim2::BoundingBox.");
+		  Box box2(Point(2,2));
 		  check(!box2.empty(), "Wrong empty() in dim2::Box.");
 		  box2.bottomLeft(Point(2,0));
 		  box2.topRight(Point(5,3));
-		  BB box3 = box1 & box2;
+		  Box box3 = box1 & box2;
 		  check(!box3.empty() &&
-		        box3.left()==2 && box3.bottom()==2 &&
 		        box3.left()==2 && box3.bottom()==2 &&
 		        box3.right()==3 && box3.top()==3,
 		        "Wrong intersection of two dim2::BoundingBox objects.");
 		        "Wrong intersection of two dim2::Box objects.");
 		  box1.add(box2);
 		  check(!box1.empty() &&
 		        box1.left()==1 && box1.bottom()==0 &&
 		        box1.right()==5 && box1.top()==4,
-		        "Wrong addition of two dim2::BoundingBox objects.");
+		        "Wrong addition of two dim2::Box objects.");
 		  return 0;
+		}

0 comments (0 inline)

RhodeCode

Login to your account