|
@@ -4,7 +4,7 @@
|
|
#include <unistd.h>
|
|
#include <unistd.h>
|
|
#include "Main.hpp"
|
|
#include "Main.hpp"
|
|
#include "GSATThreadMPI.hpp"
|
|
#include "GSATThreadMPI.hpp"
|
|
-#include "color.h"
|
|
|
|
|
|
+#include "color.h"
|
|
|
|
|
|
extern int world_rank;
|
|
extern int world_rank;
|
|
|
|
|
|
@@ -49,7 +49,7 @@ bool GSATThreadMPI::solve() {
|
|
printf("s %s\n",find?"SATISFIABLE":"NOT FOUND");
|
|
printf("s %s\n",find?"SATISFIABLE":"NOT FOUND");
|
|
printf(YELLOW);
|
|
printf(YELLOW);
|
|
printf("c real time : %.4f seconds\n", result.calcTime);
|
|
printf("c real time : %.4f seconds\n", result.calcTime);
|
|
- printf("c [processor:%d][thread:%2d][iteration:%5d][file:%d][heuristic:%d]Satisfied clauses (begin: %d)(end:%d)\n",
|
|
|
|
|
|
+ printf("c [processor:%d][thread:%2d][iteration:%5d][fill:%d][heuristic:%d]Satisfied clauses (begin: %d)(end:%d)\n",
|
|
world_rank,
|
|
world_rank,
|
|
result.threadId,
|
|
result.threadId,
|
|
result.nbIteration,
|
|
result.nbIteration,
|
|
@@ -82,7 +82,7 @@ void GSATThreadMPI::solverThread(int id) {
|
|
if(solve) {
|
|
if(solve) {
|
|
printf(CYAN);
|
|
printf(CYAN);
|
|
}
|
|
}
|
|
- printf("c [processor:%d][thread:%2d][iteration:%5d][file:%d][heuristic:%d]Satisfied clauses (begin: %d)(end:%d)\n",
|
|
|
|
|
|
+ printf("c [processor:%d][thread:%2d][iteration:%5d][fill:%d][heuristic:%d]Satisfied clauses (begin: %d)(end:%d)\n",
|
|
world_rank,
|
|
world_rank,
|
|
id,
|
|
id,
|
|
gsat[id]->getNbIterations(),
|
|
gsat[id]->getNbIterations(),
|
|
@@ -96,10 +96,8 @@ void GSATThreadMPI::solverThread(int id) {
|
|
cpt++;
|
|
cpt++;
|
|
if(id == 0) {
|
|
if(id == 0) {
|
|
mpiSync(this, end || solve);
|
|
mpiSync(this, end || solve);
|
|
- //printf("bool : %d %d\n", end, solve);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- //printf("%d %d %d\n", world_rank, end, solve);
|
|
|
|
//Si 1er arreter
|
|
//Si 1er arreter
|
|
if(!end && solve) {
|
|
if(!end && solve) {
|
|
end = true;
|
|
end = true;
|