chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of makedim multidim experiment
[moebius2.git]
/
minimise.c
diff --git
a/minimise.c
b/minimise.c
index d7cc86dcd1571fa4e9c375dbc2f47f0eb0d29ee0..e5bbc87bb6e3523ec43cd50b9665a80aae281b96 100644
(file)
--- a/
minimise.c
+++ b/
minimise.c
@@
-73,6
+73,7
@@
int main(int argc, const char *const *argv) {
graph_layout_prepare();
printing_init();
graph_layout_prepare();
printing_init();
+ energy_init();
printf("X=%d=0x%x Y=%d=0x%x DIM=%d\n",X,X,Y,Y,DIM);
printf("X=%d=0x%x Y=%d=0x%x DIM=%d\n",X,X,Y,Y,DIM);
@@
-111,8
+112,8
@@
int main(int argc, const char *const *argv) {
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);
- if (printing_check(pr_size))
- printf("
%*s size %# e, r=%d\n", 135,"
", size, r);
+ if (printing_check(pr_size
,155
))
+ printf("
size %# e, r=%d\n
", size, r);
flushoutput();
if (r==GSL_SUCCESS) break;
flushoutput();
if (r==GSL_SUCCESS) break;
@@
-126,7
+127,7
@@
int main(int argc, const char *const *argv) {
static volatile unsigned print_todo;
static sigset_t print_alarmset;
static volatile unsigned print_todo;
static sigset_t print_alarmset;
-int printing_check(enum printing_instance which) {
+int printing_check(enum printing_instance which
, int indent
) {
static int skipped[pr__max];
unsigned bits= 1u << which;
static int skipped[pr__max];
unsigned bits= 1u << which;
@@
-142,7
+143,7
@@
int printing_check(enum printing_instance which) {
sigprocmask(SIG_UNBLOCK,&print_alarmset,0);
sk= skipped[which];
sigprocmask(SIG_UNBLOCK,&print_alarmset,0);
sk= skipped[which];
- if (sk) printf("
[%4d] ",
sk);
+ if (sk) printf("
%*s[%4d] ",indent,"",
sk);
else printf(" ");
skipped[which]= 0;
else printf(" ");
skipped[which]= 0;