X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=energy.c;h=3c76b0cc207383a098ba794e900affba613b5d8a;hb=df292e7ebab1b8f8abc5dc3e9948408d73d6b639;hp=e0ebbe24a90beb61890b1c6767f54992938d5810;hpb=fe0566cb1f070bcad4d8afa20457d6937137482d;p=moebius2.git

diff --git a/energy.c b/energy.c
index e0ebbe2..3c76b0c 100644
--- a/energy.c
+++ b/energy.c
@@ -17,8 +17,6 @@ static double noncircular_rim_cost(const Vertices vertices);
 
 static void compute_vertex_areas(const Vertices vertices, double areas[N]);
 static double best_energy= DBL_MAX;
-static void flushoutput(void);
-static void diee(const char *what) { perror(what); exit(16); }
 
 static void cost(double *energy, double tweight, double tcost);
 #define COST(weight, compute) cost(&energy, (weight), (compute))
@@ -60,10 +58,6 @@ static void cost(double *energy, double tweight, double tcost) {
   *energy += tenergy;
 }
 
-static void flushoutput(void) {
-  if (fflush(stdout) || ferror(stdout)) diee("stdout");
-}
-
 static void compute_vertex_areas(const Vertices vertices, double areas[N]) {
   int v0,v1,v2, e1,e2, k;
   
@@ -115,17 +109,10 @@ static void compute_vertex_areas(const Vertices vertices, double areas[N]) {
    * coordinates.  Hopefully this won't be too slow ...
    */
 
-static void gsldie(const char *what, int status) {
-  fprintf(stderr,"gsl function failed: %s: %s\n", what, gsl_strerror(status));
-  exit(-1);
-}
-
 static gsl_multimin_fminimizer *minimiser;
 
 static const double stop_epsilon= 1e-4;
 
-#define DIM (N*D3)
-
 static double minfunc_f(const gsl_vector *x, void *params) {
   assert(x->size == DIM);
   assert(x->stride == 1);
@@ -169,13 +156,11 @@ int main(int argc, const char *const *argv) {
   FOR_RIM_VERTEX(vx,vy,v)
     step_size[v][3] *= 0.1;
 
-  r= gsl_multimin_fminimizer_set(minimiser, &multimin_function,
-				 &initial_gsl, &step_size_gsl);
-  if (r) { gsldie("fminimizer_set",r); }
+  GA( gsl_multimin_fminimizer_set(minimiser, &multimin_function,
+				  &initial_gsl, &step_size_gsl) );
   
   for (;;) {
-    r= gsl_multimin_fminimizer_iterate(minimiser);
-    if (r) { gsldie("fminimizer_iterate",r); }
+    GA( gsl_multimin_fminimizer_iterate(minimiser) );
 
     size= gsl_multimin_fminimizer_size(minimiser);
     r= gsl_multimin_test_size(size, stop_epsilon);
@@ -262,8 +247,6 @@ static double edgewise_vertex_displacement_cost(const Vertices vertices) {
   FOR_EDGE(pi,e,qi) {
     ri= EDGE_END2(pi,(e+1)%V6); if (ri<0) continue;
     si= EDGE_END2(pi,(e+5)%V6); if (si<0) continue;
-    assert(ri == EDGE_END2(qi,(e+2)%V6));
-    assert(si == EDGE_END2(qi,(e+4)%V6));
     
     K m[k]= (vertices[pi][k] + vertices[qi][k]) * 0.5;
     K mprime[k]= (vertices[ri][k] + vertices[si][k]) * 0.5;