From 0ec562802a283e971ba2bd7c2d8a0e7682e6b66e Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Tue, 7 Jun 2022 11:27:34 +0200 Subject: [PATCH] flatzinc: sync --- ortools/flatzinc/fz.cc | 2 +- ortools/flatzinc/mznlib/redefinitions-2.0.mzn | 2 -- ortools/flatzinc/ortools.msc.in | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ortools/flatzinc/fz.cc b/ortools/flatzinc/fz.cc index 44a75a8d55..ed913691df 100644 --- a/ortools/flatzinc/fz.cc +++ b/ortools/flatzinc/fz.cc @@ -102,7 +102,7 @@ std::vector FixAndParseParameters(int* argc, char*** argv) { } if (strcmp((*argv)[i], "-v") == 0) { (*argv)[i] = logging_param; - } + } } const char kUsage[] = "Usage: see flags.\nThis program parses and solve a flatzinc problem."; diff --git a/ortools/flatzinc/mznlib/redefinitions-2.0.mzn b/ortools/flatzinc/mznlib/redefinitions-2.0.mzn index ea47763122..d797bfacc1 100644 --- a/ortools/flatzinc/mznlib/redefinitions-2.0.mzn +++ b/ortools/flatzinc/mznlib/redefinitions-2.0.mzn @@ -98,5 +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 ); - - diff --git a/ortools/flatzinc/ortools.msc.in b/ortools/flatzinc/ortools.msc.in index 2d2ef4e220..4e07880d94 100644 --- a/ortools/flatzinc/ortools.msc.in +++ b/ortools/flatzinc/ortools.msc.in @@ -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,