1 13 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
2 14 sed -n '/START/,/START/ { s/.*qi//p; b; } /START/q' <good-t |less
3 15 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
4 16 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
5 17 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |sort |less
6 18 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
7 19 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
8 20 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
9 21 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort |less
10 22 rm *.o; make minimise-125 OPTIMISE=-pg
11 23 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
13 25 sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |less
15 27 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t) |less
16 28 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
18 30 strace -ou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
19 31 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
23 35 strace -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
24 36 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
28 40 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
32 44 strace -s100 -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
34 46 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |sort) |less
51 63 cd things/moebius2/
54 66 cd things/moebius2/
56 68 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
57 69 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
58 70 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
59 71 rm *.o; make minimise-125 OPTIMISE=-pg
60 72 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
62 74 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 20,$ { /START/ q }' <t |sort) |less
63 75 rm *.o; make minimise-125 OPTIMISE=-pg
64 76 rm *.o; make minimise-125 OPTIMISE=-pg
65 77 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM >/dev/null
68 80 rm *.o; make minimise-125 OPTIMISE=-pg
69 81 rm *.o; make minimise-125 OPTIMISE=-pg
70 82 bzr ci -m 'machinery for checking that our OUTER parallel iteration works - before we delete it'
71 83 rm *.o; make minimise-125 OPTIMISE=-pg
74 86 bzr diff -r115 |less
75 87 bzr diff -r115 |less
76 88 bzr diff -r115 |less
77 89 bzr diff -r115 |less
78 90 bzr ci -m 'get rid of debugging for checking OUTER iteration; leave SIGINT handler and fix to OUTER'
79 91 rm *.o; make minimise-125 OPTIMISE=-pg
80 92 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
81 93 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
82 94 bzr ci -m 'on SIGINT, do not exit 0'
83 95 cp gmon.out gmon.out.save
85 97 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
86 98 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
87 99 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
88 100 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
89 101 rm *.o; make minimise-125 OPTIMISE='-pg'
90 102 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
92 104 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
93 105 rm *.o; make minimise-125 OPTIMISE='-pg'
94 106 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
95 107 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
96 108 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
97 109 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
98 110 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
99 111 rm *.o; make minimise-125 OPTIMISE='-pg'
100 112 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
101 113 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
102 114 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
103 115 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
104 116 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
105 117 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
106 118 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
110 122 rm *.o; make minimise-125 OPTIMISE='-pg'
111 123 rm *.o; make minimise-125 OPTIMISE='-pg'
112 124 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
113 125 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
114 126 rm *.o; make minimise-125 OPTIMISE='-pg'
115 127 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
116 128 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
117 129 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
119 131 bzr diff energy.c
120 132 bzr ci -m 'actually do precomputations!' energy.c
123 135 bzr diff Makefile
124 136 bzr ci -m 'use -O3' Makefile
126 138 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
127 139 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
128 140 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
129 141 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
131 143 bzr ci -m 'memoise edge_end2 now performance is good'
132 144 cd /usr/local/profile/
133 145 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb
134 146 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
136 148 really chown ian .
137 149 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
138 150 dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
139 151 dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
141 153 file usr/lib/libgsl.so.0.10.0
142 154 dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
143 155 dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
144 156 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
153 165 cd /usr/src/gsl-1.10/
159 171 apt-get source gsl
162 174 less debian/rules
163 175 patch -p1 <../../gsl.patch
164 176 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
165 177 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
166 178 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
167 179 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
168 180 less debian/rules
171 183 apt-get source gsl
173 185 patch -p1 <../../gsl.patch
174 186 MAKE='make -j16' DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
175 187 debian/rules clean
176 188 fakeroot debian/rules clean
177 189 MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
178 190 fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
179 191 less debian/rules
181 193 fakeroot debian/rules clean
182 194 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
183 195 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
185 197 find -name 'libgsl.a'
186 198 find -name '*blas*.a'
188 200 patch -p1 </usr/src/gsl.patch2
189 201 fakeroot debian/rules clean
190 202 MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
191 203 fakeroot debian/rules clean
192 204 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
193 205 fakeroot debian/rules clean
194 206 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
195 207 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
199 211 apt-get source gsl
201 213 diff -ru {orig/,}gsl-1.10 |less
202 214 diff -ru {orig/,}gsl-1.10/multimin |less
204 216 rsync -a --delete orig/gsl-1.10 orig2/.
205 217 cd orig2/gsl-1.10/
206 218 patch -p1 <../../gsl.patch
208 220 diff -ru {orig2/,}gsl-1.10/multimin |less
209 221 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
210 222 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
211 223 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
212 224 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
213 225 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
214 226 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
215 227 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
216 228 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
217 229 echo diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin
218 230 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
219 231 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
220 232 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
221 233 cd things/moebius2/
222 234 gprof minimise-125 |less
223 235 gprof minimise-125 |less
224 236 gprof minimise-125 |less
225 237 gprof minimise-125 |less
226 238 gprof minimise-125 |less
227 239 gprof minimise-125 |less
228 240 gprof minimise-125 |less
229 241 gprof minimise-125 |less
230 242 gprof minimise-125 |less
231 243 gprof minimise-125 |less
232 244 gprof minimise-125 |less
233 245 gprof minimise-125 |less
234 246 gprof minimise-125 |less
235 247 gprof minimise-125 |less
236 248 gprof minimise-125 |less
237 249 gprof minimise-125 |less
238 250 cd things/moebius2/
239 251 grep graph_layout_prepare *.c
240 252 cd /usr/src/gsl-1.10/
242 254 find -name '*prof*'
246 258 less debian/rules
248 260 fakeroot debian/rules clean
249 261 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
250 262 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
251 263 patch -p1 <../gsl.patch2
252 264 patch -p1 <../gsl.patch2
253 265 mv multimin/simplex.c.orig multimin/simplex.c
254 266 patch -U -p1 <../gsl.patch2
257 269 mv multimin/simplex.c.orig multimin/simplex.c
258 270 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
259 271 patch -U -p1 <../gsl.patch2
260 272 mv multimin/simplex.c.orig multimin/simplex.c
261 273 patch -U -p1 <../gsl.patch2
262 274 less ../gsl.patch2
263 275 mv multimin/simplex.c.orig multimin/simplex.c
264 276 patch -U -p1 <../gsl.patch2
265 277 mv multimin/simplex.c.orig multimin/simplex.c
266 278 patch -U -p1 <../gsl.patch2
267 279 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
268 280 mv multimin/simplex.c.orig multimin/simplex.c
269 281 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
270 282 patch -U -p1 <../gsl.patch2
271 283 diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
272 284 diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
274 286 fakeroot debian/rules clean
275 287 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
276 288 fakeroot debian/rules clean
277 289 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
278 290 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
279 291 cd things/moebius2/
280 292 grep graph_layout_prepare *.c
281 293 less things/moebius2/Makefile
282 294 emacs things/moebius2/energy.c
283 295 cd things/moebius2/
284 296 rm *.o; make minimise-125
285 297 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
286 298 make interpolate-246
287 299 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
288 300 make minimise-246
289 301 make minimise-246
290 302 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
291 303 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
293 305 bzr ci -m 'allow compiling spuriously with XBITS>=6'
298 310 bzr ci -m 'primer does not need mgraph_prepare'
299 311 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
300 312 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
301 313 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
302 314 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
304 316 cd things/moebius2
316 328 make -n best-968.CFM
317 329 make -n best-33.CFM
321 333 ./interpolate-64 -aa best-33.CFM -ostart-64.cfm
322 334 ./minimise-64 start-64.cfm -iwip-64.CFM -obest-64.CFM
323 335 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
324 336 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
325 337 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
326 338 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
327 339 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
328 340 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
329 341 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
330 342 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
331 343 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
332 344 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
333 345 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
334 346 history >nice-64.history
337 349 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
339 351 history >nice-64.history
340 352 bzr ci -m 'stopping point for 64'
343 355 cd things/moebius2
346 358 bzr ci -m 'adjusted costs for 64'
350 362 cd things/moebius2/
351 363 ./interpolate-125 -aa best-64.CFM -ostart-1256.cfm
352 364 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
353 365 rm ./start-1256.cfm
354 366 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
355 367 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
356 368 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
357 369 cp start-125.cfm wip-125.cfm
358 370 cp start-125.cfm wip-125.cfm
359 371 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
360 372 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
361 373 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
362 374 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
363 375 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
364 376 ls -al minimise-125
368 380 make minimise-125
369 381 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
370 382 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
371 383 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
372 384 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
376 388 history >wip-125.history
380 392 bzr ci -m 'attempts to fix 125; really need to combine edge length variation and bending costs'
383 395 bzr pull ../moebius2-from-liberator
384 396 bzr merge ../moebius2-from-liberator
389 401 bzr pull ../moebius2-from-liberator
390 402 bzr merge ../moebius2-from-liberator
394 406 bzr pull ../moebius2-from-liberator
395 407 cd things/moebius2
396 408 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
397 409 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
398 410 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
399 411 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
401 413 cd things/moebius2
403 415 bzr pull ../moebius2-from-liberator
404 416 cat new-costs.history
405 417 cp start-64.cfm wip-64.cfm
406 418 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
407 419 cp wip-64.cfm best-64.CFM
408 420 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
409 421 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
410 422 cp start-125.cfm wip-125.cfm
411 423 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
412 424 ./minimise-125 wip-125.cfm -iwip-125.cfm -obest-125.CFM
413 425 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
414 426 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
415 427 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
416 428 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
417 429 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
418 430 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
419 431 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
420 432 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
421 433 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
422 434 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
423 435 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
424 436 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
425 437 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
426 438 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
427 439 ./interpolate-125 -aa wip-64.cfm -ostart-125.cfm
428 440 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
431 443 bzr diff Makefile
432 444 bzr ci -m 'build more stuff' Makefile
435 447 bzr ci -m 'wip energy functions'
436 448 bzr pull ../moebius2-from-liberator/
438 450 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
439 451 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
440 452 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
441 453 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
442 454 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
443 455 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
444 456 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
445 457 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
446 458 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
447 459 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
448 460 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
449 461 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
450 462 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
451 463 bzr ci -m 'before abandon this version of rim twist which is nonsense'
452 464 bzr ci -m 'before abandon this version of rim twist which is nonsense'
456 468 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
457 469 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
458 470 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
459 471 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
460 472 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
461 473 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
462 474 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
463 475 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
464 476 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
465 477 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
466 478 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
467 479 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
468 480 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
469 481 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
471 483 bzr ci -m 'wip before increase power of bendings'
472 484 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
473 485 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
476 488 bzr ci -m 'changed powers on vertex displacements -- tweaked parameters for XBITS==5'
477 489 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
478 490 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
480 492 history >nice-64.history
481 493 mv nice-64.history nice-64-125.history
482 494 bzr add nice-64-125.history
483 495 bzr ci -m 'fixed XBITS==4'
485 497 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
486 498 cd things/moebius2
487 499 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
489 501 bzr ci -m 'scale 125 seems to work ish although could be more bowl-like'
491 503 make -j4 minimise-246
492 504 cat nice-64-125.history
493 505 history >>nice-64-125.history
494 506 cat nice-64-125.history
495 507 ./interpolate-246 -aa wip-125.cfm -ostart-246.cfm
496 508 ./minimise-246 start-246.cfm -iwip-246.cfm -obest-246.CFM
497 509 bzr pull ../moebius2-from-liberator
499 511 ./minimise-246 start-246.cfm -iwip-246.cfm -obest-246.CFM
500 512 history >run-246.history