From 74dba84f9197a3b65b194d8a3dc53bf086d9f072 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex.auvolat@ens.fr>
Date: Sun, 1 Feb 2015 16:50:09 +0100
Subject: Basic interface : can add obstacles ; set begin/end position, ...

---
 problem.hpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'problem.hpp')

diff --git a/problem.hpp b/problem.hpp
index a41e47a..381b52d 100644
--- a/problem.hpp
+++ b/problem.hpp
@@ -7,6 +7,7 @@
 
 struct obstacle {
 	circle c;
+	obstacle(circle cc) : c(cc) {}
 };
 
 struct hilare_a_param {
@@ -48,6 +49,7 @@ struct hilare_a_mvt {
 	// deux étapes dans le mouvement :
 	// - bien orienter la voiture (c'est l'angle dtheta_before)
 	// - avancer/reculer sur le cercle (c'est l'angle domega)
+	hilare_a_mvt() : center(0, 0) {}
 
 	hilare_a from, to;
 
-- 
cgit v1.2.3


From 3b8497a4d6c71ac542a2992a645c00bf99d45390 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex.auvolat@ens.fr>
Date: Sun, 1 Feb 2015 17:17:35 +0100
Subject: Implement movement rendering

---
 problem.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'problem.hpp')

diff --git a/problem.hpp b/problem.hpp
index 381b52d..685e1df 100644
--- a/problem.hpp
+++ b/problem.hpp
@@ -86,14 +86,14 @@ struct solver_internal {
 	// intermediate data for the solver
 	// represents a graph of randomly chosen positions and simple solutions between them
 	std::vector<hilare_a> pts;
-	std::map<int, std::map<int, hilare_a_mvt> > paths;
+	std::map<int, std::map<int, solution> > paths;
 };
 
 class solver {
 	// mutex-protected asynchronous structure
 
 	private:
-	//todo
+	solver_internal _d;
 
 	public:
 	solver();
@@ -101,6 +101,8 @@ class solver {
 	void start(const problem &p);
 	bool finished();
 	solution get_solution();
+
+	solver_internal peek_internal();
 };
 
 
-- 
cgit v1.2.3