Skip to content

InitialSolution - #31

Merged
hedtke merged 14 commits into
mainfrom
issue-30-initial-solution
Jan 10, 2025
Merged

hedtke merged 14 commits into
mainfrom
issue-30-initial-solution

Conversation

@hedtke

@hedtke hedtke commented Nov 14, 2024

Copy link
Copy Markdown
Collaborator

fixes #30

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

codecov Bot commented Nov 19, 2024 •

Copy link
Copy Markdown

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
Comment thread include/scippp/initial_solution.hpp Outdated
class InitialSolution {
friend class Model;
//! Variable assignment in the initial solution.
std::map<SCIP_Var*, double> m_values {};

Copy link
Copy Markdown

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*

@hedtke hedtke Jan 9, 2025 •

Copy link
Copy Markdown
Collaborator Author

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*

Comment thread source/initial_solution.cpp Outdated
Comment thread include/scippp/model.hpp

Copy link
Copy Markdown

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
Copy Markdown
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
@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