1
0

56 Commits

Author SHA1 Message Date
8e21f972be
Update figure output 2021-07-26 12:59:31 +10:00
2ca68eb05b
Complete incremental benchmarks 2021-07-26 12:40:33 +10:00
a8ef3e1312
Merge commit 'c6a967f23a254ec85f50a83266826f74c7f77ef5' into develop 2021-07-13 15:23:55 +10:00
c6a967f23a Squashed 'software/mza/' changes from 15b5b1ca03..b74e0a6989
b74e0a6989 Use correct bounds when only infinite on one side
4b12442928 Use Val comparison for infinity check
5a4119666a Add untrailing for constraint removal
b44ed554c6 FIXME: do not clear global registers. This does not work in the incremental case
4fce29b144 Ensure trailing of aliases happens after actual aliasing operations

git-subtree-dir: software/mza
git-subtree-split: b74e0a698981985cdf4979c6e533ded5d2adc349
2021-07-13 15:23:55 +10:00
17c3b07111
Merge commit 'de3359c8ebda7c605760e41bd1f4387633424709' into develop 2021-07-13 11:54:18 +10:00
de3359c8eb Squashed 'software/gecode/' changes from 70a1cfa856..0a39b58153
0a39b58153 Subsume complete propagator instead of failing it
f95e9e4295 Fix mistake in FlatZincSpace copy constructor

git-subtree-dir: software/gecode
git-subtree-split: 0a39b581532f250f13be0f41787bd4b0e35f648c
2021-07-13 11:54:18 +10:00
4fe5775e57 Squashed 'software/mza/' changes from bf2c1f31bc..15b5b1ca03
15b5b1ca03 Fix switch statements that are missing breaks

git-subtree-dir: software/mza
git-subtree-split: 15b5b1ca037af71d787adf84594ef2774263fbd6
2021-07-12 20:10:19 +10:00
6a3055587e
Merge commit '4fe5775e57bcf3d5b6c7df13f11a1f7c3c3615cb' into develop 2021-07-12 20:10:19 +10:00
fb797c8876
Merge commit '2c8ad0004aacbd87b80f67970c2da0d051ff8279' into develop 2021-07-12 20:09:34 +10:00
2c8ad0004a Squashed 'software/minizinc/' changes from 4f10c82056..93be33a6c2
93be33a6c2 Add complete predicate
REVERT: 4f10c82056 Merge branch 'MiniZinc:master' into feature/on_restart
REVERT: 0848ce7ec7 Add changelog for 2.5.5
REVERT: 44e2f770d5 Add test for insertion of ArrayLits into CSE
REVERT: 8a68d3dea8 Don't insert par expressions into CSE map unless they're an ArrayLit
REVERT: 6bf6f1180f Increase version number of development build
REVERT: dcaac92a74 Make min/max on array of opt vars return non-optional var. This is consistent with other functions on optional arrays like sum, product, exists, forall.
REVERT: 32aa288884 Update changelog
REVERT: a4edf0669f Fix flattening of all-par set literals
REVERT: 8c1c9605f6 Fix chain compressor, needs to ignore par constants
REVERT: 0cad1c6306 Use file_path on include paths to ensure separator consistency
REVERT: 05ad7d1931 Update changelog
REVERT: 22f5e2557b Define HAVE_CONFIG_H only for UNIX
REVERT: 81c7778d55 Define HAVE_CONFIG_H for CBC
REVERT: 1f56608e10 mzn-test: don't check symmetry breaking constraints
REVERT: 1a9767457e mzn-test: fix parsing %%%mzn-stat: ... output
REVERT: a41533fd54 MIP: report CPU time in %%%mzn-stat: solveTime=
REVERT: 9d490acd52 Updated docs on OR-Tools v8 installation
REVERT: c513f6599f Add changelog for 2.5.4
REVERT: b2eef2772b Follow ids to declarations when flattening par arrays. Fixes #448.
REVERT: c5c846d426 Check if result of flattening rhs of a vardecl is par.
REVERT: c496052767 Escape strings when pretty printing include items
REVERT: 9e379c995e Canonicalise file names before adding include items into "already seen" list
REVERT: d5d5d0d88c Use generic flattening inside generators. Fixes #451.
REVERT: dc8630a6e9 Small fix to multi-pass library change: use original include path if it is absolute
REVERT: 79c6092bd8 Strip library paths from includes in multi-pass compilation. Fixes #455.
REVERT: 897875d6d7 Compile infinite domains with holes into constraints. Fixes #457.
REVERT: b4e700dc67 Don't create copies of global declarations when creating par versions of functions
REVERT: 0e8cc42bb1 Fix typechecker to coerce bool to int in the objective.
REVERT: e05523b344 Add test for dzn output of arrays
REVERT: 1e0269000e Don't evaluate output_only arrays when generating dzn output.
REVERT: 57018c31d6 Fix matrix transposition in lex2 globals
REVERT: 2617c0c829 Fix output variables in lex_chain tests
REVERT: ef1a250c98 another efort to fix tests
REVERT: c00e199dfd Fix test globals_lex_chain.mzn
REVERT: b5c997d045 Fix code analysis
REVERT: 3352cf0bd5 SCIP constraint handler for lex_chain_..._orbitope
REVERT: 4e71a2cc97 Globals lex_chain_..., including lex_chain_..._orbitope
REVERT: d807428baf Move test specifcation into the correct folder
REVERT: 5be74bc74d MIP decompositions for lex_less_(bool, int, float)
REVERT: 36a554ba40 Don't modify infinte domain of optional variables. Fixes #456.
REVERT: f9e5306d75 Run clang-format
REVERT: 4b57667608 Fix comment reference to relevant test case
REVERT: 648f2ab36d Fix equality of indirection annotations
REVERT: ef7be5fd78 MIP decompositions for lex_lesseq_(bool=int, float)
REVERT: 6511b14e73 Propagate cv flag correctly.
REVERT: 6f27ecf1c0 Never insert par expressions into the CSE map.
REVERT: 7414f3ca0f Fix cplex id in example configuration
REVERT: 7ad7cec506 Update strictly_decreasing with documentation and opt version
REVERT: 8029f6e957 Support undefined enums in type checker.
REVERT: 79e0f0f546 Revert using mzn_in_symmetry_breaking_constraint() for SCIP's orbisack
REVERT: e88efda76c Fix format
REVERT: 4802031dc1 Added test mzn_in_symmetry_breaking_constraint()
REVERT: e21cc2515a More format fixes 02 ...
REVERT: 5bbd67c130 More format fixes...
REVERT: d5f9b777ea Format fixes
REVERT: 43757a09a0 Remove MIP-specific fzn_less(eq)_bool(_reif).mzn
REVERT: c93b5736a3 SCIP: orbisack constraint handler 'fzn_lex_lesseq__orbisack'
REVERT: 4516bb4e2c mzn-test.py: add OR-Tools as checker
REVERT: e2176f017d Add fix and test for crash with empty enum.
REVERT: ac7db35951 Fix documentation bugs.
REVERT: 47ba245832 Fix the incorrect renaming of key in model output interface
REVERT: 925796ed20 Fail on empty var domains in agenda
REVERT: 1ec19d7025 Fix error messages in CMake FindGurobi, FindCPlex
REVERT: 6d169475c1 mzn-test.py: Use -i for intermediate solutions
REVERT: df2f3e423a Allow coercion of JSON lists to enum definitions
REVERT: 2b0b8165e5 Fix clang-tidy errors
REVERT: 6597bc1920 Change the CI build image location
REVERT: 360c988452 Remove illegal duplicate keys in .gitlab-ci.yml
REVERT: 6a5d69c64b Add missing par opt versions of coercion functions
REVERT: 63014e3d8f Don't propagate annotations into annotation calls. Avoids infinite recursion.
REVERT: 54b19428ab Don't use GRB_INT_PAR_NONCONVEX if it's undefined
REVERT: a5bb56c47d Added piecewise_linear for non-continuous intervals

git-subtree-dir: software/minizinc
git-subtree-split: 93be33a6c254e54be7cd38abb7ebd6a6022f0c46
2021-07-12 20:08:41 +10:00
9e7a53acdd
Change to pyflow 2021-07-12 20:08:20 +10:00
b5ed4bc90e
Merge commit '5df85436d574a843ea4c3f7107149d5b494b94a1' into develop 2021-07-12 17:09:13 +10:00
5df85436d5 Squashed 'software/mza/' changes from 9c048083d6..bf2c1f31bc
bf2c1f31bc Ensure CMake links Gecode libraries in the correct order
4c233da54d  Install shared library

git-subtree-dir: software/mza
git-subtree-split: bf2c1f31bcc885dd6e838bffd46eac23f1d10274
2021-07-12 17:08:49 +10:00
1ec86bc709
Merge commit '0e88ebc728dfa90111db66372bbbb37cefe77c20' into develop 2021-07-12 11:05:20 +10:00
0e88ebc728 Squashed 'software/mza/' changes from f970a59b17..9c048083d6
9c048083d6 Update cached parsers and lexers

git-subtree-dir: software/mza
git-subtree-split: 9c048083d6c7d54980927e33dc324ca4dcb029e6
2021-07-12 11:05:20 +10:00
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
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
edcced7f58 Merge commit 'f2a1c4e38910290dc9c0caf84e7d104e58eb7b49' as 'software/mza' 2021-07-11 16:34:30 +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
93c38edc9f
Merge commit '67191769756e84fc5b7b3c401048fef6b8adff67' into develop 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
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
494892dbc3 Merge commit 'fad1b0701819594e9eaaa4fd50a9d7e6dd187510' as 'software/minizinc' 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