X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=common.h;h=6414303ad755c8234366e5990e450441f2b2dbd7;hb=4df68fdb1dcfd2be205349ba533ca5de6ad3f84f;hp=52f2e5b15781e6c6dba388968def3535c6ae5a89;hpb=eac31a20dbcedaad053f36c6b0de450325ecff0c;p=moebius2.git

diff --git a/common.h b/common.h
index 52f2e5b..6414303 100644
--- a/common.h
+++ b/common.h
@@ -8,6 +8,12 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 1000
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <math.h>
 #include <float.h>
@@ -17,11 +23,14 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
+#include <stdint.h>
 
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_linalg.h>
+#include <gsl/gsl_interp.h>
 
 #define D3 3
 
@@ -30,10 +39,16 @@ double hypotD2(const double p[D3], const double q[D3]);
 double hypotD2plus(const double p[D3], const double q[D3], double add);
 
 double magnD(const double pq[D3]);
+double magnD2(const double pq[D3]);
 void xprod(double r[D3], const double a[D3], const double b[D3]);
+double dotprod(const double a[D3], const double b[D3]);
+void xprod_norm(double r[D3], const double a[D3], const double b[D3],
+		double one, double absepsilon);
+void normalise(double v[D3], double one, double absepsilon);
 
 void flushoutput(void);
 void diee(const char *what);
+void fail(const char *emsg);
 
 void libdie(const char *lib, int l, const char *str);
 #define XA(w) ((w) ? (void)0 : libdie("X", __LINE__, #w))
@@ -46,8 +61,11 @@ void gsldie(int l, const char *what, int status);
 
 #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] };
+#define GSL_VECTOR(x) gsl_vector x##_gsl= { D3,1,&x[0] };
+#define GSL_MATRIX(x) gsl_matrix x##_gsl= { D3,D3,D3,&x[0][0] };
+
+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+#define MAX(a,b) ((a) >= (b) ? (a) : (b))
 
 #ifdef FP_FAST_FMA
 # define fma_fast fma