Skip to content

Fix the initialisation of Rnd in FlatZinc #2

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.

Sign up for GitHub

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

Merged
chschulte merged 2 commits into from
Mar 8, 2018
Merged

Fix the initialisation of Rnd in FlatZinc #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2928382
Fix the initialisation of Rnd in FlatZinc
Feb 27, 2018
babc013
Add changelog entry for Rnd FlatZinc fix
Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions changelog.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@
# optional section in the html page.
#

[ENTRY]
Module: flatzinc
What: bug
Rank: minor
Thanks: Jip J. Dekker
[DESCRIPTION]
Fixed the initialisation of the random number generator for the
FlatZinc executable. This fix ensures the generator is always
initialised.

[RELEASE]
Version: 6.0.0
Date: 2018-02-�23
Expand Down
4 changes: 2 additions & 2 deletions gecode/flatzinc/flatzinc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ namespace std {

namespace Gecode { namespace FlatZinc {

// Unitialized default random number generator
Rnd defrnd;
// Default random number generator
Rnd defrnd(0);

/**
* \brief Branching on the introduced variables
Expand Down
2 changes: 1 addition & 1 deletion gecode/flatzinc/parser.tab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ namespace Gecode { namespace FlatZinc {
}

if (fzs == NULL) {
fzs = new FlatZincSpace();
fzs = new FlatZincSpace(rnd);
}
ParserState pp(data, sbuf.st_size, err, fzs);
#else
Expand Down
2 changes: 1 addition & 1 deletion gecode/flatzinc/parser.yxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ namespace Gecode { namespace FlatZinc {
}

if (fzs == NULL) {
fzs = new FlatZincSpace();
fzs = new FlatZincSpace(rnd);
}
ParserState pp(data, sbuf.st_size, err, fzs);
#else
Expand Down