aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2015-02-01 15:08:32 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2015-02-01 15:08:32 +0100
commitd6cef8b0585dcadd7a4c6c5811e127fce8436ec3 (patch)
tree74a8648e7a38a4815118e99c1cf92a79e76c3786
parente95dc022cdd0a22f1e65e9500c73b59a2fc3ea2c (diff)
downloadRobotique-Projet-d6cef8b0585dcadd7a4c6c5811e127fce8436ec3.tar.gz
Robotique-Projet-d6cef8b0585dcadd7a4c6c5811e127fce8436ec3.zip
Add info to problem.cpp
-rw-r--r--problem.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/problem.cpp b/problem.cpp
index 25061c5..8078c33 100644
--- a/problem.cpp
+++ b/problem.cpp
@@ -8,6 +8,7 @@ using namespace std;
double hilare_a_mvt::length() {
// returns length traveled by the car
+ // TODO : two cases
return domega * (center - from.pos()).norm();
}
@@ -28,8 +29,17 @@ 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);
}
// =============================== //