fixup from google3
This commit is contained in:
@@ -34,8 +34,8 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/types/span.h"
|
||||
#include "ortools/base/logging.h"
|
||||
|
||||
namespace operations_research {
|
||||
|
||||
@@ -405,7 +405,6 @@ inline std::vector<absl::Span<const T>> SimpleDynamicPartition::GetParts(
|
||||
starts.clear();
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace operations_research
|
||||
|
||||
#endif // OR_TOOLS_ALGORITHMS_DYNAMIC_PARTITION_H_
|
||||
|
||||
@@ -116,10 +116,6 @@ PY_CONVERT_HELPER_PTR(LocalSearchFilter);
|
||||
PY_CONVERT_HELPER_PTR(LocalSearchFilterManager);
|
||||
PY_CONVERT_HELPER_INTEXPR_AND_INTVAR();
|
||||
|
||||
%{
|
||||
|
||||
%}
|
||||
|
||||
// Actual conversions. This also includes the conversion to std::vector<Class>.
|
||||
PY_CONVERT(IntVar);
|
||||
PY_CONVERT(IntExpr);
|
||||
@@ -2198,6 +2194,4 @@ class PyConstraint(Constraint):
|
||||
|
||||
def DebugString(self):
|
||||
return "PyConstraint"
|
||||
|
||||
|
||||
} // %pythoncode
|
||||
|
||||
@@ -416,13 +416,8 @@ PYBIND11_MODULE(model_builder_helper, m) {
|
||||
.def("enable_output", &ModelSolverHelper::EnableOutput, arg("output"))
|
||||
.def("has_solution", &ModelSolverHelper::has_solution)
|
||||
.def("has_response", &ModelSolverHelper::has_response)
|
||||
.def("status",
|
||||
[](const ModelSolverHelper& solver) {
|
||||
// TODO(user):
|
||||
// - Return the true enum when pybind11_protobuf is working.
|
||||
// - Return the response proto
|
||||
return static_cast<int>(solver.status());
|
||||
})
|
||||
.def("response", &ModelSolverHelper::response)
|
||||
.def("status", &ModelSolverHelper::status)
|
||||
.def("status_string", &ModelSolverHelper::status_string)
|
||||
.def("wall_time", &ModelSolverHelper::wall_time)
|
||||
.def("user_time", &ModelSolverHelper::user_time)
|
||||
|
||||
@@ -383,8 +383,8 @@ class SparseVector {
|
||||
EntryIndex capacity_;
|
||||
|
||||
// Pointers to the first elements of the index and coefficient arrays.
|
||||
Index* index_;
|
||||
Fractional* coefficient_;
|
||||
Index* index_ = nullptr;
|
||||
Fractional* coefficient_ = nullptr;
|
||||
|
||||
// This is here to speed up the CheckNoDuplicates() methods and is mutable
|
||||
// so we can perform checks on const argument.
|
||||
|
||||
Reference in New Issue
Block a user