improvements?

[moebius2.git] / energy.c

diff --git a/energy.c b/energy.c
index 73308ac842bd3fcddb581ce1164b0a852e9a84a1..867330cbf2da74a6293cdf55c58ba58edffc77af 100644 (file)
--- 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);