Changeset 180:911c6ba0e3c8 in glemon-0.x

Timestamp:

11/07/06 22:27:28 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3066

Message:

Bugfix + polishing

File:

• graph_displayer_canvas.cc (modified) (3 diffs)

graph_displayer_canvas.cc

@@ -321 +321 @@
       actual_forces.setYMap(y);
 
-      lemon::dim2::Point<double> delta;
-
       //count actual force for each nodes
       for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
@@ -331 +329 @@
               if(i!=j)
                 {
-                  delta=((mytab.mapstorage).coords[i]-(mytab.mapstorage).coords[j]);
-
-                  double length_sqr=delta.normSquare();
-                  double length=sqrt(length_sqr);
-                  if(length_sqr<min_dist)
-                    {
-                      length_sqr=min_dist;
-                    }
+                  lemon::dim2::Point<double> delta =
+                    ((mytab.mapstorage).coords[i]-
+                     (mytab.mapstorage).coords[j]);
+
+                  const double length_sqr=std::max(delta.normSquare(),min_dist);
 
                   //normalize vector
-                  delta/=length;
+                  delta/=sqrt(length_sqr);
 
                   //calculating propulsation strength
@@ -353 +348 @@
           for(OutEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
             {
-              delta=((mytab.mapstorage).coords[i]-(mytab.mapstorage).coords[mytab.mapstorage.graph.target(ei)]);
-
-              double length_sqr=delta.normSquare();
-              double length=sqrt(length_sqr);
-              if(length_sqr<min_dist)
-                {
-                  length_sqr=min_dist;
-                }
-
-              //normalize vector
-              delta/=length;
-
-              //calculating attraction strength
-              //greater distance means greater strength
-              delta*=attraction*length;
-
-              actual_forces.set(i,actual_forces[i]-delta);
+              lemon::dim2::Point<double> delta =
+                ((mytab.mapstorage).coords[i]-
+                 (mytab.mapstorage).coords[mytab.mapstorage.
+                                           graph.target(ei)]);
+                
+                //calculating attraction strength
+                //greater distance means greater strength
+                delta*=attraction;
+                
+                actual_forces.set(i,actual_forces[i]-delta);
             }
           for(InEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
             {
-              delta=((mytab.mapstorage).coords[i]-(mytab.mapstorage).coords[mytab.mapstorage.graph.source(ei)]);
-
-              double length_sqr=delta.normSquare();
-              double length=sqrt(length_sqr);
-              if(length_sqr<min_dist)
-                {
-                  length_sqr=min_dist;
-                }
-
-              //normalize vector
-              delta/=length;
-
-              //calculating attraction strength
-              //greater distance means greater strength
-              delta*=attraction*length;
-
-              actual_forces.set(i,actual_forces[i]-delta);
+              lemon::dim2::Point<double> delta =
+                ((mytab.mapstorage).coords[i]-
+                 (mytab.mapstorage).coords[mytab.mapstorage.
+                                           graph.source(ei)]);
+                
+                //calculating attraction strength
+                //greater distance means greater strength
+                delta*=attraction;
+                
+                actual_forces.set(i,actual_forces[i]-delta);
             }
         }