git
Merge branch 'master' of github.com:maloneyg/substitution-search
git
Merge branch 'master' of github.com:maloneyg/substitution-search
Fixed a bug in Server that was causing it to write results only when it had accumulated more results than at the previous write.
meaningless
Merge branch 'futures-fix'
Added TriangleResultsCombine, which is a simple class that combines several .chk files with the same prefix into a single file.
git
Merge branch 'master' of https://github.com/maloneyg/substitution-search
Added a new inflation factor. Added a bit of code to calculate inflation factors of smaller sub-patches. Added PatchCombine, which doesn't work yet, but is intended to combine two patches together into a bigger patch.
meaningless
Merge branch 'master' of github.com:maloneyg/substitution-search
Uncommented some lines in PatchAndIndex.compatible().
Prepared some files for testing.
Merge branch 'master' of github.com:maloneyg/substitution-search
Whoops I overwrote interim/tile0-final.chk. It was badly named.
I hope I fixed the problem with names.
meaningless
Merge branch 'master' of https://github.com/maloneyg/substitution-search