sat: export from google3

google · Jul 18, 2023 · f98f5f5 · f98f5f5
1 parent 22e59eb
commit f98f5f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ortools/sat/sat_runner.cc b/ortools/sat/sat_runner.cc
@@ -161,8 +161,10 @@ bool LoadBooleanProblem(const std::string& filename,
       LOG(FATAL) << "Cannot load file '" << filename << "'.";
     }
   } else if (absl::EndsWith(filename, ".cnf") ||
+             absl::EndsWith(filename, ".cnf.xz") ||
              absl::EndsWith(filename, ".cnf.gz") ||
              absl::EndsWith(filename, ".wcnf") ||
+             absl::EndsWith(filename, ".wcnf.xz") ||
              absl::EndsWith(filename, ".wcnf.gz")) {
     SatCnfReader reader(absl::GetFlag(FLAGS_wcnf_use_strong_slack));
     if (absl::GetFlag(FLAGS_fu_malik) || absl::GetFlag(FLAGS_linear_scan) ||

diff --git a/ortools/sat/subsolver.h b/ortools/sat/subsolver.h
@@ -141,8 +141,7 @@ class SubSolver {
 // A simple wrapper to add a synchronization point in the list of subsolvers.
 class SynchronizationPoint : public SubSolver {
  public:
-  explicit SynchronizationPoint(const std::string& name,
-                                std::function<void()> f)
+  explicit SynchronizationPoint(absl::string_view name, std::function<void()> f)
       : SubSolver(name, HELPER), f_(std::move(f)) {}
   bool TaskIsAvailable() final { return false; }
   std::function<void()> GenerateTask(int64_t /*task_id*/) final {