From 6f5052f668d36d8b8b1643ffe15ab71d4fa5266c Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Mon, 13 Dec 2021 10:45:53 +0100 Subject: [PATCH] simplify sat runner --- examples/cpp/sat_runner.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cpp/sat_runner.cc b/examples/cpp/sat_runner.cc index 9154130026..1c186dc342 100644 --- a/examples/cpp/sat_runner.cc +++ b/examples/cpp/sat_runner.cc @@ -219,14 +219,14 @@ int Run() { response.set_status(CpSolverStatus::MODEL_INVALID); return EXIT_SUCCESS; } - if (absl::GetFlag(FLAGS_use_cp_model) && cp_model.variables_size() == 0) { + if (!absl::GetFlag(FLAGS_use_cp_model)) { LOG(INFO) << "Converting to CpModelProto ..."; cp_model = BooleanProblemToCpModelproto(problem); } // TODO(user): clean this hack. Ideally LinearBooleanProblem should be // completely replaced by the more general CpModelProto. - if (!cp_model.variables().empty()) { + if (absl::GetFlag(FLAGS_use_cp_model)) { problem.Clear(); // We no longer need it, release memory. Model model; model.Add(NewSatParameters(parameters));