chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
actually do precomputations!
[moebius2.git]
/
energy.c
diff --git
a/energy.c
b/energy.c
index a4cfbb1491221f90b4e454105e8e04473ed89f99..930a9d58a1de886473bc59e403dcc03d77c27486 100644
(file)
--- a/
energy.c
+++ b/
energy.c
@@
-89,7
+89,7
@@
void compute_energy_separately(const struct Vertices *vs,
int ci;
for (ci=0; ci<NPRECOMPS; ci++) {
int ci;
for (ci=0; ci<NPRECOMPS; ci++) {
-
costs[ci].fn
(vs->a, section);
+
precomps[ci]
(vs->a, section);
inparallel_barrier();
}
for (ci=0; ci<NCOSTS; ci++)
inparallel_barrier();
}
for (ci=0; ci<NCOSTS; ci++)
@@
-174,8
+174,6
@@
void compute_edge_lengths(const Vertices vertices, int section) {
edge_lengths[v1][e]= hypotD(vertices[v1],vertices[v2]);
}
edge_lengths[v1][e]= hypotD(vertices[v1],vertices[v2]);
}
-#include <pthread.h>
-
void compute_vertex_areas(const Vertices vertices, int section) {
int v0,v1,v2, e1,e2;
// int k;
void compute_vertex_areas(const Vertices vertices, int section) {
int v0,v1,v2, e1,e2;
// int k;
@@
-250,24
+248,7
@@
double line_bending_cost(const Vertices vertices, int section) {
double a[D3], b[D3], axb[D3];
double total_cost= 0;
double a[D3], b[D3], axb[D3];
double total_cost= 0;
- if (quitting_last_iteration) {
- char buf[100];
- int n= sprintf(buf,
- "section=%d thr=%#08lx qi=0x%03x START\n",
- section,(unsigned long)pthread_self(), N);
- write(2,buf,n);
- quitting_reported_threads= 1;
- }
-
FOR_EDGE(qi,e,ri, OUTER) {
FOR_EDGE(qi,e,ri, OUTER) {
- if (quitting_last_iteration) {
- char buf[100];
- int n= sprintf(buf,
- "section=%d thr=%#08lx qi=0x%03x,e=%d,ri=0x%03x\n",
- section,(unsigned long)pthread_self(),qi,e,ri);
- write(2,buf,n);
- }
-
pi= EDGE_END2(qi,(e+3)%V6); if (pi<0) continue;
//if (!(qi&XMASK)) fprintf(stderr,"%02x-%02x-%02x (%d)\n",pi,qi,ri,e);
pi= EDGE_END2(qi,(e+3)%V6); if (pi<0) continue;
//if (!(qi&XMASK)) fprintf(stderr,"%02x-%02x-%02x (%d)\n",pi,qi,ri,e);