diff --git a/ortools/base/macros.h b/ortools/base/macros.h index 80ad52ee14..5e6ba0def4 100644 --- a/ortools/base/macros.h +++ b/ortools/base/macros.h @@ -20,7 +20,7 @@ #ifdef NDEBUG const bool DEBUG_MODE = false; -#else // NDEBUG +#else // NDEBUG const bool DEBUG_MODE = true; #endif // NDEBUG diff --git a/ortools/constraint_solver/python/pywrapcp_util.h b/ortools/constraint_solver/python/pywrapcp_util.h index 783020bcfb..78454a0e8b 100644 --- a/ortools/constraint_solver/python/pywrapcp_util.h +++ b/ortools/constraint_solver/python/pywrapcp_util.h @@ -92,5 +92,4 @@ class CallPyDecisionBuilder : public operations_research::DecisionBuilder { PyObject* str_func_; }; - #endif // OR_TOOLS_CONSTRAINT_SOLVER_PYTHON_PYWRAPCP_UTIL_H_ diff --git a/ortools/graph/christofides.h b/ortools/graph/christofides.h index 8ee97e187f..13ff581079 100644 --- a/ortools/graph/christofides.h +++ b/ortools/graph/christofides.h @@ -76,9 +76,7 @@ class ChristofidesPathSolver { // return a + b; // } // template <> - int64 SafeAdd(int64 a, int64 b) { - return CapAdd(a, b); - } + int64 SafeAdd(int64 a, int64 b) { return CapAdd(a, b); } // Matching algorithm to use. MatchingAlgorithm matching_; diff --git a/ortools/linear_solver/gurobi_environment.cc b/ortools/linear_solver/gurobi_environment.cc index 0109db22e9..4106a51078 100644 --- a/ortools/linear_solver/gurobi_environment.cc +++ b/ortools/linear_solver/gurobi_environment.cc @@ -235,7 +235,7 @@ bool SearchForGurobiDynamicLibrary() { "/Library/gurobi902/mac64/lib/libgurobi90.dylib")) { return true; } -#elif defined(__GNUC__) // Linux +#elif defined(__GNUC__) // Linux if (gurobi_home_from_env != nullptr && LoadSpecificGurobiLibrary( absl::StrCat(gurobi_home_from_env, "/lib/libgurobi90.so"))) { diff --git a/ortools/linear_solver/gurobi_environment.h b/ortools/linear_solver/gurobi_environment.h index f27e5c00e6..d289586948 100644 --- a/ortools/linear_solver/gurobi_environment.h +++ b/ortools/linear_solver/gurobi_environment.h @@ -191,31 +191,31 @@ extern std::function', or '=') */ +#define GRB_STR_ATTR_VTAG "VTag" /* variable tags */ +#define GRB_STR_ATTR_CTAG "CTag" /* linear constraint tags */ +#define GRB_DBL_ATTR_RHS "RHS" /* RHS */ +#define GRB_DBL_ATTR_DSTART "DStart" /* LP dual solution warm start */ +#define GRB_CHAR_ATTR_SENSE "Sense" /* Sense ('<', '>', or '=') */ #define GRB_STR_ATTR_CONSTRNAME "ConstrName" /* Constraint name */ -#define GRB_INT_ATTR_LAZY "Lazy" /* Lazy constraint? */ -#define GRB_STR_ATTR_QCTAG "QCTag" /* quadratic constraint tags */ -#define GRB_DBL_ATTR_QCRHS "QCRHS" /* QC RHS */ -#define GRB_CHAR_ATTR_QCSENSE "QCSense" /* QC sense ('<', '>', or '=') */ -#define GRB_STR_ATTR_QCNAME "QCName" /* QC name */ +#define GRB_INT_ATTR_LAZY "Lazy" /* Lazy constraint? */ +#define GRB_STR_ATTR_QCTAG "QCTag" /* quadratic constraint tags */ +#define GRB_DBL_ATTR_QCRHS "QCRHS" /* QC RHS */ +#define GRB_CHAR_ATTR_QCSENSE "QCSense" /* QC sense ('<', '>', or '=') */ +#define GRB_STR_ATTR_QCNAME "QCName" /* QC name */ #define GRB_INT_ATTR_GENCONSTRTYPE \ "GenConstrType" /* Type of general constraint */ #define GRB_STR_ATTR_GENCONSTRNAME \ @@ -259,17 +259,17 @@ extern std::function