Skip to content
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

Make shadow set optional #154

Merged
merged 8 commits into from
Nov 1, 2023
Merged

Make shadow set optional #154

merged 8 commits into from
Nov 1, 2023

Conversation

dhendryc
Copy link
Collaborator

The shadow set is useful if the LMO is expensive to evaluate.

But for the SimpleBoundable LMO, calling the LMO can be faster than going through the shadow set and picking a best point from there.

Copy link

codecov bot commented Oct 31, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (main@72fbb65). Click here to learn what that means.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #154   +/-   ##
=======================================
  Coverage        ?   86.11%           
=======================================
  Files           ?       17           
  Lines           ?     1520           
  Branches        ?        0           
=======================================
  Hits            ?     1309           
  Misses          ?      211           
  Partials        ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/interface.jl Outdated Show resolved Hide resolved
@@ -79,7 +79,7 @@ function Bonobo.get_branching_variable(
Bonobo.get_branching_indices(tree.root),
)
status = check_feasibility(branching.bounded_lmo)
if status == OPTIMALS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was always returning false then??

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather, it threw an error because the compiler did not know the flag.
In the MOI case, we have a separate strong branching function, which is the same as before.

@matbesancon
Copy link
Member

Seems one on the tests should be loosened to 1e-2

Buchheim et. al. mean risk: Test Failed at /Users/runner/work/Boscia.jl/Boscia.jl/test/mean_risk.jl:64
  Expression: dot(a, x) <= b + 0.0001
   Evaluated: 16.076037872611014 <= 16.073528148796374
Stacktrace:
 [1] macro expansion
   @ ~/work/Boscia.jl/Boscia.jl/test/mean_risk.jl:64 [inlined]
 [2] macro expansion
   @ /Users/julia/buildbot/worker/package_macos64/build/usr/share/julia/stdlib/v1.6/Test/src/Test.jl:1151 [inlined]
 [3] top-level scope
   @ ~/work/Boscia.jl/Boscia.jl/test/mean_risk.jl:31
Test Summary:              | Pass  Fail  Total
Buchheim et. al. mean risk |    1     1      2

@dhendryc
Copy link
Collaborator Author

dhendryc commented Nov 1, 2023

Yes. I think this might be due to SCIP not sticking to its own tolerances.

@dhendryc dhendryc merged commit 1c5ac92 into main Nov 1, 2023
6 checks passed
@dhendryc dhendryc deleted the shadow-option branch November 1, 2023 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants