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
233 lines
8.0 KiB
C++
233 lines
8.0 KiB
C++
/* -*- mode: C++; c-basic-offset: 2; indent-tabs-mode: nil -*- */
|
|
|
|
/*
|
|
* Main authors:
|
|
* Guido Tack <guido.tack@monash.edu>
|
|
*/
|
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <minizinc/eval_par.hh>
|
|
#include <minizinc/solver_instance_base.hh>
|
|
|
|
#ifdef _MSC_VER
|
|
#define _CRT_SECURE_NO_WARNINGS
|
|
#endif
|
|
|
|
namespace MiniZinc {
|
|
|
|
SolverInstanceBase::Status SolverInstanceBase::solve() { return SolverInstance__ERROR; }
|
|
|
|
void SolverInstanceBase::reset() { assert(false); }
|
|
|
|
void SolverInstanceBase::resetWithConstraints(Model::iterator begin, Model::iterator end) {
|
|
assert(false);
|
|
}
|
|
|
|
void SolverInstanceBase::processPermanentConstraints(Model::iterator begin, Model::iterator end) {
|
|
assert(false);
|
|
}
|
|
|
|
void Registry::add(const ASTString name, poster p) { _registry.insert(std::make_pair(name, p)); }
|
|
void Registry::add(const std::string& name, poster p) {
|
|
GCLock lock;
|
|
ASTString str(name);
|
|
return add(str, p);
|
|
}
|
|
void Registry::post(Call* c) {
|
|
auto it = _registry.find(c->id());
|
|
if (it == _registry.end()) {
|
|
std::ostringstream ss;
|
|
ss << "Error: solver backend cannot handle constraint: " << c->id();
|
|
throw InternalError(ss.str());
|
|
}
|
|
it->second(_base, c);
|
|
}
|
|
|
|
void SolverInstanceBase::printSolution() {
|
|
std::ostringstream oss;
|
|
|
|
if (_options->printStatistics) {
|
|
printStatistics(); // Insert stats before sol separator
|
|
}
|
|
if (nullptr == _pS2Out) {
|
|
getEnv()->evalOutput(std::cout, std::cerr); // deprecated
|
|
std::cout << oss.str();
|
|
if ((!oss.str().empty()) && '\n' != oss.str().back()) {
|
|
std::cout << '\n';
|
|
}
|
|
std::cout << "----------" << std::endl;
|
|
} else {
|
|
getSolns2Out()->evalOutput(oss.str());
|
|
}
|
|
}
|
|
|
|
void SolverInstanceBase2::printSolution() {
|
|
GCLock lock;
|
|
assignSolutionToOutput();
|
|
SolverInstanceBase::printSolution();
|
|
}
|
|
|
|
// void
|
|
// SolverInstanceBase::assignSolutionToOutput() {
|
|
// for (VarDeclIterator it = getEnv()->output()->vardecls().begin(); it !=
|
|
// getEnv()->output()->vardecls().end(); ++it) {
|
|
// if (it->e()->e() == NULL) {
|
|
// it->e()->e(getSolutionValue(it->e()->id()));
|
|
// }
|
|
// }
|
|
// }
|
|
|
|
void SolverInstanceBase2::assignSolutionToOutput() {
|
|
GCLock lock;
|
|
|
|
MZN_ASSERT_HARD_MSG(
|
|
nullptr != _pS2Out,
|
|
"Setup a Solns2Out object to use default solution extraction/reporting procs");
|
|
|
|
if (_varsWithOutput.empty()) {
|
|
for (VarDeclIterator it = getEnv()->flat()->vardecls().begin();
|
|
it != getEnv()->flat()->vardecls().end(); ++it) {
|
|
if (!it->removed()) {
|
|
VarDecl* vd = it->e();
|
|
if (!vd->ann().isEmpty()) {
|
|
if (vd->ann().containsCall(constants().ann.output_array.aststr()) ||
|
|
vd->ann().contains(constants().ann.output_var)) {
|
|
_varsWithOutput.push_back(vd);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
_pS2Out->declNewOutput(); // Even for empty output decl
|
|
|
|
// iterate over set of ids that have an output annotation && obtain their right hand side from the
|
|
// flat model
|
|
for (auto* vd : _varsWithOutput) {
|
|
// std::cout << "DEBUG: Looking at var-decl with output-annotation: " << *vd << std::endl;
|
|
if (Call* output_array_ann = Expression::dynamicCast<Call>(
|
|
get_annotation(vd->ann(), constants().ann.output_array.aststr()))) {
|
|
assert(vd->e());
|
|
|
|
if (auto* al = vd->e()->dynamicCast<ArrayLit>()) {
|
|
std::vector<Expression*> array_elems;
|
|
ArrayLit& array = *al;
|
|
for (unsigned int j = 0; j < array.size(); j++) {
|
|
if (Id* id = array[j]->dynamicCast<Id>()) {
|
|
// std::cout << "DEBUG: getting solution value from " << *id << " : " << id->v() <<
|
|
// std::endl;
|
|
array_elems.push_back(getSolutionValue(id));
|
|
} else if (auto* floatLit = array[j]->dynamicCast<FloatLit>()) {
|
|
array_elems.push_back(floatLit);
|
|
} else if (auto* intLit = array[j]->dynamicCast<IntLit>()) {
|
|
array_elems.push_back(intLit);
|
|
} else if (auto* boolLit = array[j]->dynamicCast<BoolLit>()) {
|
|
array_elems.push_back(boolLit);
|
|
} else if (auto* setLit = array[j]->dynamicCast<SetLit>()) {
|
|
array_elems.push_back(setLit);
|
|
} else if (auto* strLit = array[j]->dynamicCast<StringLit>()) {
|
|
array_elems.push_back(strLit);
|
|
} else {
|
|
std::ostringstream oss;
|
|
oss << "Error: array element " << *array[j] << " is not an id nor a literal";
|
|
throw InternalError(oss.str());
|
|
}
|
|
}
|
|
GCLock lock;
|
|
ArrayLit* dims;
|
|
Expression* e = output_array_ann->arg(0);
|
|
if (auto* al = e->dynamicCast<ArrayLit>()) {
|
|
dims = al;
|
|
} else if (Id* id = e->dynamicCast<Id>()) {
|
|
dims = id->decl()->e()->cast<ArrayLit>();
|
|
} else {
|
|
throw -1;
|
|
}
|
|
std::vector<std::pair<int, int> > dims_v;
|
|
for (int i = 0; i < dims->length(); i++) {
|
|
IntSetVal* isv = eval_intset(getEnv()->envi(), (*dims)[i]);
|
|
if (isv->size() == 0) {
|
|
dims_v.emplace_back(1, 0);
|
|
} else {
|
|
dims_v.emplace_back(static_cast<int>(isv->min().toInt()),
|
|
static_cast<int>(isv->max().toInt()));
|
|
}
|
|
}
|
|
auto* array_solution = new ArrayLit(Location(), array_elems, dims_v);
|
|
KeepAlive ka(array_solution);
|
|
auto& de = getSolns2Out()->findOutputVar(vd->id()->str());
|
|
de.first->e(array_solution);
|
|
}
|
|
} else if (vd->ann().contains(constants().ann.output_var)) {
|
|
Expression* sol = getSolutionValue(vd->id());
|
|
vd->e(sol);
|
|
auto& de = getSolns2Out()->findOutputVar(vd->id()->str());
|
|
de.first->e(sol);
|
|
}
|
|
}
|
|
}
|
|
|
|
void SolverInstanceBase::flattenSearchAnnotations(const Annotation& ann,
|
|
std::vector<Expression*>& out) {
|
|
for (ExpressionSetIter i = ann.begin(); i != ann.end(); ++i) {
|
|
Expression* e = *i;
|
|
if (e->isa<Call>() &&
|
|
(e->cast<Call>()->id() == "seq_search" || e->cast<Call>()->id() == "warm_start_array")) {
|
|
Call* c = e->cast<Call>();
|
|
auto* anns = c->arg(0)->cast<ArrayLit>();
|
|
for (unsigned int i = 0; i < anns->size(); i++) {
|
|
Annotation subann;
|
|
subann.add((*anns)[i]);
|
|
flattenSearchAnnotations(subann, out);
|
|
}
|
|
} else {
|
|
out.push_back(*i);
|
|
}
|
|
}
|
|
}
|
|
|
|
void SolverInstanceBase::flattenMultipleObjectives(const Annotation& ann,
|
|
MultipleObjectives& mo) const {
|
|
int nGoalH = 0;
|
|
for (ExpressionSetIter i = ann.begin(); i != ann.end(); ++i) {
|
|
MZN_ASSERT_HARD_MSG(0 == nGoalH++, "Several goal hierarchies provided");
|
|
Expression* e = *i;
|
|
if (e->isa<Call>() && (e->cast<Call>()->id() == "goal_hierarchy")) {
|
|
MZN_ASSERT_HARD_MSG(getEnv()->flat()->solveItem()->st() == SolveI::SolveType::ST_SAT,
|
|
"goal_hierarchy provided but solve item is not SAT");
|
|
Call* c = e->cast<Call>();
|
|
auto* anns = c->arg(0)->cast<ArrayLit>();
|
|
for (unsigned int i = 0; i < anns->size(); i++) {
|
|
Annotation subann;
|
|
subann.add((*anns)[i]);
|
|
MultipleObjectives::Objective obj;
|
|
flattenMultObjComponent(subann, obj);
|
|
mo.add(obj);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void SolverInstanceBase::flattenMultObjComponent(const Annotation& ann,
|
|
MultipleObjectives::Objective& obj) {
|
|
MZN_ASSERT_HARD(!ann.isEmpty());
|
|
Expression* e = *ann.begin();
|
|
MZN_ASSERT_HARD(e->isa<Call>());
|
|
Call* c = e->cast<Call>();
|
|
obj.setVariable(c->arg(0));
|
|
const auto id = c->id();
|
|
if (id == "min_goal" || id == "int_min_goal" || id == "float_min_goal") {
|
|
obj.setWeight(-1.0);
|
|
} else if (id == "sat_goal" || id == "max_goal" || id == "int_max_goal" ||
|
|
id == "float_max_goal") {
|
|
obj.setWeight(1.0);
|
|
} else {
|
|
MZN_ASSERT_HARD_MSG(false, "unknown goal: " << id);
|
|
}
|
|
}
|
|
|
|
} // namespace MiniZinc
|