chiark / gitweb /
matchsticks-search.git
5 years agoremove some debugging newlines (mistakenly included in previous commit)
Ian Jackson [Sun, 9 Mar 2014 03:28:09 +0000 (03:28 +0000)]
remove some debugging newlines (mistakenly included in previous commit)

5 years agomulticore: in master, when collecting results, pay no attention to bus and look only...
Ian Jackson [Sun, 9 Mar 2014 03:22:37 +0000 (03:22 +0000)]
multicore: in master, when collecting results, pay no attention to bus and look only at our own best

5 years agoonly report "reporting" if we actually have something
Ian Jackson [Sun, 9 Mar 2014 03:21:57 +0000 (03:21 +0000)]
only report "reporting" if we actually have something

5 years agoshow git version in output
Ian Jackson [Sun, 9 Mar 2014 02:45:08 +0000 (02:45 +0000)]
show git version in output

5 years agopass weight array to workers (fix semantic conflict between horizontal weight elimina...
Ian Jackson [Sun, 9 Mar 2014 02:09:35 +0000 (02:09 +0000)]
pass weight array to workers (fix semantic conflict between horizontal weight elimination and multicore)

5 years agomove -lm to LDLIBS where it ought to be
Ian Jackson [Sun, 9 Mar 2014 01:47:51 +0000 (01:47 +0000)]
move -lm to LDLIBS where it ought to be

5 years agoapply floor to n_over_best
Ian Jackson [Sat, 8 Mar 2014 22:17:53 +0000 (22:17 +0000)]
apply floor to n_over_best

5 years agoadd <math.h> and -lm (no functional change)
Ian Jackson [Sat, 8 Mar 2014 22:17:37 +0000 (22:17 +0000)]
add <math.h> and -lm (no functional change)

5 years agoMerge remote-tracking branch 'sgt/master'
Ian Jackson [Sat, 8 Mar 2014 22:11:59 +0000 (22:11 +0000)]
Merge remote-tracking branch 'sgt/master'

Changes made to the new code in sgt/master:
  - use "-std=gnu99" not "--std=gnu99"
  - n_over_best calculation is in set_best
  - n_over_best initialised properly
 style:
  - use calloc, do not cast return value from int, better sizeof
  - extra blank line

Conflicts:
Makefile
main.c

5 years agobreak out set_best
Ian Jackson [Sat, 8 Mar 2014 22:05:58 +0000 (22:05 +0000)]
break out set_best

5 years agoin multicore, generator periodically checks for new best to avoid generating many...
Ian Jackson [Sat, 8 Mar 2014 19:42:59 +0000 (19:42 +0000)]
in multicore, generator periodically checks for new best to avoid generating many pointless suggestions

5 years agoin mc_iterate_worker, use maxhamweight_ok and preconsider_ok on incoming suggestions...
Ian Jackson [Sat, 8 Mar 2014 19:42:25 +0000 (19:42 +0000)]
in mc_iterate_worker, use maxhamweight_ok and preconsider_ok on incoming suggestions (for quicker elimination)

5 years agobreak out maxhamweight_ok (no functional change)
Ian Jackson [Sat, 8 Mar 2014 19:41:53 +0000 (19:41 +0000)]
break out maxhamweight_ok (no functional change)

5 years agopredeclare preconsider_ok and multicore_check_for_new_best (no functional change)
Ian Jackson [Sat, 8 Mar 2014 19:40:57 +0000 (19:40 +0000)]
predeclare preconsider_ok and multicore_check_for_new_best (no functional change)

5 years agotiresome portability fix for pread on squeeze
Ian Jackson [Sat, 8 Mar 2014 17:56:03 +0000 (17:56 +0000)]
tiresome portability fix for pread on squeeze

5 years agomulticore support seems to work
Ian Jackson [Sat, 8 Mar 2014 17:48:46 +0000 (17:48 +0000)]
multicore support seems to work

5 years ago.gitignore: core, t.*
Ian Jackson [Sat, 8 Mar 2014 17:47:58 +0000 (17:47 +0000)]
.gitignore: core, t.*

5 years agointroduce progress_eol and make stderr line buffered
Ian Jackson [Sat, 8 Mar 2014 17:47:06 +0000 (17:47 +0000)]
introduce progress_eol and make stderr line buffered

5 years agoin preconsider_ok, check for frags >= maxhamweight so we can force this to pass by...
Ian Jackson [Sat, 8 Mar 2014 17:32:18 +0000 (17:32 +0000)]
in preconsider_ok, check for frags >= maxhamweight so we can force this to pass by setting maxhamweight

5 years agobreak out preconsider_ok
Ian Jackson [Sat, 8 Mar 2014 17:31:36 +0000 (17:31 +0000)]
break out preconsider_ok

5 years agoPRINTF is less bodgy now
Ian Jackson [Sat, 8 Mar 2014 17:28:54 +0000 (17:28 +0000)]
PRINTF is less bodgy now

5 years agoAdd -std=gnu99 to Makefile
Ian Jackson [Sat, 8 Mar 2014 17:27:23 +0000 (17:27 +0000)]
Add -std=gnu99 to Makefile

5 years agobreak out report()
Ian Jackson [Sat, 8 Mar 2014 16:26:14 +0000 (16:26 +0000)]
break out report()

5 years agowip multicore: add argument parsing; currently -j option is actually ignored
Ian Jackson [Sat, 8 Mar 2014 16:01:04 +0000 (16:01 +0000)]
wip multicore: add argument parsing; currently -j option is actually ignored

5 years agoCheck max Hamming weight in the other direction.
Simon Tatham [Sat, 8 Mar 2014 14:10:06 +0000 (14:10 +0000)]
Check max Hamming weight in the other direction.

Once we've already got a solution, we can further winnow the set of
possible adjacency matrices, by ensuring the same bit is not set in
too many entries of adjmatrix (since if it were, some length-n stick
would have to be divided into enough pieces to make one at most the
already-known best result). This adds complexity to each step of the
recursion over possible matrices, but by early pruning it seems to cut
down the number of steps by rather more; I estimate a factor of four
speedup in pursuit of (n,m)=(10,7).

5 years agoPrune by symmetry: constrain 1st adj row to all 1s at low end. v1
Simon Tatham [Sat, 8 Mar 2014 00:19:41 +0000 (00:19 +0000)]
Prune by symmetry: constrain 1st adj row to all 1s at low end.

5 years agoSeparate stdout from stderr.
Simon Tatham [Sat, 8 Mar 2014 00:03:04 +0000 (00:03 +0000)]
Separate stdout from stderr.

5 years agoOutput the actual dissection, as a matrix.
Simon Tatham [Sat, 8 Mar 2014 00:00:29 +0000 (00:00 +0000)]
Output the actual dissection, as a matrix.

5 years agocommentary
Ian Jackson [Fri, 7 Mar 2014 18:54:57 +0000 (18:54 +0000)]
commentary

5 years agoassert our arguments
Ian Jackson [Fri, 7 Mar 2014 18:45:51 +0000 (18:45 +0000)]
assert our arguments

5 years agodo not leak prob when retrying
Ian Jackson [Fri, 7 Mar 2014 18:43:49 +0000 (18:43 +0000)]
do not leak prob when retrying

5 years agosearch in order by max hamming weight
Ian Jackson [Fri, 7 Mar 2014 18:09:46 +0000 (18:09 +0000)]
search in order by max hamming weight

5 years agoRevert "loop in reverse order - this is a better search path"
Ian Jackson [Fri, 7 Mar 2014 17:48:30 +0000 (17:48 +0000)]
Revert "loop in reverse order - this is a better search path"

This reverts commit 35e60acecf2f2657a3fd53f89053de9e57a0d7fe.

Doesn't actually seem to help that much.

5 years agoloop in reverse order - this is a better search path
Ian Jackson [Fri, 7 Mar 2014 17:38:21 +0000 (17:38 +0000)]
loop in reverse order - this is a better search path

5 years agoRevert "mix up the order" and "mix up the order"
Ian Jackson [Fri, 7 Mar 2014 17:35:56 +0000 (17:35 +0000)]
Revert "mix up the order" and "mix up the order"

This is not correct; I think it doesn't in fact search all relevant
bit patterns.

5 years agomix up the order, print better
Ian Jackson [Fri, 7 Mar 2014 17:31:29 +0000 (17:31 +0000)]
mix up the order, print better

5 years agomix up the order
Ian Jackson [Fri, 7 Mar 2014 17:24:49 +0000 (17:24 +0000)]
mix up the order

5 years agoerror fixes; tried interior but doesn't work (EINSTAB) and docs say cannot cope with...
Ian Jackson [Fri, 7 Mar 2014 16:54:20 +0000 (16:54 +0000)]
error fixes; tried interior but doesn't work (EINSTAB) and docs say cannot cope with dense columns of which our X_minimum is one

5 years agoprint best solution
Ian Jackson [Fri, 7 Mar 2014 16:50:18 +0000 (16:50 +0000)]
print best solution

5 years agoimprove maxminsize thing
Ian Jackson [Fri, 7 Mar 2014 16:37:47 +0000 (16:37 +0000)]
improve maxminsize thing

5 years agofix printing more
Ian Jackson [Fri, 7 Mar 2014 16:37:17 +0000 (16:37 +0000)]
fix printing more

5 years agoless printing, optimise
Ian Jackson [Fri, 7 Mar 2014 16:28:26 +0000 (16:28 +0000)]
less printing, optimise

5 years agooutput improvements
Ian Jackson [Fri, 7 Mar 2014 16:08:58 +0000 (16:08 +0000)]
output improvements

5 years agowip lp seems to work so far...
Ian Jackson [Fri, 7 Mar 2014 16:01:09 +0000 (16:01 +0000)]
wip lp seems to work so far...

5 years agowip lp, results, compiles
Ian Jackson [Fri, 7 Mar 2014 15:32:54 +0000 (15:32 +0000)]
wip lp, results, compiles

5 years agowip lp, problem setup compiles
Ian Jackson [Fri, 7 Mar 2014 14:55:30 +0000 (14:55 +0000)]
wip lp, problem setup compiles

5 years agowip lp
Ian Jackson [Fri, 7 Mar 2014 14:52:13 +0000 (14:52 +0000)]
wip lp

5 years agowip lp notes before condense
Ian Jackson [Fri, 7 Mar 2014 13:44:10 +0000 (13:44 +0000)]
wip lp notes before condense

5 years agowip, builds, before glpk
Ian Jackson [Fri, 7 Mar 2014 13:29:02 +0000 (13:29 +0000)]
wip, builds, before glpk

5 years agowip
Ian Jackson [Fri, 7 Mar 2014 13:22:08 +0000 (13:22 +0000)]
wip