aboutsummaryrefslogtreecommitdiffstats
path: root/problem.hpp
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2015-02-01 18:07:27 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2015-02-01 18:07:27 +0100
commitcacec4dbb8b5cc017b9c6d9975f8f792db13cc7a (patch)
tree00a3a31b475c678dbafca8b73f0ac26f14d15bfb /problem.hpp
parent29158da41e7943ea8019efdbff70c994fb1c73e9 (diff)
parent93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0 (diff)
downloadRobotique-Projet-cacec4dbb8b5cc017b9c6d9975f8f792db13cc7a.tar.gz
Robotique-Projet-cacec4dbb8b5cc017b9c6d9975f8f792db13cc7a.zip
Merge branch 'master' of https://github.com/Alexis211/Robotique
Diffstat (limited to 'problem.hpp')
-rw-r--r--problem.hpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/problem.hpp b/problem.hpp
index 8851fa2..6eadd0a 100644
--- a/problem.hpp
+++ b/problem.hpp
@@ -32,6 +32,9 @@ struct hilare_a { // System A
vec pos_trolley() const {
return pos() + param->l * dir_trolley();
}
+
+ bool intersects(const obstacle &o) const; // intersects an obstacle ?
+
};
struct problem {
@@ -66,9 +69,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 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 {