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

InitialSolution #31

Merged
merged 14 commits into from
Jan 10, 2025
Merged

InitialSolution #31

merged 14 commits into from
Jan 10, 2025

Conversation

hedtke
Copy link
Collaborator

@hedtke hedtke commented Nov 14, 2024

fixes #30

@hedtke hedtke added this to the 1.3.0 milestone Nov 14, 2024
Copy link

codecov bot commented Nov 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.62%. Comparing base (6f9ddd7) to head (a156c4f).
Report is 17 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #31      +/-   ##
==========================================
- Coverage   97.59%   95.62%   -1.97%     
==========================================
  Files           9       10       +1     
  Lines         166      183      +17     
  Branches       39       48       +9     
==========================================
+ Hits          162      175      +13     
  Misses          3        3              
- Partials        1        5       +4     
Files with missing lines Coverage Δ
include/scippp/model.hpp 80.76% <ø> (-15.39%) ⬇️
source/initial_solution.cpp 100.00% <100.00%> (ø)
source/model.cpp 98.79% <100.00%> (+0.20%) ⬆️

@hedtke hedtke changed the title Draft: InitialSolution InitialSolution Nov 19, 2024
@hedtke hedtke requested a review from wienkamp January 7, 2025 09:49
@hedtke hedtke self-assigned this Jan 7, 2025
class InitialSolution {
friend class Model;
//! Variable assignment in the initial solution.
std::map<SCIP_Var*, double> m_values {};

Choose a reason for hiding this comment

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

#28 plans to make Var.var private in the future. I suppose Model would be a friend class, but InitialSolutions shouldn't have a reference to SCIP_Var. It should be easy to change this to Var*

Copy link
Collaborator Author

@hedtke hedtke Jan 9, 2025

Choose a reason for hiding this comment

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

Good idea, changed to const Var*

source/initial_solution.cpp Outdated Show resolved Hide resolved
include/scippp/model.hpp Show resolved Hide resolved

Choose a reason for hiding this comment

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

Should this be in it's own separate PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It could be. Seems to be more overhead to fix the pipeline somewhere else, merge, rebase .... instead of doing it on the fly here :-)

@hedtke hedtke merged commit d9061e8 into main Jan 10, 2025
9 of 10 checks passed
@hedtke hedtke deleted the issue-30-initial-solution branch January 10, 2025 14:13
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.

Support adding primal solutions
3 participants