| 
					
				 | 
			
			
				@@ -4,7 +4,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #include <unistd.h> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #include "Main.hpp" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #include "GSATThreadMPI.hpp" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-#include  "color.h" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#include "color.h" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 extern int world_rank; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -49,7 +49,7 @@ bool GSATThreadMPI::solve() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		printf("s %s\n",find?"SATISFIABLE":"NOT FOUND"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		printf(YELLOW); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         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, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			result.threadId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			result.nbIteration, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -82,7 +82,7 @@ void GSATThreadMPI::solverThread(int id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(solve) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         	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, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		   	gsat[id]->getNbIterations(), 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -96,10 +96,8 @@ void GSATThreadMPI::solverThread(int id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		cpt++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if(id == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			mpiSync(this, end || solve); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			//printf("bool : %d %d\n", end, solve); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	//printf("%d %d %d\n", world_rank, end, solve); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	//Si 1er arreter 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	if(!end && solve) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		end = true; 
			 |