minor changes; change the search parameters in the cp_model.proto

2018-01-15 10:41:09 +01:00
parent 0027a1a192
commit 604587eec7
23 changed files with 179 additions and 175 deletions
--- a/ortools/linear_solver/glpk_interface.cc
+++ b/ortools/linear_solver/glpk_interface.cc
@@ -29,6 +29,7 @@
 #include "ortools/base/logging.h"
 #include "ortools/base/stringprintf.h"
 #include "ortools/base/timer.h"
+#include "ortools/base/port.h"
 #include "ortools/base/hash.h"
 #include "ortools/linear_solver/linear_solver.h"

@@ -992,5 +993,6 @@ MPSolverInterface* BuildGLPKInterface(bool mip, MPSolver* const solver) {
  return new GLPKInterface(solver, mip);
 }

+
 }  // namespace operations_research
 #endif  //  #if defined(USE_GLPK)