# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1240479875 -3600
# Node ID 0c8e5c688440b6b90b285cd9af3c22c699b34748
# Parent 85cb3aa71cced72f8915b8abf50f705037a76bb1
Fix usage of sqrt() (#268)
diff --git a/demo/graph_to_eps_demo.cc b/demo/graph_to_eps_demo.cc
a
|
b
|
|
182 | 182 | ListDigraph::NodeMap<int> hcolors(h); |
183 | 183 | ListDigraph::NodeMap<Point> hcoords(h); |
184 | 184 | |
185 | | int cols=int(sqrt(double(palette.size()))); |
| 185 | int cols=int(std::sqrt(double(palette.size()))); |
186 | 186 | for(int i=0;i<int(paletteW.size());i++) { |
187 | 187 | Node n=h.addNode(); |
188 | 188 | hcoords[n]=Point(1+i%cols,1+i/cols); |
diff --git a/lemon/network_simplex.h b/lemon/network_simplex.h
a
|
b
|
|
381 | 381 | const double BLOCK_SIZE_FACTOR = 2.0; |
382 | 382 | const int MIN_BLOCK_SIZE = 10; |
383 | 383 | |
384 | | _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)), |
| 384 | _block_size = std::max( int(BLOCK_SIZE_FACTOR * |
| 385 | std::sqrt(double(_arc_num))), |
385 | 386 | MIN_BLOCK_SIZE ); |
386 | 387 | } |
387 | 388 | |
… |
… |
|
457 | 458 | const double MINOR_LIMIT_FACTOR = 0.1; |
458 | 459 | const int MIN_MINOR_LIMIT = 3; |
459 | 460 | |
460 | | _list_length = std::max( int(LIST_LENGTH_FACTOR * sqrt(_arc_num)), |
| 461 | _list_length = std::max( int(LIST_LENGTH_FACTOR * |
| 462 | std::sqrt(double(_arc_num))), |
461 | 463 | MIN_LIST_LENGTH ); |
462 | 464 | _minor_limit = std::max( int(MINOR_LIMIT_FACTOR * _list_length), |
463 | 465 | MIN_MINOR_LIMIT ); |
… |
… |
|
577 | 579 | const double HEAD_LENGTH_FACTOR = 0.1; |
578 | 580 | const int MIN_HEAD_LENGTH = 3; |
579 | 581 | |
580 | | _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)), |
| 582 | _block_size = std::max( int(BLOCK_SIZE_FACTOR * |
| 583 | std::sqrt(double(_arc_num))), |
581 | 584 | MIN_BLOCK_SIZE ); |
582 | 585 | _head_length = std::max( int(HEAD_LENGTH_FACTOR * _block_size), |
583 | 586 | MIN_HEAD_LENGTH ); |
… |
… |
|
1225 | 1228 | } |
1226 | 1229 | |
1227 | 1230 | // Store the arcs in a mixed order |
1228 | | int k = std::max(int(sqrt(_arc_num)), 10); |
| 1231 | int k = std::max(int(std::sqrt(double(_arc_num))), 10); |
1229 | 1232 | int i = 0; |
1230 | 1233 | for (ArcIt e(_graph); e != INVALID; ++e) { |
1231 | 1234 | _arc_ref[i] = e; |
diff --git a/tools/lgf-gen.cc b/tools/lgf-gen.cc
a
|
b
|
|
65 | 65 | double totalLen(){ |
66 | 66 | double tlen=0; |
67 | 67 | for(EdgeIt e(g);e!=INVALID;++e) |
68 | | tlen+=sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare()); |
| 68 | tlen+=std::sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare()); |
69 | 69 | return tlen; |
70 | 70 | } |
71 | 71 | |
… |
… |
|
188 | 188 | (q.x * q.x + q.y * q.y) * (r.x * p.y - p.x * r.y) + |
189 | 189 | (r.x * r.x + r.y * r.y) * (p.x * q.y - q.x * p.y); |
190 | 190 | |
191 | | return d / (2 * a) + sqrt((d * d + e * e) / (4 * a * a) + f / a); |
| 191 | return d / (2 * a) + std::sqrt((d * d + e * e) / (4 * a * a) + f / a); |
192 | 192 | } |
193 | 193 | |
194 | 194 | inline bool circle_form(const Point& p, const Point& q, const Point& r) { |
… |
… |
|
206 | 206 | double a = q.x - p.x; |
207 | 207 | double b = (q.x - sx) * p.y - (p.x - sx) * q.y; |
208 | 208 | double d = (q.x - sx) * (p.x - sx) * (p - q).normSquare(); |
209 | | return (b - sqrt(d)) / a; |
| 209 | return (b - std::sqrt(d)) / a; |
210 | 210 | } |
211 | 211 | |
212 | 212 | struct YLess { |
… |
… |
|
813 | 813 | std::cout << "Number of arcs : " << countEdges(g) << std::endl; |
814 | 814 | double tlen=0; |
815 | 815 | for(EdgeIt e(g);e!=INVALID;++e) |
816 | | tlen+=sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare()); |
| 816 | tlen+=std::sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare()); |
817 | 817 | std::cout << "Total arc length : " << tlen << std::endl; |
818 | 818 | |
819 | 819 | if(ap["eps"]) |