Renommage class GSATThreadMPI

Partie_1/Hybride/GSATThreadMPI.cpp → Partie_1/Hybride/GSATHybride.cpp

@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <mpi.h>
 #include "Main.hpp"
-#include "GSATThreadMPI.hpp"
+#include "GSATHybride.hpp"
 #include "color.h"
 
 extern int world_rank;

Partie_1/Hybride/GSATThreadMPI.hpp → Partie_1/Hybride/GSATHybride.hpp

@@ -1,5 +1,5 @@
-#ifndef GSATTHREADMPI_HPP 
-#define GSATTHREADMPI_HPP 
+#ifndef GSATHYBRIDE_HPP 
+#define GSATHYBRIDE_HPP 
 
 /* --- Include --- */
 #include <vector>

Partie_1/Hybride/Main.hpp

@@ -1,7 +1,7 @@
 #ifndef MAIN_HPP
 #define MAIN_CPP
 
-#include "GSATThreadMPI.hpp"
+#include "GSATHybride.hpp"
 
 extern int world_rank;
 extern int world_size;

Partie_1/Hybride/Makefile

@@ -2,7 +2,7 @@ FLAGS = -std=c++0x -O2 -g -Wall -fmessage-length=0 -Wreorder -Wwrite-strings -Ws
 
 LIBS = -lpthread
 
-OBJS = GSATThreadMPI.o GSAT/GSAT.o GSAT/ArrayFiller.o GSAT/CFormula.o
+OBJS = GSATHybride.o GSAT/GSAT.o GSAT/ArrayFiller.o GSAT/CFormula.o
 
 TARGET = GSATSolver
 
@@ -11,8 +11,8 @@ all:
 	g++ $(FLAGS) -c -o GSAT/GSAT.o GSAT/GSAT.cpp
 	g++ $(FLAGS) -c -o GSAT/ArrayFiller.o GSAT/ArrayFiller.cpp
 	g++ $(FLAGS) -c -o GSAT/CFormula.o GSAT/CFormula.cpp
-	mpic++ $(FLAGS) -c -o GSATThreadMPI.o GSATThreadMPI.cpp
-	mpic++ -o $(TARGET) Main.cpp $(FLAGS) GSATThreadMPI.o GSAT/GSAT.o GSAT/ArrayFiller.o GSAT/CFormula.o $(LIBS)
+	mpic++ $(FLAGS) -c -o GSATHybride.o GSATHybride.cpp
+	mpic++ -o $(TARGET) Main.cpp $(FLAGS) $(OBJS) $(LIBS)
 
 clean:
 	rm -f $(OBJS) $(TARGET)