chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow pausing updates
[moebius2.git]
/
common.h
diff --git
a/common.h
b/common.h
index 88ec865226297a1bcced0312bdd8c91a40febf82..7e0e86d7622da0698d992bdf94af0dfef3e4676e 100644
(file)
--- a/
common.h
+++ b/
common.h
@@
-17,6
+17,7
@@
#include <assert.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#include <gsl/gsl_vector.h>
#include <gsl/gsl_matrix.h>
#include <gsl/gsl_vector.h>
#include <gsl/gsl_matrix.h>
@@
-31,6
+32,7
@@
double hypotD2plus(const double p[D3], const double q[D3], double add);
double magnD(const double pq[D3]);
void xprod(double r[D3], const double a[D3], const double b[D3]);
double magnD(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 flushoutput(void);
void diee(const char *what);
void flushoutput(void);
void diee(const char *what);
@@
-49,6
+51,9
@@
void gsldie(int l, const char *what, int status);
#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 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
#else
#ifdef FP_FAST_FMA
# define fma_fast fma
#else