1
0
This repository has been archived on 2025-03-06. You can view files and clone it, but cannot push or open issues or pull requests.
Jip J. Dekker 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

144 lines
3.8 KiB
MiniZinc

/***
@groupdef internal Restart Builtins
These annotations and functions provide the basic building blocks to implement
meta-heuristics and governed search with the use of solver internal values and
functionality.
*/
/*
A search annotation that supplies a function to be executed on restart
*/
ann: on_restart(string: pred);
/*
The 'status' function reports the status of the solver (before restarting).
*/
enum STATUS = {START, UNKNOWN, UNSAT, SAT, OPT};
function var STATUS: status();
/*
When complete is set to 'true', then it marks the search as complete.
*/
predicate complete();% = abort("'complete' should be used in reified context");
predicate complete_reif(var bool: marker);
/*
The 'uniform' function provides random values chosen by the solver. The arguments
to the function limit the values to a certain domain.
*/
function var int: uniform_internal(int: i, int: j) ::impure = int_uniform(i, j);
function var int: uniform_internal(set of int: S) ::impure =
if card(S) == max(S) - min(S) + 1 then
int_uniform(min(S),max(S))
else
[ i | i in S ][int_uniform(1,card(S))]
endif;
/*
'int_uniform' is the random intrinsic that needs to be implemented by the solver.
*/
function var int: int_uniform(int: a, int: b) ::impure;
/*
The 'lastval' functions provides access to last values taken by a model
variables. The lastval functions are only safe to use when the STATUS has been
SAT or OPT.
*/
function var bool: lastval(var bool: x) =
if is_fixed(x) then
fix(x)
else
bool_lastval(x)
endif;
function var float: lastval(var float: x) =
if is_fixed(x) then
fix(x)
else
float_lastval(x)
endif;
function var int: lastval(var int: x) =
if is_fixed(x) then
fix(x)
else
int_lastval(x)
endif;
/*
'bool_lastval', 'float_lastval', and 'int_lastval' are the solution intrinsics that needs
to be implemented by the solver.
*/
function var bool: bool_lastval(var bool: a);
function var float: float_lastval(var float: a);
function var int: int_lastval(var int: a);
/*
The 'sol' functions provides access to solution values of model variables. The
lastval functions are only safe to use when the STATUS has been SAT or OPT.
*/
function var bool: sol(var bool: x) =
if is_fixed(x) then
fix(x)
else
bool_sol(x)
endif;
function var float: sol(var float: x) =
if is_fixed(x) then
fix(x)
else
float_sol(x)
endif;
function var int: sol(var int: x) =
if is_fixed(x) then
fix(x)
else
int_sol(x)
endif;
function array[int] of var bool: sol(array[int] of var bool: x) =
[if is_fixed(x[i]) then fix(x[i]) else bool_sol(x[i]) endif | i in index_set(x)];
function array[int] of var float: sol(array[int] of var float: x) =
[if is_fixed(x[i]) then fix(x[i]) else float_sol(x[i]) endif | i in index_set(x)];
function array[int] of var int: sol(array[int] of var int: x) =
[if is_fixed(x[i]) then fix(x[i]) else int_sol(x[i]) endif | i in index_set(x)];
/*
'bool_rnd', 'float_sol', and 'int_sol' are the solution intrinsics that needs
to be implemented by the solver.
*/
function var bool: bool_sol(var bool: a);
function var float: float_sol(var float: a);
function var int: int_sol(var int: a);
/*
'basic_lns' provides LNS in its simplest form where one nbh is applied on
every restart.
*/
predicate basic_lns(var bool: nbh) =
(status() != START) -> nbh;
/*
'round_robin' provides a metaheuristic for LNS where each neighbourhood is
chosen sequentially.
*/
predicate round_robin(array[int] of var bool: nbhs) =
let {
int: len = length(nbhs);
% Transposed neighbourhoods in case of index set not starting from 1
array[1..len] of var bool: t_nbhs = [ bv | bv in nbhs];
% Neighbourhood selection
var -1..len-1: select;
} in forall(i in 1..len) ( (select-1 == i) -> t_nbhs[i]) /\
if status() == START then
select = -1
else
select = (sol(select) + 1) mod len
endif;