-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge stable/1.2 features to master #94
base: master
Are you sure you want to change the base?
Conversation
…blems. Still speculative
…IC, make it so that IC is valid even when lower level is fractional, make sure IC is only called when all conditions are met
…to be infeasible, since this can happen when the the relaxed solution of the lower-level problem is fractional and has value below the optimum
…y fractional. This is OK, but the subproblem maybe infeasible in this case. We may need a separate parameter to allow these cuts. Also allow hypercube cuts to be generated whenever linking variables are integral.
…of turning off cut generator alltogether, setting better defaults for cuts
…few SYMPHONY settings
…default (this should be improved, however)
…fficient sign assignment
So all the commits attributed to me were cherry-picked? What about the additional ones by you? I guess those were also cherry-picked? |
The commits before the force-push + yesterday's last two commits were cherry-picked from stable/1.2. And other commits not related to stable/1.2 but I pushed to the same branch so they are still showing up here are |
OK, so should I merge this then? |
will run some tests tonight and report the results here. After that should be yes. |
Ran experiments using version f735ff2 on both (Again, all the changes above are not tested with stochastic cases, and will need to do so sometime in the future.) |
I'm looking at this again now and I don't really understand how you approached this. We merged the changes from stable to master around 29 Nov 2019 in f19a5a5. I think we should be able to do the same now to just make sure that no commits get lost. Once we have the merge done, then we can separately add your commits on top, as needed. But I also wonder whether any of your commits are also appropriate in stable. Should we commit them to stable first and then merge? |
Some of my (most recent) commits listed here have already been merged to stable/1.2, and some of them may not be applied now because they may be conflict with other commits merged in the past year. The feasibility check module looks very different in the master version due to the introduction of stochastic scenarios. I will need to read through and think again before clean up. |
OK, but it's still the case that all the changes from |
MibSModel
;