1
0

41 Commits

Author SHA1 Message Date
4b50f50602 Merge commit '2572df06639bafaae65b2e919291f0306da6b010' as 'software/gecode_base' 2021-07-11 17:26:05 +10:00
2572df0663 Squashed 'software/gecode_base/' content from commit bbefcea214
git-subtree-dir: software/gecode_base
git-subtree-split: bbefcea214fec798a0f5acc442581984555acd21
2021-07-11 17:26:05 +10:00
edcced7f58 Merge commit 'f2a1c4e38910290dc9c0caf84e7d104e58eb7b49' as 'software/mza' 2021-07-11 16:34:30 +10:00
f2a1c4e389 Squashed 'software/mza/' content from commit f970a59b17
git-subtree-dir: software/mza
git-subtree-split: f970a59b177c13ca3dd8aaef8cc6681d83b7e813
2021-07-11 16:34:30 +10:00
93c38edc9f
Merge commit '67191769756e84fc5b7b3c401048fef6b8adff67' into develop 2021-07-11 16:26:15 +10:00
6719176975 Squashed 'software/gecode/' changes from 313e87646d..70a1cfa856
70a1cfa856 Add reasoning about why a restart happens
5db96c6afc Add initial version of the 'complete' propagator
3410436fc5 Fix include problems on Linux and Windows
0218f3e7be Remove deprecated restart_count from the variables set on restart
7f4a528ced Fix makefile mistake for LastVal constraint
8a39aee00d Initialise LastVal stored as the minimal in the domain
86707c674e Update STATUS to match the new enum
44d672100f Add support for LastVal from FlatZinc
bd8af2e8f6 Subsume after propagation
2f07e027ab Add LastVal propagator
f05cf9daba Output number of copies
707e30c0f0 Update generated parser files
179ee693cc Add restart_number() builtin (to work around the problem that otherwise we can't implement round robin style search)
04a492da17 Fix restart numbers (didn't count incomplete neighbourhoods)
fbaa3529ec Initial implementation of on_restart
6dd39a73dd Update LICENSE
8f5ea30eba Update LICENSE
4236a2e5ec Use std::vector instead of std::array
c53655d685 Dynamically adjust test batch sizes
37248557b6 Require C++11
cc60ea7cde Minor, remove exraneous newline in changelog
74c5f54b9f Make Region pool thread local
6f04ac3514 Use atomic for propagator identifier
2e0c275b07 Add support for parallel testing
3ada422b76 Refactor, extracted run_test function
787c41b8c4 Refactor, move data and logic into Options
120fc512a7 Refactor, extract run_tests function
85dd87a4af Refactoring: Thread rand through calls in test
cece9da4ef Refactor Assignments operator() to has_more
564410e4ee Refactor Assignment operator++ to next()
e1c84af894 Separate test filtering from running
8558856298 Remove empty statement warnings
a9d8cb64fa Fix compilation errors for CPProfiler support
9ec81a69b2 Add RestartStop
REVERT: 313e87646d Fix include problems on Linux and Windows
REVERT: 358b8ca63b Remove deprecated restart_count from the variables set on restart
REVERT: 83508d5de2 Fix makefile mistake for LastVal constraint
REVERT: 530bbaf107 Initialise LastVal stored as the minimal in the domain
REVERT: 96ba0d3d7e Update STATUS to match the new enum
REVERT: 7d772297f9 Add support for LastVal from FlatZinc
REVERT: 98b0162d75 Subsume after propagation
REVERT: 5cd4552144 Add LastVal propagator
REVERT: 9b80e644b7 Output number of copies
REVERT: aaa5301366 Update generated parser files
REVERT: 6ff4efe6a4 Add restart_number() builtin (to work around the problem that otherwise we can't implement round robin style search)
REVERT: 8bcbec5d6e Fix restart numbers (didn't count incomplete neighbourhoods)
REVERT: 3f63e743b2 Initial implementation of on_restart
REVERT: b6ffa462d1 Update LICENSE
REVERT: ad0621c26c Update LICENSE
REVERT: 93caa97684 Use std::vector instead of std::array
REVERT: 32d6399b35 Dynamically adjust test batch sizes
REVERT: e7f00e9977 Require C++11
REVERT: a5ba8e4282 Minor, remove exraneous newline in changelog
REVERT: b24831354d Make Region pool thread local
REVERT: b1a109ac2e Use atomic for propagator identifier
REVERT: 3d77aaad71 Add support for parallel testing
REVERT: b1b9526049 Refactor, extracted run_test function
REVERT: 85b8a57f65 Refactor, move data and logic into Options
REVERT: d2c1961437 Refactor, extract run_tests function
REVERT: 0236327c75 Refactoring: Thread rand through calls in test
REVERT: ba81289b02 Refactor Assignments operator() to has_more
REVERT: 038a554bd8 Refactor Assignment operator++ to next()
REVERT: f34f125131 Separate test filtering from running
REVERT: cec6336ede Remove empty statement warnings
REVERT: d63e1fc042 Fix compilation errors for CPProfiler support

git-subtree-dir: software/gecode
git-subtree-split: 70a1cfa856d138b0845d2681c46ca16f8507aebf
2021-07-11 16:26:15 +10:00
9b50450c4c
Initial changes to merge incremental benchmarks 2021-07-11 16:25:56 +10:00
5d0f0cbcff
Add Pipfile 2021-07-09 14:08:06 +10:00
36bc2de0da
Add script for cumulative graphs 2021-07-09 14:07:47 +10:00
9c494bac60
Update analysis scripts 2021-07-09 14:07:26 +10:00
ac89bcb3da
Add solver output 2021-06-23 13:46:35 +10:00
ac2c1ccd23
Use separate models for record/replay so chuffed behaves correctly 2021-06-21 10:28:12 +10:00
9071b2aa0f
Update analysis script for Gecode 2021-06-21 10:17:16 +10:00
d23f68f293
Fix time flag for new version of chuffed 2021-06-21 10:16:49 +10:00
332a237d2f
Bash variable style in gecode restart scripts 2021-06-17 17:25:18 +10:00
a46e5d70d5
Fix chuffed restarting script
(Output and timing flags have changed)
2021-06-17 17:24:53 +10:00
89528a184e
Adjust analysis scripts for Python and solver versions 2021-06-17 17:23:34 +10:00
494892dbc3 Merge commit 'fad1b0701819594e9eaaa4fd50a9d7e6dd187510' as 'software/minizinc' 2021-06-16 14:06:46 +10:00
fad1b07018 Squashed 'software/minizinc/' content from commit 4f10c8205
git-subtree-dir: software/minizinc
git-subtree-split: 4f10c82056ffcb1041d7ffef29d77a7eef92cf76
2021-06-16 14:06:46 +10:00
37038547f3 Merge commit '394edc7c8de7946c50e0260c7b9c24ea4ae878a2' as 'software/chuffed' 2021-06-16 14:06:14 +10:00
394edc7c8d Squashed 'software/chuffed/' content from commit 4b88dae8a
git-subtree-dir: software/chuffed
git-subtree-split: 4b88dae8a6c50f327e876ddcccde5bda0b01c4dc
2021-06-16 14:06:14 +10:00
8977d3498f Merge commit '981be2067eb416f6e993d02a13989d8392283a9a' as 'software/gecode_on_replay' 2021-06-16 14:04:29 +10:00
981be2067e Squashed 'software/gecode_on_replay/' content from commit 8051d92b9
git-subtree-dir: software/gecode_on_replay
git-subtree-split: 8051d92b9c89e49cccfbd1c201371580d7703ab4
2021-06-16 14:04:29 +10:00
cfbd04f911 Merge commit '3e72b0e85711db8245c5a5a7eb473c54b2f042fe' as 'software/gecode_on_record' 2021-06-16 14:03:52 +10:00
3e72b0e857 Squashed 'software/gecode_on_record/' content from commit 37ed9bda4
git-subtree-dir: software/gecode_on_record
git-subtree-split: 37ed9bda495ea87e63217c19a374b5a93bb0078e
2021-06-16 14:03:52 +10:00
1d9faf38de Squashed 'software/gecode/' content from commit 313e8764
git-subtree-dir: software/gecode
git-subtree-split: 313e87646da4fc2752a70e83df16d993121a8e40
2021-06-16 14:02:33 +10:00
bc93357f30 Merge commit '1d9faf38deff0765e571fde89caae52a99362c5b' as 'software/gecode' 2021-06-16 14:02:33 +10:00
8f027a0b82
Remove submodules (to be replaced by subtrees) 2021-06-16 14:01:10 +10:00
15043f0d55
Adjust models to use newest restart library (suing lastval) 2021-06-16 13:36:28 +10:00
12a32b4a0e
Adjust scripts for bash 2021-06-16 13:35:08 +10:00
f2ad55057a
Link solver libraries into MiniZinc 2021-06-16 13:34:22 +10:00
69f55d8f98
Add correct version of the MiniZinc compiler 2021-06-16 13:17:36 +10:00
313deabd13
Add readme file 2021-06-16 11:22:45 +10:00
957122efde
Use bash instead of zsh 2021-06-16 10:23:14 +10:00
c6a6b1795f
Format python files 2021-06-16 10:22:47 +10:00
b3e1dfe446
Build using multiple threads 2021-06-16 10:22:06 +10:00
65e1b4288e
Adjust scripts for new MiniZinc version and solver location 2021-06-15 17:37:18 +10:00
13baf4eeb4
Use same binary for restart and normal run 2021-06-15 17:34:10 +10:00
7c82ed140c
Add scripts for compiling 2021-06-15 17:11:20 +10:00
cae2b43dcc
Add software submodules for versioning 2021-06-15 16:55:12 +10:00
636185c841
Add original benchmarks 2021-06-15 16:32:27 +10:00