diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added support for search options

Browse Source
This commit is contained in:
Denys Duchier
2011-12-03 22:04:04 +01:00
parent 9ebcae23ea
commit 9a78735aaf
4 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/gecode/gecode-common.icc
View File

@@ -62,21 +62,21 @@ namespace generic_gecode
struct GenericDFS: GenericEngine
{
DFS<GenericSpace> engine;
GenericDFS(GenericSpace* s) : engine(s) {}
GenericDFS(GenericSpace* s,Search::Options& opt) : engine(s,opt) {}
virtual GenericSpace* next(void) { return engine.next(); }
};
struct GenericBAB: GenericEngine
{
BAB<GenericSpace> engine;
GenericBAB(GenericSpace* s) : engine(s) {}
GenericBAB(GenericSpace* s,Search::Options& opt) : engine(s,opt) {}
virtual GenericSpace* next(void) { return engine.next(); }
};
struct GenericRestart: GenericEngine
{
Restart<GenericSpace> engine;
GenericRestart(GenericSpace* s): engine(s) {}
GenericRestart(GenericSpace* s,Search::Options& opt): engine(s,opt) {}
virtual GenericSpace* next(void) { return engine.next(); }
};
@@ -144,14 +144,14 @@ namespace generic_gecode
BoolVar get_bvar(int i) const { return (_bvars) ? (*_bvars)[i] : bvars[i]; }
SetVar get_svar(int i) const { return (_svars) ? (*_svars)[i] : svars[i]; }
GenericEngine* new_engine(bool restart=false)
GenericEngine* new_engine(bool restart, Search::Options& opt)
{
freeze();
return (optim.what == Optimizing::OPT_NONE)
? static_cast<GenericEngine*>(new GenericDFS(this))
? static_cast<GenericEngine*>(new GenericDFS(this,opt))
: (restart
? static_cast<GenericEngine*>(new GenericRestart(this))
: static_cast<GenericEngine*>(new GenericBAB(this)));
? static_cast<GenericEngine*>(new GenericRestart(this,opt))
: static_cast<GenericEngine*>(new GenericBAB(this,opt)));
}
int _new_ivar(IntVar& v)