1 75 sed -n '/START,START/ s/.*qi//p' <good-t |sort |less
2 76 sed -n '/START/,/START/ s/.*qi//p' <good-t |sort |less
4 78 sed -n '/START/,/START/ s/.*qi//p' <good-t |sort |less
5 79 sed -n '/START/,/START/ s/.*qi//p' <good-t |less
6 80 sed -n '10,$ { / s/.*qi//p; /START/ q }' <good-t |less
7 81 sed -n '10,$ { / s/.*qi//p; /START/{ q }; }' <good-t |less
8 82 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
9 83 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
10 84 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |sort |less
11 85 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
13 87 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
16 90 rm *.o; make minimise-125 OPTIMISE=-pg NPROCCFLAGS=-DNPROCESSORS=1
17 91 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
19 93 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
21 95 rm *.o; make minimise-125 OPTIMISE=-pg NPROCCFLAGS=-DNPROCESSORS=1
22 96 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
23 97 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>good-t
25 99 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
27 101 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
28 102 sed -n '/START/,/START/ { s/.*qi//p; b; } /START/q' <good-t |less
29 103 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
30 104 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
31 105 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |sort |less
32 106 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
33 107 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
34 108 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
35 109 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort |less
36 110 rm *.o; make minimise-125 OPTIMISE=-pg
37 111 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
39 113 sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |less
41 115 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t) |less
42 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
44 118 strace -ou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
45 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
49 123 strace -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
50 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
54 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
58 132 strace -s100 -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
60 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
77 151 cd things/moebius2/
80 154 cd things/moebius2/
82 156 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
83 157 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
84 158 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
85 159 rm *.o; make minimise-125 OPTIMISE=-pg
86 160 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
88 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
89 163 rm *.o; make minimise-125 OPTIMISE=-pg
90 164 rm *.o; make minimise-125 OPTIMISE=-pg
91 165 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM >/dev/null
94 168 rm *.o; make minimise-125 OPTIMISE=-pg
95 169 rm *.o; make minimise-125 OPTIMISE=-pg
96 170 bzr ci -m 'machinery for checking that our OUTER parallel iteration works - before we delete it'
97 171 rm *.o; make minimise-125 OPTIMISE=-pg
100 174 bzr diff -r115 |less
101 175 bzr diff -r115 |less
102 176 bzr diff -r115 |less
103 177 bzr diff -r115 |less
104 178 bzr ci -m 'get rid of debugging for checking OUTER iteration; leave SIGINT handler and fix to OUTER'
105 179 rm *.o; make minimise-125 OPTIMISE=-pg
106 180 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
107 181 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
108 182 bzr ci -m 'on SIGINT, do not exit 0'
109 183 cp gmon.out gmon.out.save
111 185 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
112 186 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
113 187 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
114 188 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
115 189 rm *.o; make minimise-125 OPTIMISE='-pg'
116 190 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
118 192 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
119 193 rm *.o; make minimise-125 OPTIMISE='-pg'
120 194 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
121 195 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
122 196 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
123 197 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
124 198 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
125 199 rm *.o; make minimise-125 OPTIMISE='-pg'
126 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
127 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
128 202 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
129 203 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
130 204 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
131 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
132 206 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
136 210 rm *.o; make minimise-125 OPTIMISE='-pg'
137 211 rm *.o; make minimise-125 OPTIMISE='-pg'
138 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
139 213 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
140 214 rm *.o; make minimise-125 OPTIMISE='-pg'
141 215 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
142 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
143 217 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
145 219 bzr diff energy.c
146 220 bzr ci -m 'actually do precomputations!' energy.c
149 223 bzr diff Makefile
150 224 bzr ci -m 'use -O3' Makefile
152 226 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
153 227 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
154 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
155 229 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
157 231 bzr ci -m 'memoise edge_end2 now performance is good'
158 232 cd /usr/local/profile/
159 233 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb
160 234 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
162 236 really chown ian .
163 237 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
164 238 dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
165 239 dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
167 241 file usr/lib/libgsl.so.0.10.0
168 242 dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
169 243 dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
170 244 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
179 253 cd /usr/src/gsl-1.10/
185 259 apt-get source gsl
188 262 less debian/rules
189 263 patch -p1 <../../gsl.patch
190 264 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
191 265 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
192 266 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
193 267 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
194 268 less debian/rules
197 271 apt-get source gsl
199 273 patch -p1 <../../gsl.patch
200 274 MAKE='make -j16' DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
201 275 debian/rules clean
202 276 fakeroot debian/rules clean
203 277 MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
204 278 fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
205 279 less debian/rules
207 281 fakeroot debian/rules clean
208 282 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
209 283 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
211 285 find -name 'libgsl.a'
212 286 find -name '*blas*.a'
214 288 patch -p1 </usr/src/gsl.patch2
215 289 fakeroot debian/rules clean
216 290 MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
217 291 fakeroot debian/rules clean
218 292 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
219 293 fakeroot debian/rules clean
220 294 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
221 295 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
225 299 apt-get source gsl
227 301 diff -ru {orig/,}gsl-1.10 |less
228 302 diff -ru {orig/,}gsl-1.10/multimin |less
230 304 rsync -a --delete orig/gsl-1.10 orig2/.
231 305 cd orig2/gsl-1.10/
232 306 patch -p1 <../../gsl.patch
234 308 diff -ru {orig2/,}gsl-1.10/multimin |less
235 309 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
236 310 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
237 311 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
238 312 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
239 313 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
240 314 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
241 315 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
242 316 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
243 317 echo diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin
244 318 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
245 319 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
246 320 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
247 321 cd things/moebius2/
248 322 gprof minimise-125 |less
249 323 gprof minimise-125 |less
250 324 gprof minimise-125 |less
251 325 gprof minimise-125 |less
252 326 gprof minimise-125 |less
253 327 gprof minimise-125 |less
254 328 gprof minimise-125 |less
255 329 gprof minimise-125 |less
256 330 gprof minimise-125 |less
257 331 gprof minimise-125 |less
258 332 gprof minimise-125 |less
259 333 gprof minimise-125 |less
260 334 gprof minimise-125 |less
261 335 gprof minimise-125 |less
262 336 gprof minimise-125 |less
263 337 gprof minimise-125 |less
264 338 cd things/moebius2/
265 339 grep graph_layout_prepare *.c
266 340 cd /usr/src/gsl-1.10/
268 342 find -name '*prof*'
272 346 less debian/rules
274 348 fakeroot debian/rules clean
275 349 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
276 350 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
277 351 patch -p1 <../gsl.patch2
278 352 patch -p1 <../gsl.patch2
279 353 mv multimin/simplex.c.orig multimin/simplex.c
280 354 patch -U -p1 <../gsl.patch2
283 357 mv multimin/simplex.c.orig multimin/simplex.c
284 358 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
285 359 patch -U -p1 <../gsl.patch2
286 360 mv multimin/simplex.c.orig multimin/simplex.c
287 361 patch -U -p1 <../gsl.patch2
288 362 less ../gsl.patch2
289 363 mv multimin/simplex.c.orig multimin/simplex.c
290 364 patch -U -p1 <../gsl.patch2
291 365 mv multimin/simplex.c.orig multimin/simplex.c
292 366 patch -U -p1 <../gsl.patch2
293 367 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
294 368 mv multimin/simplex.c.orig multimin/simplex.c
295 369 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
296 370 patch -U -p1 <../gsl.patch2
297 371 diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
298 372 diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
300 374 fakeroot debian/rules clean
301 375 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
302 376 fakeroot debian/rules clean
303 377 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
304 378 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
305 379 cd things/moebius2/
306 380 grep graph_layout_prepare *.c
307 381 less things/moebius2/Makefile
308 382 emacs things/moebius2/energy.c
309 383 cd things/moebius2/
310 384 rm *.o; make minimise-125
311 385 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
312 386 make interpolate-246
313 387 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
314 388 make minimise-246
315 389 make minimise-246
316 390 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
317 391 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
319 393 bzr ci -m 'allow compiling spuriously with XBITS>=6'
324 398 bzr ci -m 'primer does not need mgraph_prepare'
325 399 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
326 400 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
327 401 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
328 402 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
330 404 cd things/moebius2
342 416 make -n best-968.CFM
343 417 make -n best-33.CFM
347 421 ./interpolate-64 -aa best-33.CFM -ostart-64.cfm
348 422 ./minimise-64 start-64.cfm -iwip-64.CFM -obest-64.CFM
349 423 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
350 424 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
351 425 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
352 426 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
353 427 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
354 428 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
355 429 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
356 430 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
357 431 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
358 432 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
359 433 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
360 434 history >nice-64.history
363 437 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
365 439 history >nice-64.history
366 440 bzr ci -m 'stopping point for 64'
369 443 cd things/moebius2
372 446 bzr ci -m 'adjusted costs for 64'
376 450 cd things/moebius2/
377 451 ./interpolate-125 -aa best-64.CFM -ostart-1256.cfm
378 452 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
379 453 rm ./start-1256.cfm
380 454 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
381 455 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
382 456 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
383 457 cp start-125.cfm wip-125.cfm
384 458 cp start-125.cfm wip-125.cfm
385 459 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
386 460 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
387 461 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
388 462 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
389 463 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
390 464 ls -al minimise-125
394 468 make minimise-125
395 469 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
396 470 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
397 471 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
398 472 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
402 476 history >wip-125.history
406 480 bzr ci -m 'attempts to fix 125; really need to combine edge length variation and bending costs'
409 483 bzr pull ../moebius2-from-liberator
410 484 bzr merge ../moebius2-from-liberator
415 489 bzr pull ../moebius2-from-liberator
416 490 bzr merge ../moebius2-from-liberator
420 494 bzr pull ../moebius2-from-liberator
421 495 cd things/moebius2
423 497 bzr pull ../moebius2-from-liberator
424 498 cat new-costs.history
425 499 cp start-64.cfm wip-64.cfm
426 500 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
427 501 cp wip-64.cfm best-64.CFM
428 502 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
429 503 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
430 504 cp start-125.cfm wip-125.cfm
431 505 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
432 506 ./minimise-125 wip-125.cfm -iwip-125.cfm -obest-125.CFM
433 507 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
434 508 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
435 509 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
436 510 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
437 511 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
438 512 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
439 513 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
440 514 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
441 515 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
442 516 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
443 517 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
444 518 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
445 519 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
446 520 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
447 521 ./interpolate-125 -aa wip-64.cfm -ostart-125.cfm
448 522 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
451 525 bzr diff Makefile
452 526 bzr ci -m 'build more stuff' Makefile
455 529 bzr ci -m 'wip energy functions'
456 530 bzr pull ../moebius2-from-liberator/
458 532 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
459 533 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
460 534 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
461 535 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
462 536 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
463 537 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
464 538 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
465 539 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
466 540 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
467 541 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
468 542 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
469 543 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
470 544 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
471 545 bzr ci -m 'before abandon this version of rim twist which is nonsense'
472 546 bzr ci -m 'before abandon this version of rim twist which is nonsense'
476 550 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
477 551 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
478 552 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
479 553 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
480 554 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
481 555 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
482 556 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
483 557 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
484 558 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
485 559 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
486 560 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
487 561 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
488 562 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
489 563 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
491 565 bzr ci -m 'wip before increase power of bendings'
492 566 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
493 567 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
496 570 bzr ci -m 'changed powers on vertex displacements -- tweaked parameters for XBITS==5'
497 571 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
498 572 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
500 574 history >nice-64.history
502 7 rm *.o; make minimise-125 OPTIMISE=-pg NPROCCFLAGS=-DNPROCESSORS=1
503 8 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
504 9 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>good-t
506 11 sed -n '10,$ { s/.*qi//p; /START/ q }' <good-t |less
508 13 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
509 14 sed -n '/START/,/START/ { s/.*qi//p; b; } /START/q' <good-t |less
510 15 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
511 16 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
512 17 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |sort |less
513 18 sed -n '/START/,/START/ { s/.*qi//p; b; }; /START/q' <good-t |less
514 19 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
515 20 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |less
516 21 sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort |less
517 22 rm *.o; make minimise-125 OPTIMISE=-pg
518 23 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
520 25 sed -n 's/.*qi//p; 10,$ { /START/ q }' <t |less
522 27 diff -u <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <good-t |sort) <(sed -n 's/.*qi//p; 10,$ { /START/ q }' <t) |less
523 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
525 30 strace -ou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
526 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
530 35 strace -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
531 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
535 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
539 44 strace -s100 -fou ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
541 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
558 63 cd things/moebius2/
561 66 cd things/moebius2/
563 68 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>t
564 69 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
565 70 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
566 71 rm *.o; make minimise-125 OPTIMISE=-pg
567 72 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM 2>>t
569 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
570 75 rm *.o; make minimise-125 OPTIMISE=-pg
571 76 rm *.o; make minimise-125 OPTIMISE=-pg
572 77 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM >/dev/null
575 80 rm *.o; make minimise-125 OPTIMISE=-pg
576 81 rm *.o; make minimise-125 OPTIMISE=-pg
577 82 bzr ci -m 'machinery for checking that our OUTER parallel iteration works - before we delete it'
578 83 rm *.o; make minimise-125 OPTIMISE=-pg
581 86 bzr diff -r115 |less
582 87 bzr diff -r115 |less
583 88 bzr diff -r115 |less
584 89 bzr diff -r115 |less
585 90 bzr ci -m 'get rid of debugging for checking OUTER iteration; leave SIGINT handler and fix to OUTER'
586 91 rm *.o; make minimise-125 OPTIMISE=-pg
587 92 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
588 93 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
589 94 bzr ci -m 'on SIGINT, do not exit 0'
590 95 cp gmon.out gmon.out.save
592 97 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
593 98 rm *.o; make minimise-125 OPTIMISE='-O2 -pg'
594 99 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
595 100 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
596 101 rm *.o; make minimise-125 OPTIMISE='-pg'
597 102 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
599 104 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
600 105 rm *.o; make minimise-125 OPTIMISE='-pg'
601 106 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
602 107 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
603 108 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
604 109 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125
605 110 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
606 111 rm *.o; make minimise-125 OPTIMISE='-pg'
607 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
608 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
609 114 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
610 115 LD_LIBRARY_PATH=/usr/local/profile/usr/lib ldd ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
611 116 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
612 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
613 118 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
617 122 rm *.o; make minimise-125 OPTIMISE='-pg'
618 123 rm *.o; make minimise-125 OPTIMISE='-pg'
619 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
620 125 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
621 126 rm *.o; make minimise-125 OPTIMISE='-pg'
622 127 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
623 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
624 129 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
626 131 bzr diff energy.c
627 132 bzr ci -m 'actually do precomputations!' energy.c
630 135 bzr diff Makefile
631 136 bzr ci -m 'use -O3' Makefile
633 138 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
634 139 rm *.o; make minimise-125 OPTIMISE='-pg -O3'
635 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
636 141 ./minimise-125 start-125.cfm -iwip-125.CFM -obest-125.CFM
638 143 bzr ci -m 'memoise edge_end2 now performance is good'
639 144 cd /usr/local/profile/
640 145 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb
641 146 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
643 148 really chown ian .
644 149 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
645 150 dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
646 151 dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
648 153 file usr/lib/libgsl.so.0.10.0
649 154 dpkg -x /usr/src/profile/libgsl0ldbl_1.10-4_i386.deb .
650 155 dpkg -x /usr/src/profile/libgsl0-dev_1.10-4_i386.deb .
651 156 dpkg -x /usr/src/profile/libgsl0-dbg_1.10-4_i386.deb .
660 165 cd /usr/src/gsl-1.10/
666 171 apt-get source gsl
669 174 less debian/rules
670 175 patch -p1 <../../gsl.patch
671 176 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
672 177 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
673 178 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
674 179 MAKEFLAGS=-j16 DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
675 180 less debian/rules
678 183 apt-get source gsl
680 185 patch -p1 <../../gsl.patch
681 186 MAKE='make -j16' DEBUGFLAGS='-g -O3 -pg' dpkg-buildpackage -us -uc -rfakeroot -b
682 187 debian/rules clean
683 188 fakeroot debian/rules clean
684 189 MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
685 190 fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
686 191 less debian/rules
688 193 fakeroot debian/rules clean
689 194 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
690 195 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
692 197 find -name 'libgsl.a'
693 198 find -name '*blas*.a'
695 200 patch -p1 </usr/src/gsl.patch2
696 201 fakeroot debian/rules clean
697 202 MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
698 203 fakeroot debian/rules clean
699 204 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
700 205 fakeroot debian/rules clean
701 206 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build DEBUGFLAGS='-g -O3 -pg'
702 207 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary DEBUGFLAGS='-g -O3 -pg'
706 211 apt-get source gsl
708 213 diff -ru {orig/,}gsl-1.10 |less
709 214 diff -ru {orig/,}gsl-1.10/multimin |less
711 216 rsync -a --delete orig/gsl-1.10 orig2/.
712 217 cd orig2/gsl-1.10/
713 218 patch -p1 <../../gsl.patch
715 220 diff -ru {orig2/,}gsl-1.10/multimin |less
716 221 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
717 222 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
718 223 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
719 224 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
720 225 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
721 226 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
722 227 diff -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
723 228 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
724 229 echo diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin
725 230 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
726 231 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
727 232 diff --exclude=\*{.orig,.rej,~} -ru {orig2/,}gsl-1.10/multimin >gsl.patch2
728 233 cd things/moebius2/
729 234 gprof minimise-125 |less
730 235 gprof minimise-125 |less
731 236 gprof minimise-125 |less
732 237 gprof minimise-125 |less
733 238 gprof minimise-125 |less
734 239 gprof minimise-125 |less
735 240 gprof minimise-125 |less
736 241 gprof minimise-125 |less
737 242 gprof minimise-125 |less
738 243 gprof minimise-125 |less
739 244 gprof minimise-125 |less
740 245 gprof minimise-125 |less
741 246 gprof minimise-125 |less
742 247 gprof minimise-125 |less
743 248 gprof minimise-125 |less
744 249 gprof minimise-125 |less
745 250 cd things/moebius2/
746 251 grep graph_layout_prepare *.c
747 252 cd /usr/src/gsl-1.10/
749 254 find -name '*prof*'
753 258 less debian/rules
755 260 fakeroot debian/rules clean
756 261 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
757 262 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
758 263 patch -p1 <../gsl.patch2
759 264 patch -p1 <../gsl.patch2
760 265 mv multimin/simplex.c.orig multimin/simplex.c
761 266 patch -U -p1 <../gsl.patch2
764 269 mv multimin/simplex.c.orig multimin/simplex.c
765 270 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
766 271 patch -U -p1 <../gsl.patch2
767 272 mv multimin/simplex.c.orig multimin/simplex.c
768 273 patch -U -p1 <../gsl.patch2
769 274 less ../gsl.patch2
770 275 mv multimin/simplex.c.orig multimin/simplex.c
771 276 patch -U -p1 <../gsl.patch2
772 277 mv multimin/simplex.c.orig multimin/simplex.c
773 278 patch -U -p1 <../gsl.patch2
774 279 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
775 280 mv multimin/simplex.c.orig multimin/simplex.c
776 281 diff -u ~/junk/d/simplex.c multimin/simplex.c |less
777 282 patch -U -p1 <../gsl.patch2
778 283 diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
779 284 diff -u ~/junk/d/simplex.c multimin/simplex.c.orig |less
781 286 fakeroot debian/rules clean
782 287 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
783 288 fakeroot debian/rules clean
784 289 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' debian/rules build
785 290 DEB_BUILD_OPTIONS=nostrip MAKE='make -j16' fakeroot debian/rules binary
786 291 cd things/moebius2/
787 292 grep graph_layout_prepare *.c
788 293 less things/moebius2/Makefile
789 294 emacs things/moebius2/energy.c
790 295 cd things/moebius2/
791 296 rm *.o; make minimise-125
792 297 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
793 298 make interpolate-246
794 299 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
795 300 make minimise-246
796 301 make minimise-246
797 302 ./interpolate-246 -aa start-125.cfm -ostart-246.cfm
798 303 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
800 305 bzr ci -m 'allow compiling spuriously with XBITS>=6'
805 310 bzr ci -m 'primer does not need mgraph_prepare'
806 311 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
807 312 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
808 313 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
809 314 ./minimise-246 start-246.cfm -iwip-246.CFM -obest-246.CFM
811 316 cd things/moebius2
823 328 make -n best-968.CFM
824 329 make -n best-33.CFM
828 333 ./interpolate-64 -aa best-33.CFM -ostart-64.cfm
829 334 ./minimise-64 start-64.cfm -iwip-64.CFM -obest-64.CFM
830 335 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
831 336 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
832 337 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
833 338 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
834 339 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
835 340 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
836 341 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
837 342 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
838 343 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
839 344 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
840 345 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
841 346 history >nice-64.history
844 349 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
846 351 history >nice-64.history
847 352 bzr ci -m 'stopping point for 64'
850 355 cd things/moebius2
853 358 bzr ci -m 'adjusted costs for 64'
857 362 cd things/moebius2/
858 363 ./interpolate-125 -aa best-64.CFM -ostart-1256.cfm
859 364 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
860 365 rm ./start-1256.cfm
861 366 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
862 367 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
863 368 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
864 369 cp start-125.cfm wip-125.cfm
865 370 cp start-125.cfm wip-125.cfm
866 371 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
867 372 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
868 373 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
869 374 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
870 375 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
871 376 ls -al minimise-125
875 380 make minimise-125
876 381 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
877 382 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
878 383 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
879 384 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
883 388 history >wip-125.history
887 392 bzr ci -m 'attempts to fix 125; really need to combine edge length variation and bending costs'
890 395 bzr pull ../moebius2-from-liberator
891 396 bzr merge ../moebius2-from-liberator
896 401 bzr pull ../moebius2-from-liberator
897 402 bzr merge ../moebius2-from-liberator
901 406 bzr pull ../moebius2-from-liberator
902 407 cd things/moebius2
903 408 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
904 409 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
905 410 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
906 411 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
908 413 cd things/moebius2
910 415 bzr pull ../moebius2-from-liberator
911 416 cat new-costs.history
912 417 cp start-64.cfm wip-64.cfm
913 418 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
914 419 cp wip-64.cfm best-64.CFM
915 420 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
916 421 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
917 422 cp start-125.cfm wip-125.cfm
918 423 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
919 424 ./minimise-125 wip-125.cfm -iwip-125.cfm -obest-125.CFM
920 425 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
921 426 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
922 427 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
923 428 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
924 429 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
925 430 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
926 431 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
927 432 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
928 433 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
929 434 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
930 435 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
931 436 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
932 437 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
933 438 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
934 439 ./interpolate-125 -aa wip-64.cfm -ostart-125.cfm
935 440 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
938 443 bzr diff Makefile
939 444 bzr ci -m 'build more stuff' Makefile
942 447 bzr ci -m 'wip energy functions'
943 448 bzr pull ../moebius2-from-liberator/
945 450 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
946 451 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
947 452 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
948 453 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
949 454 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
950 455 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
951 456 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
952 457 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
953 458 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
954 459 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
955 460 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM 2>&1 |less
956 461 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
957 462 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
958 463 bzr ci -m 'before abandon this version of rim twist which is nonsense'
959 464 bzr ci -m 'before abandon this version of rim twist which is nonsense'
963 468 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
964 469 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
965 470 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
966 471 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
967 472 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
968 473 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
969 474 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
970 475 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
971 476 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
972 477 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
973 478 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
974 479 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
975 480 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
976 481 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
978 483 bzr ci -m 'wip before increase power of bendings'
979 484 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
980 485 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
983 488 bzr ci -m 'changed powers on vertex displacements -- tweaked parameters for XBITS==5'
984 489 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
985 490 ./minimise-64 start-64.cfm -iwip-64.cfm -obest-64.CFM
987 492 history >nice-64.history
988 493 mv nice-64.history nice-64-125.history
989 494 bzr add nice-64-125.history
990 495 bzr ci -m 'fixed XBITS==4'
992 497 ./interpolate-125 -aa best-64.CFM -ostart-125.cfm
993 498 cd things/moebius2
994 499 ./minimise-125 start-125.cfm -iwip-125.cfm -obest-125.CFM
996 501 bzr ci -m 'scale 125 seems to work ish although could be more bowl-like'
998 503 make -j4 minimise-246
999 504 cat nice-64-125.history
1000 505 history >>nice-64-125.history