aboutsummaryrefslogtreecommitdiffstats
path: root/problem.cpp
diff options
context:
space:
mode:
authorJean Fabre-Monplaisir <jean-isaac-fm@live.fr>2015-02-01 19:06:59 +0100
committerJean Fabre-Monplaisir <jean-isaac-fm@live.fr>2015-02-01 19:06:59 +0100
commit93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0 (patch)
tree8bdaae15ed9302409756a10faec053db5aea122a /problem.cpp
parent2cb65f6726bbdecdc57b1544fe11fa6c586783dc (diff)
parent3b8497a4d6c71ac542a2992a645c00bf99d45390 (diff)
downloadRobotique-Projet-93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0.tar.gz
Robotique-Projet-93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0.zip
Merge branch 'master' of github.com:Alexis211/Robotique
Conflicts: problem.cpp
Diffstat (limited to 'problem.cpp')
-rw-r--r--problem.cpp19
1 files changed, 17 insertions, 2 deletions
diff --git a/problem.cpp b/problem.cpp
index fb7670b..28ef8fa 100644
--- a/problem.cpp
+++ b/problem.cpp
@@ -56,14 +56,29 @@ bool hilare_a_mvt::intersects(const problem &p) const {
// ================================= //
solution solution::direct_sol(const hilare_a &pos_a, const hilare_a &pos_b) {
+ vector<hilare_a_mvt> sol;
+
// TODO: try different possibilities and chose the shortest one
- return solution(vector<hilare_a_mvt>());
+ hilare_a_mvt mvt;
+ mvt.from = pos_a;
+ mvt.to = pos_b;
+ mvt.is_arc = false;
+ // la suite à compléter
+ sol.push_back(mvt);
+
+ return solution(sol);
}
// =============================== //
// IMPLEMENTATION FOR CLASS SOLVER //
// =============================== //
-// TODO
+solver::solver() {
+ // nothing ?
+}
+
+solver_internal solver::peek_internal() {
+ return _d;
+}
/* vim: set ts=4 sw=4 tw=0 noet :*/