better error handling and gsl stuff etc.

diff --git a/common.c b/common.c
index bc4dcaef8ec8e837337babe47a7635e5534d43bd..ba61341dc9bc45c457feba0ba87b112190df3c6a 100644 (file)
--- a/common.c
+++ b/common.c
@@ -43,5 +43,15 @@ void xprod(double r[D3], const double a[D3], const double b[D3]) {
   r[2]= a[0]*b[1] - a[1]*b[0];
 }
 
+void libdie(const char *lib, int l, const char *str) {
+  fprintf(stderr,"%s library call failed, line %d: %s\n", lib, l, str);
+}
+
+void gsldie(int l, const char *what, int status) {
+  fprintf(stderr,"gsl function failed, line %d: %s: %s\n",
+         l, what, gsl_strerror(status));
+  exit(-1);
+}
+
 void diee(const char *what) { perror(what); exit(16); }
 void flushoutput(void) { if (fflush(stdout)||ferror(stdout)) diee("stdout"); }

diff --git a/common.h b/common.h
index 1b79fe8107f518b86b679cb06c6ac73968112cc6..52f2e5b15781e6c6dba388968def3535c6ae5a89 100644 (file)
--- a/common.h
+++ b/common.h
@@ -35,11 +35,20 @@ void xprod(double r[D3], const double a[D3], const double b[D3]);
 void flushoutput(void);
 void diee(const char *what);
 
+void libdie(const char *lib, int l, const char *str);
+#define XA(w) ((w) ? (void)0 : libdie("X", __LINE__, #w))
+
+void gsldie(int l, const char *what, int status);
+#define GA(w) ({int _ga_r= (w); if (w) gsldie(__LINE__,#w,_ga_r);})
+
 #define FOR_COORD(k) \
   for ((k)=0; (k)<D3; (k)++)
 
 #define K FOR_COORD(k)
 
+#define STATIC_GSL_VECTOR(x) static gsl_vector x##_gsl= { D3,1,&x[0] };
+#define STATIC_GSL_MATRIX(x) static gsl_matrix x##_gsl= { D3,D3,D3,&x[0][0] };
+
 #ifdef FP_FAST_FMA
 # define fma_fast fma
 #else

diff --git a/energy.c b/energy.c
index aa1c7f4d29ee7820c7abe784e414e8cac99ebd20..b2ee07339b2401b610e728065b423421787f26fb 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -109,11 +109,6 @@ 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;
@@ -161,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);

diff --git a/project.c b/project.c
index 521af66786895c6b7f5a51603a689cfe4db46b6a..b68e47393bb1b966579879cf0e54c0dd2513c764 100644 (file)
--- a/project.c
+++ b/project.c
@@ -15,11 +15,8 @@ static Triangle trisbuffer[MAXTRIS], *displaylist[MAXTRIS];
 static int ntris;
 static Vertices conformation;
 
-#define STATIC_MATRIX(x)                                       \
-  static double x[D3][D3];                                     \
-  static gsl_matrix x##_gsl= { D3,D3,D3,&x[0][0] };
-
-STATIC_MATRIX(transform);
+static double transform[D3][D3]= {{1,0,0}, {0,1,0}, {0,0,1}};
+STATIC_GSL_MATRIX(transform);
 
 const char *input_filename;
 
@@ -34,10 +31,16 @@ static void read_input(void) {
 }
 
 static void transform_coordinates(void) {
+  /*
+  static double result[D3];
+  static const gsl_vector result_gsl= { D3,1,&result[0]; }
+
   int v;
+  
 
   FOR_VERTEX(v) {
-  }
+    GA( gsl_blas_dgemv(CblasNoTrans,
+  }*/
 }
 
 static void addtriangle(int va, int vb, int vc) {
@@ -98,12 +101,6 @@ static double scale= 0.3;
 static double eye_z= -10, eye_x= 0;
 static double cut_z= -9;
 
-static void xdie(int l, const char *str) {
-  fprintf(stderr,"X library call failed, line %d: %s\n", l, str);
-}
-
-#define XA(w) ((w) ? (void)0 : xdie(__LINE__, #w))
-
 static void drawtriangle(const Triangle *t) {
   XPoint points[4];
   int i;
@@ -234,10 +231,14 @@ static void drag_rotate_delta(double dx, double dy) {
    * and then renormalise.
    */
 
-  STATIC_MATRIX(rotateby);
-  STATIC_MATRIX(qr);
+  static double rotateby[D3][D3]= {{1,0,0},{0,1,0},{-20,-20,1}};
+  STATIC_GSL_MATRIX(rotateby);
+
+  static double qr[D3][D3];
+  STATIC_GSL_MATRIX(qr);
+
   static double tau[D3];
-  static gsl_vector tau_gsl= { D3,1,&tau[0] };
+  STATIC_GSL_VECTOR(tau);
   
   int k;
   
@@ -245,11 +246,11 @@ static void drag_rotate_delta(double dx, double dy) {
   rotateby[0][2]= dx;
   rotateby[1][2]= dy;
   
-  gsl_blas_dgemm(CblasNoTrans,CblasNoTrans, 1.0,
-                &rotateby_gsl,&transform_gsl, 0.0,&qr_gsl);
-  gsl_linalg_QR_decomp(&qr_gsl, &tau_gsl);
-  gsl_linalg_QR_unpack(&qr_gsl, &tau_gsl,
-                      &transform_gsl, &rotateby_gsl /*dummy*/);
+  GA( gsl_blas_dgemm(CblasNoTrans,CblasNoTrans, 1.0,
+                    &rotateby_gsl,&transform_gsl, 0.0,&qr_gsl) );
+  GA( gsl_linalg_QR_decomp(&qr_gsl, &tau_gsl) );
+  GA( gsl_linalg_QR_unpack(&qr_gsl, &tau_gsl,
+                          &transform_gsl, &rotateby_gsl /*dummy*/) );
 
   printf("drag_rotate_delta...\n");
   show();
@@ -325,6 +326,7 @@ static void event_config(XConfigureEvent *e) {
 
 int main(int argc, const char *const *argv) {
   XEvent event;
+  int k;
   int motion_deferred=0, motion_x=-1, motion_y=-1;
   
   if (argc != 2 || argv[1][0]=='-') {
@@ -333,6 +335,7 @@ int main(int argc, const char *const *argv) {
   input_filename= argv[1];
 
   read_input();
+  K transform[k][k]= 1.0;
   display_prepare();
   show();