forked from Gecode/gecode
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Add cbs branching for compact table problems. #1
Open
CarolineSabourin-Jean
wants to merge
1
commit into
SaGagnon:upir
Choose a base branch
from
CarolineSabourin-Jean:upir
base: upir
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+81
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -147,6 +147,8 @@ namespace Gecode { namespace Int { namespace Branch { | |
// Lambda we pass to propagators via solndistrib to query solution densities | ||
auto SendMarginal = [this](unsigned int prop_id, unsigned int var_id, | ||
int val, double dens) { | ||
if (!varIdToPos.isIn(var_id)) return; | ||
|
||
if (logProp[prop_id].dens < dens) { | ||
logProp[prop_id].var_id = var_id; | ||
logProp[prop_id].val = val; | ||
|
@@ -157,6 +159,11 @@ namespace Gecode { namespace Int { namespace Branch { | |
for (auto& kv : logProp) | ||
kv.second.visited = false; | ||
|
||
// We can change rho's value. Actually, there is no memory exception | ||
// with rho = 1. But with other values of rho, there is a memory | ||
// exception for some crossword problems. | ||
float rho = 1; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Gilles m'a dit qu'il y avait des fuites de mémoire avec rho < 1. Je vais regarder ça. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ouais exact :( |
||
|
||
for (Propagators p(home, PropagatorGroup::all); p(); ++p) { | ||
unsigned int prop_id = p.propagator().id(); | ||
unsigned int domsum; | ||
|
@@ -181,7 +188,7 @@ namespace Gecode { namespace Int { namespace Branch { | |
// If the domain size sum of all variables in the propagator has changed | ||
// since the last time we called this function, we need to recompute | ||
// solution densities. Otherwise, we can reuse them. | ||
if (logProp[prop_id].domsum != domsum) { | ||
if (domsum < rho * logProp[prop_id].domsum || logProp[prop_id].domsum == 0) { | ||
logProp[prop_id].dens = -1; | ||
// Solution density computation | ||
p.propagator().solndistrib(home, SendMarginal); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Avez-vous trouvé pourquoi il y a des variables dans le propagateur qui ne se retrouvent pas dans le brancher? J'avais ajouté ce fix pour cette raison et je ne sais pas si c'est un comportement normal.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Non on n'a pas trouvé, désolée :(