fix merge changes

Code/JobShop/solution.cpp

@@ -112,7 +112,8 @@ solution_t evaluer(bierwirth v, t_graphe graphe) {
 	return sol;
 }
 
-void affiche_solution(solution_t sol) {
+void affiche_solution(solution_t sol) 
+{
 	pr_t cour = sol.lastFather;
 	int i = 0;
 	pr_t chemin[SOLUTION_MAX_SIZE];
@@ -131,7 +132,7 @@ void affiche_solution(solution_t sol) {
 		cout << endl;
 	}
 
-
+}
 solution_t genNeighbour(solution_t sol, int size)
 {
 	solution_t new_solution;
@@ -174,11 +175,6 @@ int sameH(solution_t sol, int* hash, int size)
 	return val;
 }
 
-void solution::rechercheLocale(bierwirth v, solution_t& solution)
-{
-	cout << "duree totale : " << sol.cost << endl;
-}
-
 /*
 void grasp(solution_t* sol, t_graph graphe, int best_cost)
 {