Skip to content

Commit ea12faf

Browse files
committed
remove test on decomposition for eps_bab
1 parent 5e74496 commit ea12faf

File tree

4 files changed

+274
-100
lines changed

4 files changed

+274
-100
lines changed

src/eps_bab.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454

5555
using namespace stl_util;
5656

57-
#define MAX_SIZE_PROBLEM 16
58-
5957
struct ProblemCompare {
6058
bool _less;
6159

@@ -477,13 +475,13 @@ EPS_BAB::EPS_BAB(Gecode::Space* s, const MySearchOptions& o)
477475
_master->decomposeProblems(_space_home->_space_hook, optSearch);
478476

479477
unsigned int time_solve = static_cast<unsigned int>(floor(this->_timer_decomposition.stop()));
480-
std::cerr << "Time resolution : " << time_solve << std::endl;
478+
//std::cerr << "Time resolution : " << time_solve << std::endl;
481479
//getchar();
482-
exit(0);
480+
//exit(0);
483481

484482
_master->done = true;
485483

486-
exit(0);
484+
//exit(0);
487485

488486
if(_mode_decomposition == SEQUENTIAL) {
489487
_space_home->_time_decomposition = static_cast<unsigned int>(floor(this->_timer_decomposition.stop()));
@@ -1399,7 +1397,7 @@ void EPS_BAB::Worker::decomposeProblems(MyFlatZincSpace* s, const MySearchOption
13991397
unsigned int nb_bool_decision_variables = s->bv.size();
14001398

14011399
unsigned int nb_decision_variables = nb_int_decision_variables + nb_bool_decision_variables;
1402-
//!FIXME Bug if nb_decision_variables == 1
1400+
14031401
if(nb_decision_variables == 0) {
14041402
std::cerr << "No decision variables for decomposition : " << std::endl;
14051403
return;
@@ -1761,9 +1759,6 @@ void EPS_BAB::Worker::decomposeProblems(MyFlatZincSpace* s, const MySearchOption
17611759
s->_nodes_decomposition = stat.node;
17621760
s->_fails_decomposition = stat.fail;
17631761

1764-
//TODO !!!
1765-
//s->_memory_decomposition = stat.memory;
1766-
17671762
if(_tuples_int_ndi) {
17681763
_tuples_int_ndi->finalize();
17691764
}

0 commit comments

Comments
 (0)