new energy functions

[moebius2.git] / graph.c

diff --git a/graph.c b/graph.c
index c9cdd2cd773670cbeaef05d846c02b1f88a8a123..31e317d363112027ef1eae6b7405c50cab299218 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -69,7 +69,6 @@ double graph_layout_cost(const Vertices v, const double vertex_areas[N]) {
    */
   //static const double d2_epsilon= 1e-6;
 
-  //  double edge_weights[V6<<ESHIFT], vertex_distances[N],
   double total_cost=0;
   int v1,v2,e, nedges=0;
   double totaledgelength=0, meanedgelength, meanedgelength2;
@@ -101,11 +100,6 @@ double graph_layout_cost(const Vertices v, const double vertex_areas[N]) {
 
       double cost= pow(d2/s2, beta_prime);
       
-      //double s2= s*s + d2_epsilon;
-      //double sd2= s2 / d2;
-      //double cost_contrib= a1*a2 * (sd2 - 1) / (d2*d2);
-      //double cost_contrib= sd2;
-
       //printf("layout %03x..%03x dist^2=%d s^2=%g d^2=%g "
               //" cost+=%g\n", v1,v2, dist2,
               //            s2,d2, cost);