diff --git a/ortools/bop/bop_base.cc b/ortools/bop/bop_base.cc index 4be2880f60..09c0ebf8d1 100644 --- a/ortools/bop/bop_base.cc +++ b/ortools/bop/bop_base.cc @@ -23,8 +23,7 @@ namespace operations_research { namespace bop { -using ::operations_research::sat::LinearBooleanProblem; -using ::operations_research::sat::LinearObjective; +using ::operations_research::LinearBooleanProblem; BopOptimizerBase::BopOptimizerBase(const std::string& name) : name_(name), stats_(name) { diff --git a/ortools/bop/bop_base.h b/ortools/bop/bop_base.h index 9431f5dad8..be7f43988d 100644 --- a/ortools/bop/bop_base.h +++ b/ortools/bop/bop_base.h @@ -110,7 +110,7 @@ inline std::ostream& operator<<(std::ostream& os, // information that the solver learned about it at a given time. class ProblemState { public: - explicit ProblemState(const sat::LinearBooleanProblem& problem); + explicit ProblemState(const LinearBooleanProblem& problem); // Sets parameters, used for instance to get the tolerance, the gap limit... void SetParameters(const BopParameters& parameters) { @@ -195,7 +195,7 @@ class ProblemState { // Returns the original problem. Note that the current problem might be // different, e.g. fixed variables, but equivalent, i.e. a solution to one // should be a solution to the other too. - const sat::LinearBooleanProblem& original_problem() const { + const LinearBooleanProblem& original_problem() const { return original_problem_; } @@ -220,7 +220,7 @@ class ProblemState { void SynchronizationDone(); private: - const sat::LinearBooleanProblem& original_problem_; + const LinearBooleanProblem& original_problem_; BopParameters parameters_; int64 update_stamp_; gtl::ITIVector is_fixed_; @@ -243,7 +243,7 @@ class ProblemState { // with the problem state in order to get a more constrained problem to be used // by the next called optimizer. struct LearnedInfo { - explicit LearnedInfo(const sat::LinearBooleanProblem& problem) + explicit LearnedInfo(const LinearBooleanProblem& problem) : fixed_literals(), solution(problem, "AllZero"), lower_bound(kint64min), diff --git a/ortools/bop/bop_lns.cc b/ortools/bop/bop_lns.cc index 796f6ac5e1..d83d35b4c6 100644 --- a/ortools/bop/bop_lns.cc +++ b/ortools/bop/bop_lns.cc @@ -32,8 +32,8 @@ namespace operations_research { namespace bop { -using ::operations_research::sat::LinearBooleanConstraint; -using ::operations_research::sat::LinearBooleanProblem; +using ::operations_research::LinearBooleanConstraint; +using ::operations_research::LinearBooleanProblem; using ::operations_research::glop::ColIndex; using ::operations_research::glop::DenseRow; using ::operations_research::glop::LinearProgram; diff --git a/ortools/bop/bop_lns.h b/ortools/bop/bop_lns.h index b69a5e693b..534bce9a8a 100644 --- a/ortools/bop/bop_lns.h +++ b/ortools/bop/bop_lns.h @@ -163,7 +163,7 @@ class ConstraintBasedNeighborhood : public NeighborhoodGenerator { // if they appear in the same constraint. class RelationGraphBasedNeighborhood : public NeighborhoodGenerator { public: - RelationGraphBasedNeighborhood(const sat::LinearBooleanProblem& problem, + RelationGraphBasedNeighborhood(const LinearBooleanProblem& problem, MTRandom* random); ~RelationGraphBasedNeighborhood() final {} diff --git a/ortools/bop/bop_ls.cc b/ortools/bop/bop_ls.cc index 8c52e20160..f5f98ac584 100644 --- a/ortools/bop/bop_ls.cc +++ b/ortools/bop/bop_ls.cc @@ -21,10 +21,6 @@ namespace operations_research { namespace bop { -using ::operations_research::sat::LinearBooleanConstraint; -using ::operations_research::sat::LinearBooleanProblem; -using ::operations_research::sat::LinearObjective; - //------------------------------------------------------------------------------ // LocalSearchOptimizer //------------------------------------------------------------------------------ diff --git a/ortools/bop/bop_ls.h b/ortools/bop/bop_ls.h index 72fce52bee..fde621fd8f 100644 --- a/ortools/bop/bop_ls.h +++ b/ortools/bop/bop_ls.h @@ -264,7 +264,7 @@ class AssignmentAndConstraintFeasibilityMaintainer { // Note that the constraint indices used in this class are not the same as // the one used in the given LinearBooleanProblem here. explicit AssignmentAndConstraintFeasibilityMaintainer( - const sat::LinearBooleanProblem& problem); + const LinearBooleanProblem& problem); // When we construct the problem, we treat the objective as one constraint. // This is the index of this special "objective" constraint. @@ -435,7 +435,7 @@ class OneFlipConstraintRepairer { // TODO(user): maybe merge the two classes? maintaining this implicit indices // convention between the two classes sounds like a bad idea. OneFlipConstraintRepairer( - const sat::LinearBooleanProblem& problem, + const LinearBooleanProblem& problem, const AssignmentAndConstraintFeasibilityMaintainer& maintainer, const sat::VariablesAssignment& sat_assignment); diff --git a/ortools/bop/bop_portfolio.cc b/ortools/bop/bop_portfolio.cc index 6ef915cc6e..af31f49c1a 100644 --- a/ortools/bop/bop_portfolio.cc +++ b/ortools/bop/bop_portfolio.cc @@ -27,10 +27,6 @@ namespace operations_research { namespace bop { namespace { - -using ::operations_research::sat::LinearBooleanProblem; -using ::operations_research::sat::LinearObjective; - void BuildObjectiveTerms(const LinearBooleanProblem& problem, BopConstraintTerms* objective_terms) { CHECK(objective_terms != nullptr); diff --git a/ortools/bop/bop_portfolio.h b/ortools/bop/bop_portfolio.h index fd5e572109..d6857c9670 100644 --- a/ortools/bop/bop_portfolio.h +++ b/ortools/bop/bop_portfolio.h @@ -75,10 +75,10 @@ class PortfolioOptimizer : public BopOptimizerBase { private: BopOptimizerBase::Status SynchronizeIfNeeded( const ProblemState& problem_state); - void AddOptimizer(const sat::LinearBooleanProblem& problem, + void AddOptimizer(const LinearBooleanProblem& problem, const BopParameters& parameters, const BopOptimizerMethod& optimizer_method); - void CreateOptimizers(const sat::LinearBooleanProblem& problem, + void CreateOptimizers(const LinearBooleanProblem& problem, const BopParameters& parameters, const BopSolverOptimizerSet& optimizer_set); diff --git a/ortools/bop/bop_solution.cc b/ortools/bop/bop_solution.cc index 69663df06f..b84082b511 100644 --- a/ortools/bop/bop_solution.cc +++ b/ortools/bop/bop_solution.cc @@ -15,9 +15,6 @@ namespace operations_research { namespace bop { -using ::operations_research::sat::LinearBooleanConstraint; -using ::operations_research::sat::LinearBooleanProblem; -using ::operations_research::sat::LinearObjective; //------------------------------------------------------------------------------ // BopSolution //------------------------------------------------------------------------------ diff --git a/ortools/bop/bop_solution.h b/ortools/bop/bop_solution.h index d33a4681b9..c3c0f16ab1 100644 --- a/ortools/bop/bop_solution.h +++ b/ortools/bop/bop_solution.h @@ -30,7 +30,7 @@ namespace bop { // the feasibility. class BopSolution { public: - BopSolution(const sat::LinearBooleanProblem& problem, const std::string& name); + BopSolution(const LinearBooleanProblem& problem, const std::string& name); void SetValue(VariableIndex var, bool value) { recompute_cost_ = true; @@ -93,7 +93,7 @@ class BopSolution { bool ComputeIsFeasible() const; int64 ComputeCost() const; - const sat::LinearBooleanProblem* problem_; + const LinearBooleanProblem* problem_; std::string name_; gtl::ITIVector values_; diff --git a/ortools/bop/bop_solver.cc b/ortools/bop/bop_solver.cc index 2851aef23c..061c88f051 100644 --- a/ortools/bop/bop_solver.cc +++ b/ortools/bop/bop_solver.cc @@ -36,7 +36,7 @@ namespace operations_research { namespace bop { namespace { -using ::operations_research::sat::LinearBooleanProblem; +using ::operations_research::LinearBooleanProblem; using ::operations_research::glop::ColIndex; using ::operations_research::glop::DenseRow; diff --git a/ortools/bop/bop_solver.h b/ortools/bop/bop_solver.h index 7eb6cd55a7..643f24fe38 100644 --- a/ortools/bop/bop_solver.h +++ b/ortools/bop/bop_solver.h @@ -60,7 +60,7 @@ namespace bop { // Solver of Boolean Optimization Problems based on Local Search. class BopSolver { public: - explicit BopSolver(const sat::LinearBooleanProblem& problem); + explicit BopSolver(const LinearBooleanProblem& problem); virtual ~BopSolver(); // Parameters management. @@ -93,7 +93,7 @@ class BopSolver { BopSolveStatus InternalMonothreadSolver(TimeLimit* time_limit); BopSolveStatus InternalMultithreadSolver(TimeLimit* time_limit); - const sat::LinearBooleanProblem& problem_; + const LinearBooleanProblem& problem_; ProblemState problem_state_; BopParameters parameters_; diff --git a/ortools/bop/integral_solver.cc b/ortools/bop/integral_solver.cc index 031438d7f9..745ed82ca0 100644 --- a/ortools/bop/integral_solver.cc +++ b/ortools/bop/integral_solver.cc @@ -23,9 +23,6 @@ namespace operations_research { namespace bop { -using ::operations_research::sat::LinearBooleanConstraint; -using ::operations_research::sat::LinearBooleanProblem; -using ::operations_research::sat::LinearObjective; using operations_research::glop::ColIndex; using operations_research::glop::DenseRow; using operations_research::glop::Fractional; diff --git a/ortools/sat/boolean_problem.proto b/ortools/sat/boolean_problem.proto index eac0f38af4..e35ebe1731 100644 --- a/ortools/sat/boolean_problem.proto +++ b/ortools/sat/boolean_problem.proto @@ -15,7 +15,7 @@ syntax = "proto2"; -package operations_research.sat; +package operations_research; option csharp_namespace = "Google.OrTools.Sat"; option java_package = "com.google.ortools.sat";