*/
#include "common.h"
-#include "bgl.h"
+#include "minimise.h"
#include "mgraph.h"
#include <gsl/gsl_errno.h>
#include <gsl/gsl_multimin.h>
+#include <signal.h>
+#include <sys/time.h>
+
static const char *input_file, *output_file;
static char *output_file_tmp;
static void compute_vertex_areas(const Vertices vertices, double areas[N]);
static double best_energy= DBL_MAX;
-static void addcost(double *energy, double tweight, double tcost);
-#define COST(weight, compute) addcost(&energy, (weight), (compute))
+enum printing_instance { pr_cost, pr_size, pr__max };
+
+static void addcost(double *energy, double tweight, double tcost, int pr);
+#define COST(weight, compute) addcost(&energy, (weight), (compute), printing)
+static int printing_check(enum printing_instance);
+static void printing_init(void);
/*---------- main energy computation and subroutines ----------*/
static double compute_energy(const Vertices vertices) {
double vertex_areas[N], energy;
+ int printing;
compute_vertex_areas(vertices,vertex_areas);
energy= 0;
- printf("cost > energy |");
- COST(1e4, edgewise_vertex_displacement_cost(vertices));
+ printing= printing_check(pr_cost);
+
+ if (printing) printf("cost > energy |");
+
+ COST(1e2, edgewise_vertex_displacement_cost(vertices));
COST(1e2, graph_layout_cost(vertices,vertex_areas));
// COST(1e4, noncircular_rim_cost(vertices));
- printf("| total %# e |", energy);
+ if (printing) printf("| total %# e |", energy);
+
if (energy < best_energy) {
FILE *best_f;
int r;
- printf(" BEST");
+ if (printing) printf(" BEST");
best_f= fopen(output_file_tmp,"wb"); if (!best_f) diee("fopen new out");
r= fwrite(vertices,sizeof(Vertices),1,best_f); if (r!=1) diee("fwrite");
best_energy= energy;
}
- putchar('\n');
- flushoutput();
+ if (printing) {
+ putchar('\n');
+ flushoutput();
+ }
return energy;
}
-static void addcost(double *energy, double tweight, double tcost) {
+static void addcost(double *energy, double tweight, double tcost, int pr) {
double tenergy= tweight * tcost;
- printf(" %# e > %# e |", tcost, tenergy);
+ if (pr) printf(" %# e > %# e |", tcost, tenergy);
*energy += tenergy;
}
static gsl_multimin_fminimizer *minimiser;
-static const double stop_epsilon= 1e-4;
+static const double stop_epsilon= 1e-6;
static double minfunc_f(const gsl_vector *x, void *params) {
assert(x->size == DIM);
output_file= argv[2]+2;
if (asprintf(&output_file_tmp,"%s.new",output_file) <= 0) diee("asprintf");
+ graph_layout_prepare();
+ printing_init();
+
minimiser= gsl_multimin_fminimizer_alloc
(gsl_multimin_fminimizer_nmsimplex, DIM);
if (!minimiser) { perror("alloc minimiser"); exit(-1); }
size= gsl_multimin_fminimizer_size(minimiser);
r= gsl_multimin_test_size(size, stop_epsilon);
- printf("%*s size %# e, r=%d\n", 135,"", size, r);
+ if (printing_check(pr_size))
+ printf("%*s size %# e, r=%d\n", 135,"", size, r);
flushoutput();
if (r==GSL_SUCCESS) break;
*
* Giving energy contribution:
*
- * 2
+ * 3
* l delta
* E = F . --------
* vd, edge PQ vd d
* (The dimensions of this are those of F_vd.)
*
* We calculate delta as atan2(|AxB|, A.B)
- * where A = RM, B = MS
+ * where A = PQ, B = QR
*
* In practice to avoid division by zero we'll add epsilon to d and
* |AxB| and the huge energy ought then to be sufficient for the
double edgewise_vertex_displacement_cost(const Vertices vertices) {
static const double axb_epsilon= 1e-6;
- int pi,e,qi,ri,si, k;
- double m[D3], a[D3], b[D3], axb[D3];
+ int pi,e,qi,ri, k; //,si
+ double a[D3], b[D3], axb[D3]; //m[D3],
double total_cost= 0;
- FOR_EDGE(pi,e,qi) {
- ri= EDGE_END2(pi,(e+1)%V6); if (ri<0) continue;
- si= EDGE_END2(pi,(e+5)%V6); if (si<0) continue;
+ FOR_EDGE(qi,e,ri) {
+ pi= EDGE_END2(qi,(e+3)%V6); if (pi<0) continue;
- K m[k]= (vertices[pi][k] + vertices[qi][k]) * 0.5;
- K a[k]= -vertices[ri][k] + m[k];
- K b[k]= -m[k] + vertices[si][k];
+// K m[k]= (vertices[pi][k] + vertices[qi][k]) * 0.5;
+ K a[k]= -vertices[pi][k] + vertices[qi][k];
+ K b[k]= -vertices[qi][k] + vertices[ri][k];
xprod(axb,a,b);
double delta= atan2(magnD(axb) + axb_epsilon, dotprod(a,b));
- double cost= delta * delta;
+ double cost= pow(delta,3);
+
+ if (!e && !(qi & YMASK))
+ cost *= 10;
+
total_cost += cost;
}
return total_cost;
}
return cost;
}
+
+/*---------- printing rate limit ----------*/
+
+static volatile unsigned print_todo;
+static sigset_t print_alarmset;
+
+static int printing_check(enum printing_instance which) {
+ static int skipped[pr__max];
+
+ unsigned bits= 1u << which;
+ int sk;
+
+ if (!(print_todo & bits)) {
+ skipped[which]++;
+ return 0;;
+ }
+
+ sigprocmask(SIG_BLOCK,&print_alarmset,0);
+ print_todo &= ~bits;
+ sigprocmask(SIG_UNBLOCK,&print_alarmset,0);
+
+ sk= skipped[which];
+ if (sk) printf("[%4d] ",sk);
+ else printf(" ");
+ skipped[which]= 0;
+
+ return 1;
+}
+
+static void alarmhandler(int ignored) {
+ print_todo= ~0u;
+}
+
+static void printing_init(void) {
+ struct sigaction sa;
+ struct itimerval itv;
+
+ sigemptyset(&print_alarmset);
+ sigaddset(&print_alarmset,SIGALRM);
+
+ sa.sa_handler= alarmhandler;
+ sa.sa_mask= print_alarmset;
+ sa.sa_flags= SA_RESTART;
+ if (sigaction(SIGALRM,&sa,0)) diee("sigaction ALRM");
+
+ itv.it_interval.tv_sec= 0;
+ itv.it_interval.tv_usec= 200000;
+ itv.it_value= itv.it_interval;
+
+ if (setitimer(ITIMER_REAL,&itv,0)) diee("setitimer REAL");
+
+ raise(SIGALRM);
+}
~ian / moebius2.git / blobdiff