From: Ian Jackson <ian@davenant.relativity.greenend.org.uk>
Date: Fri, 4 Jan 2008 01:32:24 +0000 (+0000)
Subject: improvements?
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=commitdiff_plain;h=72f8ad06842d28b84b9ec4f15e0890a1caedf3d0

improvements?
---

diff --git a/energy.c b/energy.c
index 73308ac..867330c 100644
--- a/energy.c
+++ b/energy.c
@@ -38,9 +38,9 @@ static double compute_energy(const Vertices vertices) {
 
   if (printing) printf("cost > energy |");
 
-//  COST(1e4, edgewise_vertex_displacement_cost(vertices));
-  COST(1e2, graph_layout_cost(vertices,vertex_areas));
-//  COST(1e4, noncircular_rim_cost(vertices));
+  COST(1e2, edgewise_vertex_displacement_cost(vertices));
+//  COST(1e0, graph_layout_cost(vertices,vertex_areas));
+  COST(1e4, noncircular_rim_cost(vertices));
 
   if (printing) printf("| total %# e |", energy);
 
diff --git a/graph.c b/graph.c
index c9cdd2c..31e317d 100644
--- 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);