diff --git a/examples/cpp/BUILD.bazel b/examples/cpp/BUILD.bazel index cd8b9193ae..35d958a69c 100644 --- a/examples/cpp/BUILD.bazel +++ b/examples/cpp/BUILD.bazel @@ -129,9 +129,9 @@ cc_library( hdrs = ["parse_dimacs_assignment.h"], deps = [ "//ortools/base", - "//ortools/base:filelineiter", "//ortools/graph:ebert_graph", "//ortools/graph:linear_assignment", + "//ortools/util:filelineiter", ], ) @@ -429,7 +429,6 @@ cc_binary( "//ortools/algorithms:sparse_permutation", "//ortools/base", "//ortools/base:file", - "//ortools/base:filelineiter", "//ortools/base:threadpool", "//ortools/lp_data:mps_reader", "//ortools/lp_data:proto_utils", @@ -443,6 +442,7 @@ cc_binary( "//ortools/sat:sat_solver", "//ortools/sat:simplification", "//ortools/sat:symmetry", + "//ortools/util:filelineiter", "//ortools/util:sigint", "//ortools/util:time_limit", "@com_google_absl//absl/status", @@ -459,9 +459,9 @@ cc_binary( deps = [ "//ortools/base", "//ortools/base:file", - "//ortools/base:filelineiter", "//ortools/sat:cp_model", "//ortools/sat:model", + "//ortools/util:filelineiter", "@com_google_absl//absl/strings", ], ) @@ -553,7 +553,6 @@ cc_binary( deps = [ "//ortools/base", "//ortools/base:file", - "//ortools/base:filelineiter", "//ortools/sat:cp_model", "//ortools/sat:cp_model_solver", "//ortools/sat:disjunctive", @@ -564,6 +563,7 @@ cc_binary( "//ortools/sat:optimization", "//ortools/sat:precedences", "//ortools/sat:sat_solver", + "//ortools/util:filelineiter", "@com_google_absl//absl/strings", "@com_google_protobuf//:protobuf", ], diff --git a/examples/cpp/opb_reader.h b/examples/cpp/opb_reader.h index 69a3faf4bc..94b366f544 100644 --- a/examples/cpp/opb_reader.h +++ b/examples/cpp/opb_reader.h @@ -22,10 +22,10 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" -#include "ortools/base/filelineiter.h" #include "ortools/base/logging.h" #include "ortools/base/macros.h" #include "ortools/sat/boolean_problem.pb.h" +#include "ortools/util/filelineiter.h" namespace operations_research { namespace sat { diff --git a/examples/cpp/sat_cnf_reader.h b/examples/cpp/sat_cnf_reader.h index 1f6d7d21fc..824ac13a79 100644 --- a/examples/cpp/sat_cnf_reader.h +++ b/examples/cpp/sat_cnf_reader.h @@ -26,12 +26,12 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "ortools/base/commandlineflags.h" -#include "ortools/base/filelineiter.h" #include "ortools/base/integral_types.h" #include "ortools/base/logging.h" #include "ortools/base/macros.h" #include "ortools/sat/boolean_problem.pb.h" #include "ortools/sat/cp_model.pb.h" +#include "ortools/util/filelineiter.h" ABSL_FLAG(bool, wcnf_use_strong_slack, true, "If true, when we add a slack variable to reify a soft clause, we "