Repository navigation
SCIP 11: Support for exact solving - #1264
Joao-Dionisio wants to merge 28 commits into
Conversation
…t getters, exact LP status, variable status and node lower bound
…ters in the changelog
…re natively in ExactModel
|
Noticed three issues:
The subclassing is good, but should rather be explicitly whitelisted for "safe" methods instead of automatically inherited to prevent future leaks, and remaining real methods should be clearly documented. |
|
Thank you @DominikKamp !
On the subclassing, I'm not sure how the whitelisting would work. We can explicitly do class ExactModel(Model):
unsafe_method = NoneWe can also have class BaseModel():
def common_methods() ...
class Model(BaseModel):
def unsafe_methods(): ....
class ExactModel(BaseModel):
def exact_methods():...This last option may be cleaner, but it's also a TON of risky changes. But fortune favors the brave, so I don't know if we should try 🤷 |
|
The |
…mn/Row/NLRow to model.pxi
… addMatrixVar to Model and lint for dtype=float and Model returns
|
12k additions and 10k deletions. This will be fun. |
| from pyscipopt.scip import BaseModel as BaseModel | ||
| from pyscipopt.scip import Model as Model | ||
| from pyscipopt.scip import ExactModel as ExactModel | ||
| from pyscipopt.scip import ExactVariable as ExactVariable |
There was a problem hiding this comment.
Why do we need a separate variable type?
There was a problem hiding this comment.
For the variable? Because I felt like there were enough differing methods to justify this, and that's not the case with the other stuff.
There was a problem hiding this comment.
It's just to tidy things up more nicely.
|
Could you maybe provide a list of what was moved verbatim to rule these out quickly? |
|
Here you go @DominikKamp . But if you agree with the overall setup (should this be discussed with the group on tuesday?), I'd prefer to do the review myself first, so you don't waste time. Verbatim
Changed in Model (2)
Changed in BaseModel (9)
Removed from Model (replaced by ExactModel)
Rest of scip.pxi (45 lines)
Other files
Actually new, needs review
|
76a9f6d to
3920a7e
Compare
|
This should be merged after #1292 . Then, the diff should become much nicer. |
So that the eventual PR for SCIP 11 doesn't get too huge. Adding a lot of support for using exact SCIP.
@DominikKamp , can you please take a look at this? Does it work as you would expect?
Most of the LOC changes come from the docstrings of the added methods.
EDIT: Now have an ExactModel class that contains all the exact functionality. That way, we can separate people's concerns.