lemon-0.x: comparison lemon/graph_to

equal deleted inserted replaced

-:639c436359ef
+:75c8e05899e0
 #include <ctime>
 #include <cmath>
 #include<lemon/bits/invalid.h>
-#include<lemon/xy.h>
+#include<lemon/dim2.h>
 #include<lemon/maps.h>
 #include<lemon/color.h>
 #include<lemon/bits/bezier.h>
 const Graph &g;
 std::ostream& os;
-typedef ConstMap<typename Graph::Node,xy<double> > CoordsMapType;
+typedef ConstMap<typename Graph::Node,dim2::Point<double> > CoordsMapType;
 CoordsMapType _coords;
 ConstMap<typename Graph::Node,double > _nodeSizes;
 ConstMap<typename Graph::Node,int > _nodeShapes;
 ConstMap<typename Graph::Node,Color > _nodeColors;
 ///will be explicitly deallocated by the destructor.
 ///By default it is <tt>std::cout</tt>
 DefaultGraphToEpsTraits(const G &_g,std::ostream& _os=std::cout,
 			  bool _pros=false) :
 g(_g), os(_os),
-_coords(xy<double>(1,1)), _nodeSizes(.01), _nodeShapes(0),
+_coords(dim2::Point<double>(1,1)), _nodeSizes(.01), _nodeShapes(0),
 _nodeColors(WHITE), _edgeColors(BLACK),
 _edgeWidths(1.0), _edgeWidthScale(0.003),
 _nodeScale(1.0), _xBorder(10), _yBorder(10), _scale(1.0),
 _nodeBorderQuotient(.1),
 _drawArrows(false), _arrowLength(1), _arrowWidth(0.3),
 	    g.target(e)==g.target(f)) ||
 (g.source(e)==g.target(f)&&
 g.target(e)==g.source(f));
 }
 template<class TT>
-static std::string psOut(const xy<TT> &p)
+static std::string psOut(const dim2::Point<TT> &p)
 {
 std::ostringstream os;
 os << p.x << ' ' << p.y;
 return os.str();
 }
 CoordsTraits(const T &t,const X &x) : T(t), _coords(x) {}
 };
 ///Sets the map of the node coordinates
 ///Sets the map of the node coordinates.
-///\param x must be a node map with xy<double> or \ref xy "xy<int>" values.
+///\param x must be a node map with dim2::Point<double> or
+///\ref dim2::Point "dim2::Point<int>" values.
 template<class X> GraphToEps<CoordsTraits<X> > coords(const X &x) {
 dontPrint=true;
 return GraphToEps<CoordsTraits<X> >(CoordsTraits<X>(*this,x));
 }
 template<class X> struct NodeSizesTraits : public T {
 ///the EPS file.
 ///\todo Multiline copyright notice could be supported.
 GraphToEps<T> &copyright(const std::string &t) {_copyright=t;return *this;}
 protected:
-bool isInsideNode(xy<double> p, double r,int t)
+bool isInsideNode(dim2::Point<double> p, double r,int t)
 {
 switch(t) {
 case CIRCLE:
 case MALE:
 case FEMALE:
 }
 }
 double diag_len = 1;
 if(!(_absoluteNodeSizes&&_absoluteEdgeWidths)) {
-BoundingBox<double> bb;
+dim2::BoundingBox<double> bb;
 for(NodeIt n(g);n!=INVALID;++n) bb.add(mycoords[n]);
 if (bb.empty()) {
-	bb = BoundingBox<double>(xy<double>(0,0));
+	bb = dim2::BoundingBox<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(!_absoluteEdgeWidths) _edgeWidthScale*=diag_len;
 }
-BoundingBox<double> bb;
+dim2::BoundingBox<double> bb;
 for(NodeIt n(g);n!=INVALID;++n) {
 double ns=_nodeSizes[n]*_nodeScale;
-xy<double> p(ns,ns);
+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(xy<double>(1.5*ns,1.5*std::sqrt(3.0)*ns)+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(xy<double>(-ns,-3.01*ns)+mycoords[n]);
+	bb.add(dim2::Point<double>(-ns,-3.01*ns)+mycoords[n]);
 	break;
 }
 }
 if (bb.empty()) {
-bb = BoundingBox<double>(xy<double>(0,0));
+bb = dim2::BoundingBox<double>(dim2::Point<double>(0,0));
 }
 if(_scaleToA4)
 os <<"%%BoundingBox: 0 0 596 842\n%%DocumentPaperSizes: a4\n";
 else {
 if(_scaleToA4)
 if(bb.height()>bb.width()) {
 	double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.height(),
 		  (A4WIDTH-2*A4BORDER)/bb.width());
 	os << ((A4WIDTH -2*A4BORDER)-sc*bb.width())/2 + A4BORDER << ' '
-	   << ((A4HEIGHT-2*A4BORDER)-sc*bb.height())/2 + A4BORDER << " translate\n"
+	   << ((A4HEIGHT-2*A4BORDER)-sc*bb.height())/2 + A4BORDER
+	   << " translate\n"
 	   << sc << " dup scale\n"
 	   << -bb.left() << ' ' << -bb.bottom() << " translate\n";
 }
 else {
 	//\todo Verify centering
 	double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(),
 		  (A4WIDTH-2*A4BORDER)/bb.height());
 	os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' '
-	   << ((A4HEIGHT-2*A4BORDER)-sc*bb.width())/2 + A4BORDER  << " translate\n"
+	   << ((A4HEIGHT-2*A4BORDER)-sc*bb.width())/2 + A4BORDER
+	   << " translate\n"
 	   << sc << " dup scale\n90 rotate\n"
 	   << -bb.left() << ' ' << -bb.top() << " translate\n";
 	}
 else if(_scale!=1.0) os << _scale << " dup scale\n";
 	  double sw=0;
 	  for(typename std::vector<Edge>::iterator e=i;e!=j;++e)
 	    sw+=_edgeWidths[*e]*_edgeWidthScale+_parEdgeDist;
 	  sw-=_parEdgeDist;
 	  sw/=-2.0;
-	  xy<double> dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]);
+	  dim2::Point<double>
+	    dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]);
 	  double l=std::sqrt(dvec.normSquare());
 	  ///\todo better 'epsilon' would be nice here.
-	  xy<double> d(dvec/std::max(l,EPSILON));
+	  dim2::Point<double> d(dvec/std::max(l,EPSILON));
-	  xy<double> m;
+	  dim2::Point<double> m;
-// 	  m=xy<double>(mycoords[g.target(*i)]+mycoords[g.source(*i)])/2.0;
+// 	  m=dim2::Point<double>(mycoords[g.target(*i)]+mycoords[g.source(*i)])/2.0;
-//  	  m=xy<double>(mycoords[g.source(*i)])+
+//  	  m=dim2::Point<double>(mycoords[g.source(*i)])+
 // 	    dvec*(double(_nodeSizes[g.source(*i)])/
 // 	       (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
-	  m=xy<double>(mycoords[g.source(*i)])+
+	  m=dim2::Point<double>(mycoords[g.source(*i)])+
 	    d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;
 	  for(typename std::vector<Edge>::iterator e=i;e!=j;++e) {
 	    sw+=_edgeWidths[*e]*_edgeWidthScale/2.0;
-	    xy<double> mm=m+rot90(d)*sw/.75;
+	    dim2::Point<double> mm=m+rot90(d)*sw/.75;
 	    if(_drawArrows) {
 	      int node_shape;
-	      xy<double> s=mycoords[g.source(*e)];
+	      dim2::Point<double> s=mycoords[g.source(*e)];
-	      xy<double> t=mycoords[g.target(*e)];
+	      dim2::Point<double> t=mycoords[g.target(*e)];
 	      double rn=_nodeSizes[g.target(*e)]*_nodeScale;
 	      node_shape=_nodeShapes[g.target(*e)];
-	      Bezier3 bez(s,mm,mm,t);
+	      dim2::Bezier3 bez(s,mm,mm,t);
 	      double t1=0,t2=1;
 	      for(int i=0;i<INTERPOL_PREC;++i)
 		if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t2=(t1+t2)/2;
 		else t1=(t1+t2)/2;
-	      xy<double> apoint=bez((t1+t2)/2);
+	      dim2::Point<double> apoint=bez((t1+t2)/2);
 	      rn = _arrowLength+_edgeWidths[*e]*_edgeWidthScale;
 	      rn*=rn;
 	      t2=(t1+t2)/2;t1=0;
 	      for(int i=0;i<INTERPOL_PREC;++i)
 		if((bez((t1+t2)/2)-apoint).normSquare()>rn) t1=(t1+t2)/2;
 		else t2=(t1+t2)/2;
-	      xy<double> linend=bez((t1+t2)/2);
+	      dim2::Point<double> linend=bez((t1+t2)/2);
 	      bez=bez.before((t1+t2)/2);
 // 	      rn=_nodeSizes[g.source(*e)]*_nodeScale;
 // 	      node_shape=_nodeShapes[g.source(*e)];
 // 	      t1=0;t2=1;
 // 	      for(int i=0;i<INTERPOL_PREC;++i)
 		 << _edgeColors[*e].blue() << " setrgbcolor newpath\n"
 		 << bez.p1.x << ' ' <<  bez.p1.y << " moveto\n"
 		 << bez.p2.x << ' ' << bez.p2.y << ' '
 		 << bez.p3.x << ' ' << bez.p3.y << ' '
 		 << bez.p4.x << ' ' << bez.p4.y << " curveto stroke\n";
-	      xy<double> dd(rot90(linend-apoint));
+	      dim2::Point<double> dd(rot90(linend-apoint));
 	      dd*=(.5*_edgeWidths[*e]*_edgeWidthScale+_arrowWidth)/
 		std::sqrt(dd.normSquare());
 	      os << "newpath " << psOut(apoint) << " moveto "
 		 << psOut(linend+dd) << " lineto "
 		 << psOut(linend-dd) << " lineto closepath fill\n";
 }
 else for(EdgeIt e(g);e!=INVALID;++e)
 	if((!_undirected||g.source(e)<g.target(e))&&_edgeWidths[e]>0
 	   &&g.source(e)!=g.target(e))
 	  if(_drawArrows) {
-	    xy<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]);
+	    dim2::Point<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]);
 	    double rn=_nodeSizes[g.target(e)]*_nodeScale;
 	    int node_shape=_nodeShapes[g.target(e)];
 	    double t1=0,t2=1;
 	    for(int i=0;i<INTERPOL_PREC;++i)
 	      if(isInsideNode((-(t1+t2)/2)*d,rn,node_shape)) t1=(t1+t2)/2;

changeset 2294	abf880d78522
parent 2178	0d7c0f96a5ee
child 2379	248152674a9e