always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FZ] remove obsolete warm_start annotation that was missing in minizinc 2.6.1; tweak ortools.msc.in; add -v flag

Browse Source
This commit is contained in:
Laurent Perron
2022-05-22 14:59:22 +02:00
parent af43bb7433
commit c2b97cac86
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ortools/flatzinc/fz.cc
View File

@@ -100,6 +100,9 @@ std::vector<char*> FixAndParseParameters(int* argc, char*** argv) {
(*argv)[i] = time_param;
use_time_param = true;
}
if (strcmp((*argv)[i], "-v") == 0) {
(*argv)[i] = logging_param;
}
}
const char kUsage[] =
"Usage: see flags.\nThis program parses and solve a flatzinc problem.";

14
ortools/flatzinc/mznlib/redefinitions-2.0.mzn
View File

@@ -98,17 +98,3 @@ predicate int_lin_ne_imp(array [int] of int: as, array [int] of var int: bs,
int: c, var bool: r);
annotation warm_start_array( array[int] of ann: w );
annotation warm_start( array[int] of var bool: x, array[int] of opt bool: v ) =
assert(index_sets_agree(x, v), "index sets of warm_start arguments don't agree",
let {
any: xx = [ x[i] | i in index_set(x) where occurs(v[i])];
any: vv = [ deopt(v[i]) | i in index_set(x) where occurs(v[i])];
} in warm_start(xx, vv));
annotation warm_start( array[int] of var int: x, array[int] of opt int: v ) =
assert(index_sets_agree(x, v), "index sets of warm_start arguments don't agree",
let {
any: xx = [ x[i] | i in index_set(x) where occurs(v[i])];
any: vv = [ deopt(v[i]) | i in index_set(x) where occurs(v[i])];
} in warm_start(xx, vv));

4
ortools/flatzinc/ortools.msc.in
View File

@@ -6,11 +6,9 @@
"mznlib": "../ortools",
"executable": "@FZ_REL_INSTALL_BINARY@",
"tags": ["ortools", "cp", "lcg", "float", "int"],
"stdFlags": ["-a","-f","-n","-p","-r","-s","-v"],
"stdFlags": ["-a","-f","-n","-p","-r","-s","-v","-l"],
"extraFlags": [
["--cp_model_params", "Provide parameters interpreted as a text SatParameters proto", "string", ""],
["--fz_floats_are_ints", "Interpret floats as integers", "bool:false:true", "true"],
["-l", "Print logging information", "bool", "false"]
],
"supportsMzn": false,
"supportsFzn": true,