From: Ian Jackson <ian@turbine>
Date: Mon, 20 Oct 2008 00:18:32 +0000 (+0100)
Subject: fixed XBITS==4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=commitdiff_plain;h=a87b04c54fa371497d3815d399488355938d078d

fixed XBITS==4
---

diff --git a/energy.c b/energy.c
index 2b6c04c..448fefa 100644
--- a/energy.c
+++ b/energy.c
@@ -51,8 +51,8 @@ static const CostContribution costs[]= {
 
 #if XBITS==4
 #define STOP_EPSILON 5e-3
-    COST(  3e3,   vertex_displacement_cost) // NB this is probably wrong now
-    COST(  3e3,   vertex_edgewise_displ_cost) // we have changed the power
+    COST(  3e4,   vertex_displacement_cost) // NB this is probably wrong now
+    COST(  3e4,   vertex_edgewise_displ_cost) // we have changed the power
     COST( 0.2e3,  rim_proximity_cost)
     COST( 1e4,  rim_twist_cost)
     COST(  1e12,   noncircular_rim_cost)
diff --git a/nice-64-125.history b/nice-64-125.history
new file mode 100644
index 0000000..799adc0
--- /dev/null
+++ b/nice-64-125.history
@@ -0,0 +1,500 @@
+   75  sed -n '/START,START/ s/.*qi//p' <good-t |sort |less
+   76  sed -n '/START/,/START/ s/.*qi//p' <good-t |sort |less
+   77  less good-t 
+   78  sed -n '/START/,/START/ s/.*qi//p' <good-t |sort |less
+   79  sed -n '/START/,/START/ s/.*qi//p' <good-t |less
+   80  sed -n '10,$ { / s/.*qi//p; /START/ q }' <good-t |less
+   81  sed -n '10,$ { / s/.*qi//p; /START/{ q }; }' <good-t |less
+   82  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
+   83  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
+   84  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |sort |less
+   85  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
+   86  less good-t 
+   87  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
+   88  less good-t 
+   89  less good-t 
+   90  rm *.o; make minimise-125 OPTIMISE=-pg NPROCCFLAGS=-DNPROCESSORS=1
+   91  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+   92  less good-t 
+   93  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
+   94  less good-t 
+   95  rm *.o; make minimise-125 OPTIMISE=-pg NPROCCFLAGS=-DNPROCESSORS=1
+   96  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+   97  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>good-t 
+   98  less good-t 
+   99  sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
+  100  less good-t 
+  101  sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
+  102  sed -n '/START/,/START/ { s/.*qi//p; b; } /START/q' <good-t |less
+  103  sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
+  104  sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
+  105  sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |sort |less
+  106  sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
+  107  sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
+  108  sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
+  109  sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort |less
+  110  rm *.o; make minimise-125 OPTIMISE=-pg
+  111  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+  112  less t
+  113  sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |less
+  114  less t
+  115  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t) |less
+  116  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
+  117  less t
+  118  strace -ou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+  119  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
+  120  less t
+  121  less u
+  122  less u
+  123  strace -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+  124  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
+  125  less t
+  126  less u
+  127  less t
+  128  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
+  129  less t
+  130  less t
+  131  less u
+  132  strace -s100 -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+  133  less t
+  134  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
+  135  less t
+  136  less t
+  137  less u
+  138  uname -av
+  139  history >history
+  140  ls
+  141  cd etc/
+  142  ls
+  143  ls rc0.d
+  144  ls rcS.d
+  145  ls rcS.d/*nbd*
+  146  emacs
+  147  cd /usr/src/
+  148  cat >gsl.runes
+  149  ed gsl.runes 
+  150  ed gsl.runes 
+  151  cd things/moebius2/
+  152  emcs
+  153  emacs
+  154  cd things/moebius2/
+  155  cat history 
+  156  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
+  157  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
+  158  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
+  159  rm *.o; make minimise-125 OPTIMISE=-pg
+  160  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
+  161  less t
+  162  diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 20,$ { /START/ q }' <t |sort) |less
+  163  rm *.o; make minimise-125 OPTIMISE=-pg
+  164  rm *.o; make minimise-125 OPTIMISE=-pg
+  165  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM >/dev/null 
+  166  bzr diff
+  167  bzr diff
+  168  rm *.o; make minimise-125 OPTIMISE=-pg
+  169  rm *.o; make minimise-125 OPTIMISE=-pg
+  170  bzr ci -m 'machinery for checking that our OUTER parallel iteration works - before we delete it'
+  171  rm *.o; make minimise-125 OPTIMISE=-pg
+  172  bzr diff
+  173  bzr log |less
+  174  bzr diff -r115 |less
+  175  bzr diff -r115 |less
+  176  bzr diff -r115 |less
+  177  bzr diff -r115 |less
+  178  bzr ci -m 'get rid of debugging for checking OUTER iteration; leave SIGINT handler and fix to OUTER'
+  179  rm *.o; make minimise-125 OPTIMISE=-pg
+  180  rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
+  181  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  182  bzr ci -m 'on SIGINT, do not exit 0'
+  183  cp gmon.out gmon.out.save
+  184  bzr status
+  185  rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
+  186  rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
+  187  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  188  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  189  rm *.o; make minimise-125 OPTIMISE='-pg'
+  190  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  191  rm minimise-125 
+  192  ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  193  rm *.o; make minimise-125 OPTIMISE='-pg'
+  194  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  195  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  196  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
+  197  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
+  198  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  199  rm *.o; make minimise-125 OPTIMISE='-pg'
+  200  g++ -MMD -pg -g -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow -Wno-shadow -Wno-error -o minimise-125 energy+125.o graph+125.o mgraph+125.o minimise+125.o half+125.o parallel.o common.o -lgsl -lgslcblas -lpthread
+  201  g++ -MMD -pg -g -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow -Wno-shadow -Wno-error -o minimise-125 energy+125.o graph+125.o mgraph+125.o minimise+125.o half+125.o parallel.o common.o /usr/src/profile/gsl-1.10/.libs/libgsl.a /usr/src/profile/gsl-1.10/cblas/.libs/libgslcblas.a -lpthread
+  202  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  203  LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  204   ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  205  g++ -MMD -pg -g -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow -Wno-shadow -Wno-error -o minimise-125 energy+125.o graph+125.o mgraph+125.o minimise+125.o half+125.o parallel.o common.o /usr/src/profile/gsl-1.10/.libs/libgsl.a /usr/src/profile/gsl-1.10/cblas/.libs/libgslcblas.a -lpthread
+  206   ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  207  bzr diff
+  208  bzr diff
+  209  bzr diff
+  210  rm *.o; make minimise-125 OPTIMISE='-pg'
+  211  rm *.o; make minimise-125 OPTIMISE='-pg'
+  212  g++ -MMD -pg -g -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow -Wno-shadow -Wno-error -o minimise-125 energy+125.o graph+125.o mgraph+125.o minimise+125.o half+125.o parallel.o common.o /usr/src/profile/gsl-1.10/.libs/libgsl.a /usr/src/profile/gsl-1.10/cblas/.libs/libgslcblas.a -lpthread
+  213   ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  214  rm *.o; make minimise-125 OPTIMISE='-pg'
+  215  rm *.o; make minimise-125 OPTIMISE='-pg -O3'
+  216  g++ -MMD -pg -g -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow -Wno-shadow -Wno-error -o minimise-125 energy+125.o graph+125.o mgraph+125.o minimise+125.o half+125.o parallel.o common.o /usr/src/profile/gsl-1.10/.libs/libgsl.a /usr/src/profile/gsl-1.10/cblas/.libs/libgslcblas.a -lpthread
+  217   ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  218  bzr status
+  219  bzr diff energy.c
+  220  bzr ci -m 'actually do precomputations!' energy.c
+  221  less history 
+  222  history >history 
+  223  bzr diff Makefile
+  224  bzr ci -m 'use -O3' Makefile
+  225  grep main *.c
+  226  rm *.o; make minimise-125 OPTIMISE='-pg -O3'
+  227  rm *.o; make minimise-125 OPTIMISE='-pg -O3'
+  228  g++ -MMD -pg -g -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow -Wno-shadow -Wno-error -o minimise-125 energy+125.o graph+125.o mgraph+125.o minimise+125.o half+125.o parallel.o common.o /usr/src/profile/gsl-1.10/.libs/libgsl.a /usr/src/profile/gsl-1.10/cblas/.libs/libgslcblas.a -lpthread
+  229   ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
+  230  bzr status
+  231  bzr ci -m 'memoise edge_end2 now performance is good'
+  232  cd /usr/local/profile/
+  233  dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb 
+  234  dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
+  235  ls -ald .
+  236  really chown ian .
+  237  dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
+  238  dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
+  239  dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
+  240  ls usr/lib/
+  241  file usr/lib/libgsl.so.0.10.0 
+  242  dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
+  243  dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
+  244  dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
+  245  history
+  246  pwd
+  247  man gprof
+  248  man 3 monitor
+  249  man 3 profil
+  250  info gcc
+  251  man gcc
+  252  man -k gcc
+  253  cd /usr/src/gsl-1.10/
+  254  ls
+  255  cd ..
+  256  ls
+  257  mkdir profile
+  258  cd profile/
+  259  apt-get source gsl
+  260  cd gsl-1.10/
+  261  ls
+  262  less debian/rules 
+  263  patch -p1 <../../gsl.patch 
+  264  DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
+  265  MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
+  266  MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
+  267  MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
+  268  less debian/rules 
+  269  cd ..
+  270  rm -rf gsl-1.10 
+  271  apt-get source gsl
+  272  cd gsl-1.10/
+  273  patch -p1 <../../gsl.patch 
+  274  MAKE='make -j16' DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
+  275  debian/rules clean
+  276  fakeroot debian/rules clean
+  277  MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
+  278  fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
+  279  less debian/rules 
+  280  man dh_strip
+  281  fakeroot debian/rules clean
+  282  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
+  283  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
+  284  find -name '*.a'
+  285  find -name 'libgsl.a'
+  286  find -name '*blas*.a'
+  287  history
+  288  patch -p1 </usr/src/gsl.patch2
+  289  fakeroot debian/rules clean
+  290  MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
+  291  fakeroot debian/rules clean
+  292  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
+  293  fakeroot debian/rules clean
+  294  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
+  295  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
+  296  cd /usr/src/
+  297  mkdir orig
+  298  cd orig
+  299  apt-get source gsl
+  300  cd ..
+  301  diff -ru {orig/,}gsl-1.10 |less
+  302  diff -ru {orig/,}gsl-1.10/multimin |less
+  303  mkdir orig2
+  304  rsync -a --delete orig/gsl-1.10 orig2/.
+  305  cd orig2/gsl-1.10/
+  306  patch -p1 <../../gsl.patch
+  307  cd ../..
+  308  diff -ru {orig2/,}gsl-1.10/multimin |less
+  309  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  310  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  311  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  312  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  313  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  314  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  315  diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  316  diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  317  echo diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin
+  318  diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  319  diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  320  diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2 
+  321  cd things/moebius2/
+  322  gprof minimise-125 |less
+  323  gprof minimise-125 |less
+  324  gprof minimise-125 |less
+  325  gprof minimise-125 |less
+  326  gprof minimise-125 |less
+  327  gprof minimise-125 |less
+  328  gprof minimise-125 |less
+  329  gprof minimise-125 |less
+  330  gprof minimise-125 |less
+  331  gprof minimise-125 |less
+  332  gprof minimise-125 |less
+  333  gprof minimise-125 |less
+  334  gprof minimise-125 |less
+  335  gprof minimise-125 |less
+  336  gprof minimise-125 |less
+  337  gprof minimise-125 |less
+  338  cd things/moebius2/
+  339  grep graph_layout_prepare *.c
+  340  cd /usr/src/gsl-1.10/
+  341  dpkg -l '*gsl*'
+  342  find -name '*prof*'
+  343  cd
+  344  cd -
+  345  ls
+  346  less debian/rules 
+  347  grep -R profil *
+  348  fakeroot debian/rules clean
+  349  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
+  350  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
+  351  patch -p1 <../gsl.patch2 
+  352  patch -p1 <../gsl.patch2 
+  353  mv multimin/simplex.c.orig  multimin/simplex.c
+  354  patch -U -p1 <../gsl.patch2 
+  355  mkdir ~/junk
+  356  mkdir ~/junk/d
+  357  mv multimin/simplex.c.orig  multimin/simplex.c
+  358  diff -u ~/junk/d/simplex.c multimin/simplex.c |less
+  359  patch -U -p1 <../gsl.patch2 
+  360  mv multimin/simplex.c.orig  multimin/simplex.c
+  361  patch -U -p1 <../gsl.patch2 
+  362  less ../gsl.patch2 
+  363  mv multimin/simplex.c.orig  multimin/simplex.c
+  364  patch -U -p1 <../gsl.patch2 
+  365  mv multimin/simplex.c.orig  multimin/simplex.c
+  366  patch -U -p1 <../gsl.patch2 
+  367  diff -u ~/junk/d/simplex.c multimin/simplex.c |less
+  368  mv multimin/simplex.c.orig  multimin/simplex.c
+  369  diff -u ~/junk/d/simplex.c multimin/simplex.c |less
+  370  patch -U -p1 <../gsl.patch2 
+  371  diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
+  372  diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
+  373  history
+  374  fakeroot debian/rules clean
+  375  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
+  376  fakeroot debian/rules clean
+  377  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
+  378  DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
+  379  cd things/moebius2/
+  380  grep graph_layout_prepare *.c
+  381  less things/moebius2/Makefile
+  382  emacs things/moebius2/energy.c
+  383  cd things/moebius2/
+  384  rm *.o; make minimise-125
+  385  ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
+  386  make interpolate-246
+  387  ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
+  388  make minimise-246
+  389  make minimise-246
+  390  ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
+  391   ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
+  392  bzr diff
+  393  bzr ci -m 'allow compiling spuriously with XBITS>=6'
+  394  make
+  395  make
+  396  make -j8
+  397  bzr diff
+  398  bzr ci -m 'primer does not need mgraph_prepare'
+  399   ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
+  400   ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
+  401   ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
+  402   ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
+  403  top
+  404  cd things/moebius2
+  405  bzr status
+  406  ls
+  407  make compute
+  408  make clean
+  409  make -j4
+  410  make compute
+  411  pwd
+  412  make compute
+  413  rm best-33.CFM 
+  414  make compute
+  415  make -n compute
+  416  make -n best-968.CFM
+  417  make -n best-33.CFM
+  418  make best-33.CFM
+  419  make best-64.CFM
+  420  make best-64.cfm
+  421  ./interpolate-64 -aa best-33.CFM -ostart-64.cfm
+  422  ./minimise-64 start-64.cfm -iwip-64.CFM -obest-64.CFM
+  423  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  424  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  425  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  426  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  427  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  428  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  429  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  430  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  431  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  432  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  433  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  434  history >nice-64.history
+  435  fg
+  436  fg
+  437  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  438  bzr status
+  439  history >nice-64.history
+  440  bzr ci -m 'stopping point for 64'
+  441  bzr status
+  442  bzr status
+  443  cd things/moebius2
+  444  bzr status
+  445  bzr diff
+  446  bzr ci -m 'adjusted costs for 64'
+  447  top
+  448  top
+  449  top
+  450  cd things/moebius2/
+  451  ./interpolate-125 -aa best-64.CFM -ostart-1256.cfm
+  452  ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
+  453  rm ./start-1256.cfm 
+  454  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  455  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  456  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  457  cp start-125.cfm wip-125.cfm 
+  458  cp start-125.cfm wip-125.cfm 
+  459  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  460  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  461  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  462  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  463  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  464  ls -al minimise-125 
+  465  date
+  466  lsss energy.c 
+  467  less energy.c 
+  468  make minimise-125
+  469  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  470  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  471  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  472  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  473  ls
+  474  ls *hist8
+  475  ls *hist*
+  476  history >wip-125.history
+  477  bzr status
+  478  bzr diff |les
+  479  bzr diff |less
+  480  bzr ci -m 'attempts to fix 125; really need to combine edge length variation and bending costs'
+  481  bzr update
+  482  ls ../
+  483  bzr pull ../moebius2-from-liberator
+  484  bzr merge ../moebius2-from-liberator
+  485  bzr status
+  486  bzr diff
+  487  bzr ci -m merge
+  488  bzr push
+  489  bzr pull ../moebius2-from-liberator
+  490  bzr merge ../moebius2-from-liberator
+  491  bzr status
+  492  bzr ci -m merge
+  493  bzr status
+  494  bzr pull ../moebius2-from-liberator
+  495  cd things/moebius2
+  496  pwd
+  497  bzr pull ../moebius2-from-liberator
+  498  cat new-costs.history 
+  499  cp start-64.cfm wip-64.cfm 
+  500  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  501  cp wip-64.cfm best-64.CFM
+  502  ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
+  503  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  504  cp start-125.cfm wip-125.cfm
+  505  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  506  ./minimise-125 wip-125.cfm -iwip-125.cfm -obest-125.CFM
+  507  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  508  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  509  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  510  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  511  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  512  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  513  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  514  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  515  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  516  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  517  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  518  ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
+  519  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  520  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  521  ./interpolate-125 -aa wip-64.cfm -ostart-125.cfm
+  522  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  523  bzr status
+  524  bzr diff
+  525  bzr diff Makefile 
+  526  bzr ci -m 'build more stuff' Makefile 
+  527  bzr stauts
+  528  bzr status
+  529  bzr ci -m 'wip energy functions'
+  530  bzr pull ../moebius2-from-liberator/
+  531  bzr status
+  532  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  533  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  534  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  535  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  536  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  537  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  538  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  539  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
+  540  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
+  541  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
+  542  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
+  543  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  544  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  545  bzr ci -m 'before abandon this version of rim twist which is nonsense'
+  546  bzr ci -m 'before abandon this version of rim twist which is nonsense'
+  547  bzr uncommit
+  548  bzr status
+  549  bzr log |less
+  550  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  551  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  552  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  553  ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
+  554  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  555  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  556  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  557  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  558  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  559  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  560  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  561  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  562  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  563  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  564  bzr status
+  565  bzr ci -m 'wip before increase power of bendings'
+  566  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  567  ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
+  568  bzr status
+  569  bzr diff
+  570  bzr ci -m 'changed powers on vertex displacements  -- tweaked parameters for XBITS==5'
+  571  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  572  ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 
+  573  bzr status
+  574  history >nice-64.history