From 62710d55de09f02e31a9fc2cc7e3ec5de44651e4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 30 Dec 2007 12:44:17 +0000 Subject: [PATCH] compile ok so far; before OutEdge iterator redo --- bgl.cpp | 34 +++++++++++++++++++++----------- common.h | 7 +++++++ energy.c | 59 ++++++++++++++++++++++++++++---------------------------- mgraph.h | 6 ++++-- 4 files changed, 63 insertions(+), 43 deletions(-) diff --git a/bgl.cpp b/bgl.cpp index fbc5b7d..1beae8c 100644 --- a/bgl.cpp +++ b/bgl.cpp @@ -5,10 +5,20 @@ #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + extern "C" { #include "bgl.h" #include "mgraph.h" -#include "common.h" } /* @@ -38,6 +48,12 @@ extern "C" { class Graph { }; // this is a dummy as our graph has no actual representation +struct OutEdgeIncrable { + int f; + OutEdgeIncrable& operator++() { f += 1< has lots of stuff. @@ -49,12 +65,6 @@ namespace boost { public virtual vertex_list_graph_tag, public virtual edge_list_graph_tag { }; - struct OutEdgeIncrable { - int f; - OutEdgeIncrable& operator++() { f += 1< { // Concept Graph: @@ -62,15 +72,15 @@ namespace boost { typedef int vertex_descriptor; /* vertex number, -1 => none */ typedef int edge_descriptor; /* see above */ typedef undirected_tag directed_category; - typedef disallow_parallel_ege edge_parallel_category; + typedef disallow_parallel_edge_tag edge_parallel_category; typedef layout_graph_traversal_category traversal_category; inline int null_vertex() { return -1; } // Concept IncidenceGraph: typedef counting_iterator out_edge_iterator; - typedef int degree_size_type; + std::forward_iterator_tag> out_edge_iterator; + typedef unsigned degree_size_type; inline int source(int f, const Graph&) { return f&VMASK; } inline int target(int f, const Graph&) { return EDGE_END2(f&VMASK, f>>ESHIFT); } @@ -79,7 +89,9 @@ namespace boost { return std::make_pair(out_edge_iterator(OutEdgeIncrable(v, VE_MIN(v))), out_edge_iterator(OutEdgeIncrable(v, VE_MAX(v)))); } - inline out_degree(int v, const Graph&) { return VE_MAX(v) - VE_MIN(v); } + inline unsigned out_degree(int v, const Graph&) { + return VE_MAX(v) - VE_MIN(v); + } // Concept VertexListGraph: typedef counting_iterator vertex_iterator; diff --git a/common.h b/common.h index 77589f9..3978b5b 100644 --- a/common.h +++ b/common.h @@ -5,10 +5,16 @@ #ifndef COMMON_H #define COMMON_H +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif + #include #include #include +#include +#include +#include #define D3 3 @@ -17,6 +23,7 @@ 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]); +void xprod(double r[D3], const double a[D3], const double b[D3]); #ifdef FP_FAST_FMA # define fma_fast fma diff --git a/energy.c b/energy.c index 139e7e1..f28135a 100644 --- a/energy.c +++ b/energy.c @@ -6,22 +6,26 @@ #include "bgl.h" #include "mgraph.h" +#include +#include + #define BEST_F "best" #define INITIAL_F "initial" static double edgewise_vertex_displacement_cost(const Vertices vertices); -static double noncircular_rim_cost(Vertices vertices); +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)) /*---------- main energy computation and subroutines ----------*/ -static double compute_energy(Vertices vertices) { +static double compute_energy(const Vertices vertices) { double vertex_areas[N], energy; compute_vertex_areas(vertices,vertex_areas); @@ -34,7 +38,9 @@ static double compute_energy(Vertices vertices) { printf("| total %# e |", energy); if (energy < best_energy) { - FILE *best; + FILE *best_f; + int r; + printf(" BEST"); best_f= fopen(BEST_F ".new","wb"); if (!best_f) diee("fopen new best"); @@ -55,10 +61,12 @@ static void cost(double *energy, double tweight, double tcost) { } static void flushoutput(void) { - if (fflush(stdout) || ferror(stdout)) { perror("stdout"); exit(-1); } + 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; + FOR_VERTEX(v0) { double total= 0.0; int count= 0; @@ -74,7 +82,7 @@ static void compute_vertex_areas(const Vertices vertices, double areas[N]) { e2v[k]= vertices[v2][k] - vertices[v0][k]; } xprod(av, e1v, e2v); - total += hypotD1(av); + total += magnD(av); count++; } areas[v0]= total / count; @@ -114,23 +122,23 @@ static void gsldie(const char *what, int status) { static gsl_multimin_fminimizer *minimiser; -static const stop_epsilon= 1e-4; +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); - return compute_energy((Vertices)x->data); + return compute_energy((const double(*)[D3])x->data); } int main(int argc, const char *const *argv) { - struct gsl_multimin_function multimin_function; + gsl_multimin_function multimin_function; double size; Vertices initial, step_size; - FILE *initial; + FILE *initial_f; gsl_vector initial_gsl, step_size_gsl; - int r; + int r, v, vx,vy, k; if (argc>1) { fputs("takes no arguments\n",stderr); exit(8); } @@ -153,27 +161,16 @@ int main(int argc, const char *const *argv) { initial_gsl.owner= 0; step_size_gsl= initial_gsl; - initial_gsl.data= initial; - step_size_gsl.data= step_size; + initial_gsl.data= (double*)initial; + step_size_gsl.data= (double*)step_size; FOR_VERTEX(v) K step_size[v][k]= 1e-3; FOR_RIM_VERTEX(vx,vy,v) step_size[v][3] *= 0.1; - - for (vy=0; vy