
Time is good
Fork of Robot2016_2-0 by
Revision 19:b2f3757fd7ee, committed 2016-01-13
- Comitter:
- IceTeam
- Date:
- Wed Jan 13 19:10:51 2016 +0100
- Parent:
- 18:0f1fefe78266
- Child:
- 21:077bc7634b90
- Child:
- 24:8e7f24c3d05f
- Commit message:
- Test odo
Changed in this revision
Map/Map.cpp | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/Map/Map.cpp Thu Jan 07 15:54:49 2016 +0100 +++ b/Map/Map.cpp Wed Jan 13 19:10:51 2016 +0100 @@ -129,7 +129,6 @@ Point* current; do { - // On cherche le plus petit F dans la liste ouverte current = openList[0]; @@ -278,7 +277,7 @@ f_path.close(); #endif - for(i=0;i<closeList.size();i++) + for(i=0; i<closeList.size(); i++) delete closeList[i]; #if LOG_LEVEL >= 3
--- a/main.cpp Thu Jan 07 15:54:49 2016 +0100 +++ b/main.cpp Wed Jan 13 19:10:51 2016 +0100 @@ -3,6 +3,11 @@ Map/Point.h Map/define.h Map/Obstacles/Obstacle.h + + Test en cours : + * Un obstacle seulement + * Radius du robot réduit à 1 (defines.cpp) + * Nombreux */ #include "Map/Map.h" @@ -38,7 +43,7 @@ init(); //Construction des obstacles map.build(); - map.Astar(0, 1000, 2000, 1000, 1); + map.Astar(0, 1000, 2000, 1000, 50); path = map.path; for(int i=0; i<path.size();i++) {