chiark
/
gitweb
/
~ianmdlvl
/
matchsticks-search.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eee0048
)
commentary: clarify and fix input vs output confusion
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 9 Mar 2014 12:20:50 +0000
(12:20 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 9 Mar 2014 12:22:42 +0000
(12:22 +0000)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index b7aae53e43007901eb4a547a2d52a188eb61efc2..93dc7ebe5325269db8fda05f5fe954a081489ed3 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-58,7
+58,8
@@
*
* We search all possible adjacency matrices, and for each one we run
* GLPK's simplex solver. We represent the adjacency matrix as an
*
* We search all possible adjacency matrices, and for each one we run
* GLPK's simplex solver. We represent the adjacency matrix as an
- * array of bitmaps.
+ * array of bitmaps: one word per input stick, with one bit per output
+ * stick.
*
* However, there are a couple of wrinkles:
*
*
* However, there are a couple of wrinkles:
*
@@
-76,7
+77,7
@@
* nondecreasing in array order.
*
* Once we have a solution, we also avoid considering any candidate
* nondecreasing in array order.
*
* Once we have a solution, we also avoid considering any candidate
- * which involves dividing one of the
out
put sticks into so many
+ * which involves dividing one of the
in
put sticks into so many
* fragment that the smallest fragment would necessarily be no bigger
* than our best solution. That is, we reject candidates where any of
* the hamming weights of the adjacency bitmap words are too large.
* fragment that the smallest fragment would necessarily be no bigger
* than our best solution. That is, we reject candidates where any of
* the hamming weights of the adjacency bitmap words are too large.