|
54 | 54 |
|
55 | 55 | using namespace stl_util; |
56 | 56 |
|
57 | | -#define MAX_SIZE_PROBLEM 16 |
58 | | - |
59 | 57 | struct ProblemCompare { |
60 | 58 | bool _less; |
61 | 59 |
|
@@ -477,13 +475,13 @@ EPS_BAB::EPS_BAB(Gecode::Space* s, const MySearchOptions& o) |
477 | 475 | _master->decomposeProblems(_space_home->_space_hook, optSearch); |
478 | 476 |
|
479 | 477 | 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; |
481 | 479 | //getchar(); |
482 | | - exit(0); |
| 480 | + //exit(0); |
483 | 481 |
|
484 | 482 | _master->done = true; |
485 | 483 |
|
486 | | - exit(0); |
| 484 | + //exit(0); |
487 | 485 |
|
488 | 486 | if(_mode_decomposition == SEQUENTIAL) { |
489 | 487 | _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 |
1399 | 1397 | unsigned int nb_bool_decision_variables = s->bv.size(); |
1400 | 1398 |
|
1401 | 1399 | unsigned int nb_decision_variables = nb_int_decision_variables + nb_bool_decision_variables; |
1402 | | - //!FIXME Bug if nb_decision_variables == 1 |
| 1400 | + |
1403 | 1401 | if(nb_decision_variables == 0) { |
1404 | 1402 | std::cerr << "No decision variables for decomposition : " << std::endl; |
1405 | 1403 | return; |
@@ -1761,9 +1759,6 @@ void EPS_BAB::Worker::decomposeProblems(MyFlatZincSpace* s, const MySearchOption |
1761 | 1759 | s->_nodes_decomposition = stat.node; |
1762 | 1760 | s->_fails_decomposition = stat.fail; |
1763 | 1761 |
|
1764 | | - //TODO !!! |
1765 | | - //s->_memory_decomposition = stat.memory; |
1766 | | - |
1767 | 1762 | if(_tuples_int_ndi) { |
1768 | 1763 | _tuples_int_ndi->finalize(); |
1769 | 1764 | } |
|
0 commit comments