Merge branch 'master' of https://github.com/Alexis211/Robotique

Conflicts:
	problem.hpp

1 files changed, 17 insertions, 17 deletions

diff --git a/problem.hpp b/problem.hpp
index 2fe70b1..14ba475 100644
--- a/problem.hpp
+++ b/problem.hpp
@@ -79,10 +79,10 @@ struct hilare_a_mvt {
 	double ds;					// longueur par
 
 	double length();			// length of a movement
-    
+
 	bool intersects(const obstacle &o) const;	// intersects an obstacle ?
 
-    	bool intersects(const problem &p) const;	// intersects any obstacle on the map ?
+	bool intersects(const problem &p) const;	// intersects any obstacle on the map ?
 };
 
 struct solution {
@@ -113,28 +113,28 @@ class solver {
 
 	private:
 
-	sf::Mutex _d_lock;
-	solver_internal _d;
-	problem _p;
+		sf::Mutex _d_lock;
+		solver_internal _d;
+		problem _p;
+
+		bool _please_stop;
+		bool _running;
+		bool _done;
+		solution _s;
 
-	bool _please_stop;
-	bool _running;
-	bool _done;
-	solution _s;
-	
-	sf::Thread _worker;
+		sf::Thread _worker;
 
 	public:
-	solver();
+		solver();
 
-	void start(const problem &p);
+		void start(const problem &p);
 
-	void run();	// worker thread
+		void run();	// worker thread
 
-	bool finished();
-	solution get_solution();
+		bool finished();
+		solution get_solution();
 
-	solver_internal peek_internal();
+		solver_internal peek_internal();
 };