há 6 anos atrás · 2d311fac72
--- a/Partie_1/Hybride/GSAT/ArrayFiller.cpp
+++ b/Partie_1/Hybride/GSAT/ArrayFiller.cpp
--- a/Partie_1/Hybride/GSAT/ArrayFiller.hpp
+++ b/Partie_1/Hybride/GSAT/ArrayFiller.hpp
--- a/Partie_1/Hybride/GSAT/CFormula.cpp
+++ b/Partie_1/Hybride/GSAT/CFormula.cpp
--- a/Partie_1/Hybride/GSAT/CFormula.hpp
+++ b/Partie_1/Hybride/GSAT/CFormula.hpp
--- a/Partie_1/Hybride/GSAT/FillMethod.hpp
+++ b/Partie_1/Hybride/GSAT/FillMethod.hpp
--- a/Partie_1/Hybride/GSAT/GSAT.cpp
+++ b/Partie_1/Hybride/GSAT/GSAT.cpp
--- a/Partie_1/Hybride/GSAT/GSAT.hpp
+++ b/Partie_1/Hybride/GSAT/GSAT.hpp
--- a/Partie_1/Hybride/GSAT/HeuristicMethod.hpp
+++ b/Partie_1/Hybride/GSAT/HeuristicMethod.hpp
--- a/Partie_1/Hybride/GSATThreadMPI.cpp
+++ b/Partie_1/Hybride/GSATThreadMPI.cpp
--- a/Partie_1/Hybride/GSATThreadMPI.hpp
+++ b/Partie_1/Hybride/GSATThreadMPI.hpp
--- a/Partie_1/Hybride/Main.cpp
+++ b/Partie_1/Hybride/Main.cpp
--- a/Partie_1/Hybride/Main.hpp
+++ b/Partie_1/Hybride/Main.hpp
--- a/Partie_1/Hybride/Makefile
+++ b/Partie_1/Hybride/Makefile
@@ -19,4 +19,4 @@ clean:
 
				 	rm -rf *~
			
 
				 
			
 
				 run: 
			
 
				-	@mpirun -n 3 ./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 2
			
 
				+	@mpirun -n 3 ./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 2
			
--- a/Partie_1/Hybride/README.txt
+++ b/Partie_1/Hybride/README.txt
--- a/Partie_1/Hybride/color.h
+++ b/Partie_1/Hybride/color.h
--- a/Partie_1/MPI/GSAT/ArrayFiller.cpp
+++ b/Partie_1/MPI/GSAT/ArrayFiller.cpp
--- a/Partie_1/MPI/GSAT/ArrayFiller.hpp
+++ b/Partie_1/MPI/GSAT/ArrayFiller.hpp
--- a/Partie_1/MPI/GSAT/CFormula.cpp
+++ b/Partie_1/MPI/GSAT/CFormula.cpp
--- a/Partie_1/MPI/GSAT/CFormula.hpp
+++ b/Partie_1/MPI/GSAT/CFormula.hpp
--- a/Partie_1/MPI/GSAT/FillMethod.hpp
+++ b/Partie_1/MPI/GSAT/FillMethod.hpp
--- a/Partie_1/MPI/GSAT/GSAT.cpp
+++ b/Partie_1/MPI/GSAT/GSAT.cpp
--- a/Partie_1/MPI/GSAT/GSAT.hpp
+++ b/Partie_1/MPI/GSAT/GSAT.hpp
--- a/Partie_1/MPI/GSAT/HeuristicMethod.hpp
+++ b/Partie_1/MPI/GSAT/HeuristicMethod.hpp
--- a/Partie_1/MPI/Main.cpp
+++ b/Partie_1/MPI/Main.cpp
--- a/Partie_1/MPI/Makefile
+++ b/Partie_1/MPI/Makefile
@@ -19,4 +19,4 @@ clean:
 
				 	rm -rf *~
			
 
				 
			
 
				 run: 
			
 
				-	@mpirun -n 4 ./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf
			
 
				+	@mpirun -n 4 ./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf
			
--- a/Partie_1/MPI/README.txt
+++ b/Partie_1/MPI/README.txt
--- a/Partie_1/MPI/color.h
+++ b/Partie_1/MPI/color.h
--- a/Partie_1/Thread/GSAT/ArrayFiller.cpp
+++ b/Partie_1/Thread/GSAT/ArrayFiller.cpp
--- a/Partie_1/Thread/GSAT/ArrayFiller.hpp
+++ b/Partie_1/Thread/GSAT/ArrayFiller.hpp
--- a/Partie_1/Thread/GSAT/CFormula.cpp
+++ b/Partie_1/Thread/GSAT/CFormula.cpp
--- a/Partie_1/Thread/GSAT/CFormula.hpp
+++ b/Partie_1/Thread/GSAT/CFormula.hpp
--- a/Partie_1/Thread/GSAT/FillMethod.hpp
+++ b/Partie_1/Thread/GSAT/FillMethod.hpp
--- a/Partie_1/Thread/GSAT/GSAT.cpp
+++ b/Partie_1/Thread/GSAT/GSAT.cpp
--- a/Partie_1/Thread/GSAT/GSAT.hpp
+++ b/Partie_1/Thread/GSAT/GSAT.hpp
--- a/Partie_1/Thread/GSAT/HeuristicMethod.hpp
+++ b/Partie_1/Thread/GSAT/HeuristicMethod.hpp
--- a/Partie_1/Thread/GSATThread.cpp
+++ b/Partie_1/Thread/GSATThread.cpp
--- a/Partie_1/Thread/GSATThread.hpp
+++ b/Partie_1/Thread/GSATThread.hpp
--- a/Partie_1/Thread/Main.cpp
+++ b/Partie_1/Thread/Main.cpp
--- a/Partie_1/Thread/Makefile
+++ b/Partie_1/Thread/Makefile
@@ -17,4 +17,4 @@ clean:
 
				 	rm -rf *~
			
 
				 
			
 
				 run:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4
			
--- a/Partie_1/Thread/README.txt
+++ b/Partie_1/Thread/README.txt
--- a/Partie_1/Thread/color.h
+++ b/Partie_1/Thread/color.h
--- a/Partie_2/EMA/ControlBandit.cpp
+++ b/Partie_2/EMA/ControlBandit.cpp
--- a/Partie_2/EMA/ControlBandit.hpp
+++ b/Partie_2/EMA/ControlBandit.hpp
--- a/Partie_2/EMA/GSAT/ArrayFiller.cpp
+++ b/Partie_2/EMA/GSAT/ArrayFiller.cpp
--- a/Partie_2/EMA/GSAT/ArrayFiller.hpp
+++ b/Partie_2/EMA/GSAT/ArrayFiller.hpp
--- a/Partie_2/EMA/GSAT/CFormula.cpp
+++ b/Partie_2/EMA/GSAT/CFormula.cpp
--- a/Partie_2/EMA/GSAT/CFormula.hpp
+++ b/Partie_2/EMA/GSAT/CFormula.hpp
--- a/Partie_2/EMA/GSAT/FillMethod.hpp
+++ b/Partie_2/EMA/GSAT/FillMethod.hpp
--- a/Partie_2/EMA/GSAT/GSAT.cpp
+++ b/Partie_2/EMA/GSAT/GSAT.cpp
--- a/Partie_2/EMA/GSAT/GSAT.hpp
+++ b/Partie_2/EMA/GSAT/GSAT.hpp
--- a/Partie_2/EMA/GSAT/HeuristicMethod.hpp
+++ b/Partie_2/EMA/GSAT/HeuristicMethod.hpp
--- a/Partie_2/EMA/GSATThread.cpp
+++ b/Partie_2/EMA/GSATThread.cpp
--- a/Partie_2/EMA/GSATThread.hpp
+++ b/Partie_2/EMA/GSATThread.hpp
--- a/Partie_2/EMA/Main.cpp
+++ b/Partie_2/EMA/Main.cpp
--- a/Partie_2/EMA/Makefile
+++ b/Partie_2/EMA/Makefile
@@ -17,13 +17,13 @@ clean:
 
				 	rm -rf *~
			
 
				 
			
 
				 run:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4
			
 
				 
			
 
				 epsilon:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4 -e 0.2
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4 -e 0.2
			
 
				 
			
 
				 dynamic:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4 -d
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4 -d
			
 
				 
			
 
				-exec:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4 -d -e 0.2
			
 
				+start:
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4 -d -e 0.2
			
--- a/Partie_2/EMA/README.txt
+++ b/Partie_2/EMA/README.txt
--- a/Partie_2/EMA/color.h
+++ b/Partie_2/EMA/color.h
--- a/Partie_2/Moyenne/ControlBandit.cpp
+++ b/Partie_2/Moyenne/ControlBandit.cpp
--- a/Partie_2/Moyenne/ControlBandit.hpp
+++ b/Partie_2/Moyenne/ControlBandit.hpp
--- a/Partie_2/Moyenne/GSAT/ArrayFiller.cpp
+++ b/Partie_2/Moyenne/GSAT/ArrayFiller.cpp
--- a/Partie_2/Moyenne/GSAT/ArrayFiller.hpp
+++ b/Partie_2/Moyenne/GSAT/ArrayFiller.hpp
--- a/Partie_2/Moyenne/GSAT/CFormula.cpp
+++ b/Partie_2/Moyenne/GSAT/CFormula.cpp
--- a/Partie_2/Moyenne/GSAT/CFormula.hpp
+++ b/Partie_2/Moyenne/GSAT/CFormula.hpp
--- a/Partie_2/Moyenne/GSAT/FillMethod.hpp
+++ b/Partie_2/Moyenne/GSAT/FillMethod.hpp
--- a/Partie_2/Moyenne/GSAT/GSAT.cpp
+++ b/Partie_2/Moyenne/GSAT/GSAT.cpp
--- a/Partie_2/Moyenne/GSAT/GSAT.hpp
+++ b/Partie_2/Moyenne/GSAT/GSAT.hpp
--- a/Partie_2/Moyenne/GSAT/HeuristicMethod.hpp
+++ b/Partie_2/Moyenne/GSAT/HeuristicMethod.hpp
--- a/Partie_2/Moyenne/GSATThread.cpp
+++ b/Partie_2/Moyenne/GSATThread.cpp
--- a/Partie_2/Moyenne/GSATThread.hpp
+++ b/Partie_2/Moyenne/GSATThread.hpp
--- a/Partie_2/Moyenne/Main.cpp
+++ b/Partie_2/Moyenne/Main.cpp
--- a/Partie_2/Moyenne/Makefile
+++ b/Partie_2/Moyenne/Makefile
@@ -17,7 +17,7 @@ clean:
 
				 	rm -rf *~
			
 
				 
			
 
				 run:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4
			
 
				 
			
 
				 epsilon:
			
 
				-	./GSATSolver -i ../benchmarks/uf150/uf150-099.cnf -t 4 -e 0.2
			
 
				+	./GSATSolver -i ../../benchmarks/uf150/uf150-099.cnf -t 4 -e 0.2
			
--- a/Partie_2/Moyenne/README.txt
+++ b/Partie_2/Moyenne/README.txt
--- a/Partie_2/Moyenne/color.h
+++ b/Partie_2/Moyenne/color.h