Diff: main.cpp

Revision:

5:19f24c363418

Parent:

4:8132a0291c4b

Child:

6:0e8db3a23486

--- a/main.cpp	Thu Jul 06 12:13:14 2017 +0000
+++ b/main.cpp	Thu Jul 06 16:51:40 2017 +0000
@@ -3,20 +3,29 @@
 int main(){ 
     
     //defaultXWorld, defaultYWorld, defaultThetaWorld, widthRealMap, heightRealMap
-    //middle arena ISR 60,40
-    MiniExplorerCoimbra myRobot(110,70,-3.14,120,80);//0,0,0 : lower left, facing right
+    //middle arena ISR 40,60
+    //MiniExplorerCoimbra myRobot(20,25,0,120,80);//0,0,0 : lower left, facing right
+    
     //test lab1
-    //myRobot.go_to_point(70,50);//SELECT A TARGET BETWEEN (0,0) and(widthRealMap,heightRealMap)
-    //myRobot.go_to_line_first_lab(1,-2,4);//I think it works but it will always go the right
-    //myRobot.go_to_point_with_angle_first_lab(10,70,3.14/2);//SELECT A TARGET BETWEEN (0,0) and(widthRealMap,heightRealMap)
-    
+    //myRobot.go_to_point(20,55);//SELECT A TARGET BETWEEN (0,0) and(widthRealMap,heightRealMap)
+    //myRobot.go_to_line_first_lab(1,-1,0);//I think it works but it will always go the right
+    //gain distance line
+    //myRobot.go_to_point_with_angle_first_lab(20,25,0);//SELECT A TARGET BETWEEN (0,0) and(widthRealMap,heightRealMap)
+    //small gain orientation
     //test lab2
     //reminder for now the sonar is in debugged, if no problem,comment the right code for presentaiton
+    //MiniExplorerCoimbra myRobot(60,40,0,120,80);//0,0,0 : lower left, facing right
     //myRobot.test_sonars_and_map(25);    
-    //myRobot.test_procedure_lab2(10);
+   // myRobot.test_procedure_lab2(25);
     
     //test lab3
-     myRobot.try_to_reach_target(10,40);//need to adjust the constants. 
+    //myRobot.try_to_reach_target(100,55);//need to adjust the constants. 
+     
+     //test lab4
+     MiniExplorerCoimbra myRobot(20,10,0,120,80);//0,0,0 : lower left, facing right
+     //rectangle 100 width, 60 height 
+     myRobot.test_procedure_lab_4(80,0,0);
+     
     return 0;
 }