always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #2094

Browse Source
This commit is contained in:
Laurent Perron
2020-07-06 11:53:52 +02:00
parent e28a499b0f
commit 23aeaf6072
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ortools/linear_solver/linear_solver.h
View File

@@ -1107,6 +1107,8 @@ class MPVariable {
*/
MPSolver::BasisStatus basis_status() const;
/** Returns the branching priority, or 0 if it was not set. */
int branching_priority() const { return branching_priority_; }
/**
* Advanced usage: Certain MIP solvers (e.g. Gurobi or SCIP) allow you to set
* a per-variable priority for determining which variable to branch on.
@@ -1117,7 +1119,6 @@ class MPVariable {
* support setting branching priority; all other solvers will simply ignore
* this annotation.
*/
int branching_priority() const { return branching_priority_; }
void SetBranchingPriority(int priority);
protected:

2
ortools/linear_solver/python/linear_solver.i
View File

@@ -351,6 +351,7 @@ PY_CONVERT(MPVariable);
%unignore operations_research::MPVariable::SetUb;
%unignore operations_research::MPVariable::SetBounds;
%unignore operations_research::MPVariable::SetInteger;
%unignore operations_research::MPVariable::SetBranchingPriority;
// MPVariable: reader API.
%unignore operations_research::MPVariable::solution_value;
@@ -361,6 +362,7 @@ PY_CONVERT(MPVariable);
%unignore operations_research::MPVariable::index; // No unit test
%unignore operations_research::MPVariable::basis_status;
%unignore operations_research::MPVariable::reduced_cost; // For experts only.
%unignore operations_research::MPVariable::branching_priority; // no unit test.
// MPConstraint: writer API.
%unignore operations_research::MPConstraint::SetCoefficient;