chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
can rotate but does not normalise
[moebius2.git]
/
energy.c
diff --git
a/energy.c
b/energy.c
index f28135a3bf4d2bc02ce9f700c89d0d6c77dfba20..b2ee07339b2401b610e728065b423421787f26fb 100644
(file)
--- 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 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))
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;
}
*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;
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 ...
*/
* 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;
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);
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;
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 (;;) {
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);
size= gsl_multimin_fminimizer_size(minimiser);
r= gsl_multimin_test_size(size, stop_epsilon);
@@
-257,7
+242,7
@@
static double edgewise_vertex_displacement_cost(const Vertices vertices) {
static const double l3_epsilon= 1e-6;
int pi,e,qi,ri,si, k;
static const double l3_epsilon= 1e-6;
int pi,e,qi,ri,si, k;
- double m[D3], mprime[D3], b, d2, l, sigma_bd2_l3;
+ double m[D3], mprime[D3], b, d2, l, sigma_bd2_l3
=0
;
FOR_EDGE(pi,e,qi) {
ri= EDGE_END2(pi,(e+1)%V6); if (ri<0) continue;
FOR_EDGE(pi,e,qi) {
ri= EDGE_END2(pi,(e+1)%V6); if (ri<0) continue;