LEMON/LEMON-main Changeset - r612:0c8e5c688440

Repositories » LEMON » LEMON-main

Changeset - r612:0c8e5c688440

« 611:85cb3a

616:f2d6d3 »

r612:0c8e5c688440

Thu, 23 Apr 2009 11:44:35

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Fix usage of sqrt() (#268)

0 3 0

default

3 files changed with 12 insertions and 9 deletions:

demo/graph_to_eps_demo.cc

lemon/network_simplex.h

tools/lgf-gen.cc

↑ Collapse diff ↑

demo/graph_to_eps_demo.cc

Show inline comments

@@ -184,3 +184,3 @@
 		  int cols=int(sqrt(double(palette.size())));
+		  int cols=int(std::sqrt(double(palette.size())));
 		  for(int i=0;i<int(paletteW.size());i++) {

lemon/network_simplex.h

Show inline comments

@@ -383,3 +383,4 @@
-		        _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)),
 		        _block_size = std::max( int(BLOCK_SIZE_FACTOR *
 		                                    std::sqrt(double(_arc_num))),
 		                                MIN_BLOCK_SIZE );
@@ -459,3 +460,4 @@
-		        _list_length = std::max( int(LIST_LENGTH_FACTOR * sqrt(_arc_num)),
 		        _list_length = std::max( int(LIST_LENGTH_FACTOR *
 		                                     std::sqrt(double(_arc_num))),
 		                                 MIN_LIST_LENGTH );
@@ -579,3 +581,4 @@
-		        _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)),
 		        _block_size = std::max( int(BLOCK_SIZE_FACTOR *
 		                                    std::sqrt(double(_arc_num))),
 		                                MIN_BLOCK_SIZE );
@@ -1227,3 +1230,3 @@
 		      // Store the arcs in a mixed order
 		      int k = std::max(int(sqrt(_arc_num)), 10);
+		      int k = std::max(int(std::sqrt(double(_arc_num))), 10);
 		      int i = 0;

tools/lgf-gen.cc

Show inline comments

@@ -67,3 +67,3 @@
 		  for(EdgeIt e(g);e!=INVALID;++e)
 		    tlen+=sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare());
+		    tlen+=std::sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare());
 		  return tlen;
@@ -190,3 +190,3 @@
 		    return d / (2 * a) + sqrt((d * d + e * e) / (4 * a * a) + f / a);
+		    return d / (2 * a) + std::sqrt((d * d + e * e) / (4 * a * a) + f / a);
+		  }
@@ -208,3 +208,3 @@
 		    double d = (q.x - sx) * (p.x - sx) * (p - q).normSquare();
 		    return (b - sqrt(d)) / a;
+		    return (b - std::sqrt(d)) / a;
+		  }
@@ -815,3 +815,3 @@
 		  for(EdgeIt e(g);e!=INVALID;++e)
 		    tlen+=sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare());
+		    tlen+=std::sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare());
 		  std::cout << "Total arc length  : " << tlen << std::endl;

0 comments (0 inline)

RhodeCode