From 5281512d4db5d48734a6e22b9de71d6c959a4bcd Mon Sep 17 00:00:00 2001 From: "lperron@google.com" Date: Mon, 7 Nov 2011 18:51:12 +0000 Subject: [PATCH] remove MPSolver::IsLPFormat --- constraint_solver/constraint_solver.h | 1 - constraint_solver/local_search.cc | 1 - linear_solver/cbc_interface.cc | 2 +- linear_solver/glpk_interface.cc | 2 +- linear_solver/linear_solver.h | 5 ----- linear_solver/linear_solver.swig | 1 - 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/constraint_solver/constraint_solver.h b/constraint_solver/constraint_solver.h index b38dc280c3..681cde149a 100644 --- a/constraint_solver/constraint_solver.h +++ b/constraint_solver/constraint_solver.h @@ -2541,7 +2541,6 @@ class Solver { DecisionBuilder* const first_solution, LocalSearchPhaseParameters* const parameters); - // Solution Pool. SolutionPool* MakeDefaultSolutionPool(); diff --git a/constraint_solver/local_search.cc b/constraint_solver/local_search.cc index 65dcbdd1f2..3e793a99e8 100644 --- a/constraint_solver/local_search.cc +++ b/constraint_solver/local_search.cc @@ -3132,5 +3132,4 @@ DecisionBuilder* Solver::MakeLocalSearchPhase( parameters->limit(), parameters->filters())); } - } // namespace operations_research diff --git a/linear_solver/cbc_interface.cc b/linear_solver/cbc_interface.cc index cc865e9089..f86b9c6404 100644 --- a/linear_solver/cbc_interface.cc +++ b/linear_solver/cbc_interface.cc @@ -229,7 +229,7 @@ void CBCInterface::SetOptimizationDirection(bool maximize) { } void CBCInterface::WriteModel(const string& filename) { - if (solver_->IsLPFormat(filename)) { + if (HasSuffixString(filename, ".lp")) { osi_.writeLp(filename.c_str(), ""); } else { // If filename does not end in ".gz", CBC will diff --git a/linear_solver/glpk_interface.cc b/linear_solver/glpk_interface.cc index c9bfa3d545..d6acddf813 100644 --- a/linear_solver/glpk_interface.cc +++ b/linear_solver/glpk_interface.cc @@ -244,7 +244,7 @@ void GLPKInterface::Reset() { } void GLPKInterface::WriteModel(const string& filename) { - if (solver_->IsLPFormat(filename)) { + if (HasSuffixString(filename, ".lp")) { glp_write_lp(lp_, NULL, filename.c_str()); } else { glp_write_mps(lp_, GLP_MPS_DECK, NULL, filename.c_str()); diff --git a/linear_solver/linear_solver.h b/linear_solver/linear_solver.h index 921a9ab6bb..6ef73850e7 100644 --- a/linear_solver/linear_solver.h +++ b/linear_solver/linear_solver.h @@ -366,11 +366,6 @@ class MPSolver { return write_model_filename_; } - // Returns true if filename ends in ".lp". - bool IsLPFormat(const string &filename) { - return HasSuffixString (filename, ".lp"); - } - void set_time_limit(int64 time_limit) { DCHECK_GE(time_limit, 0); time_limit_ = time_limit; diff --git a/linear_solver/linear_solver.swig b/linear_solver/linear_solver.swig index 9b0602fa09..21db4efd79 100644 --- a/linear_solver/linear_solver.swig +++ b/linear_solver/linear_solver.swig @@ -405,7 +405,6 @@ namespace operations_research { %rename (clearObjective) MPSolver::ClearObjective; %rename (computeExactConditionNumber) MPSolver::ComputeExactConditionNumber; %rename (init) MPSolver::Init; -%rename (isLpFormat) MPSolver::IsLPFormat; %rename (loadModel) MPSolver::LoadModel; %rename (makeBoolVar) MPSolver::MakeBoolVar; %rename (makeIntVar) MPSolver::MakeIntVar;