Paper and matlab file edited

Files_4_thesis/Different_controllers/docking_with_PID_controller.m

@@ -604,8 +604,8 @@ hold off;
 axis([0 234 .05 .3]);
 % 
 % title('Position');
-ylabel('Sampling time [s]','interpreter','latex','FontSize',20);
-xlabel('Sample number','interpreter','latex','FontSize',20);
+% ylabel('Sampling time [s]','interpreter','latex','FontSize',20);
+% xlabel('Sample number','interpreter','latex','FontSize',20);
 % 
 % l5 = legend([pa1 pa2],'$USB Camera {Time_{ROS}}$','$ USB Camera {Time_{Real}} [s]$','Orientation','horizontal');
 % set(l5,'interpreter','latex','FontSize',11);

Files_4_thesis/Finding_X_dot_with_Pcontroller/docking_with_P_controller.m

@@ -229,10 +229,10 @@ plot(t_V_sec_data_2,Vel_X_data_2,'r','LineWidth',1.6);
 hold on
 plot(t_V_sec_data_3,Vel_X_data_3,'g','LineWidth',2);
 
-title('a) $\dot{x}_{Rob}$','interpreter','latex','FontSize',20);
+% title('a) $\dot{x}_{Rob}$','interpreter','latex','FontSize',20);
 % set(get(gca,'title'),'Position',([17 5]));
 % xlabel('$ time [sec]$','interpreter','latex','FontSize',14);
-ylabel('$\dot{x}_{Rob}$ [m/s]','interpreter','latex','FontSize',20);
+% ylabel('$\dot{x}_{Rob}$ [m/s]','interpreter','latex','FontSize',20);
 % grid on
 axis([0 35 -.01 .18]);
 l = legend('$\dot{x}_{Rob}$ = 0.1 [m/s]','$\dot{x}_{Rob}$ = 0.15[m/s]','$\dot{x}_{Rob}$ = 0.16[m/s]');
@@ -245,8 +245,8 @@ hold on
 plot(t_V_sec_data_2,Vel_Y_data_2,'r','LineWidth',1.5);
 hold on
 plot(t_V_sec_data_3,Vel_Y_data_3,'g','LineWidth',2.1);
-title('b) $\dot{y}_{Rob}$','interpreter','latex','FontSize',20);
-ylabel('$\dot{y}_{Rob}$ [m/s]','interpreter','latex','FontSize',20);
+% title('b) $\dot{y}_{Rob}$','interpreter','latex','FontSize',20);
+% ylabel('$\dot{y}_{Rob}$ [m/s]','interpreter','latex','FontSize',20);
 % grid on
 % axis([0 46 -.2 .1]);
 
@@ -256,9 +256,9 @@ hold on
 plot(t_V_sec_data_2,Omega_Z_data_2,'r','LineWidth',1.8);
 hold on
 plot(t_V_sec_data_3,Omega_Z_data_3,'g','LineWidth',2.1);
-title('c) $\dot{\theta}_{Rob}$','interpreter','latex','FontSize',20);
-xlabel('$ time $ [s]','interpreter','latex','FontSize',20);
-ylabel('$\dot{\theta}_{Rob}$ [rad/s]','interpreter','latex','FontSize',20);
+% title('c) $\dot{\theta}_{Rob}$','interpreter','latex','FontSize',20);
+% xlabel('$ time $ [s]','interpreter','latex','FontSize',20);
+% ylabel('$\dot{\theta}_{Rob}$ [rad/s]','interpreter','latex','FontSize',20);
 % grid on
 
 % axis([0 46 -.1 .15]);
@@ -304,13 +304,13 @@ hold on
 plot(Pose_Y_data_3,Pose_X_data_3,'g','LineWidth',2);
 hold on
 plot(y_circle,x_circle,'k--','LineWidth',3.4)
-title('${a) Approach  + SM  + Target}$','interpreter','latex','FontSize',20);
+% title('${a) Approach  + SM  + Target}$','interpreter','latex','FontSize',20);
 % xlabel('${y}_{mar}$ [m]','interpreter','latex','FontSize',14);
-ylabel('${x}_{mar}$ [m]','interpreter','latex','FontSize',20);
+% ylabel('${x}_{mar}$ [m]','interpreter','latex','FontSize',20);
 axis([-.65 .03 -1.47 -.16]);
 % grid on
 l2 = legend('$\dot{x}_{Rob}$ = 0.1[m/s]','$\dot{x}_{Rob}$ = 0.15[m/s]','$\dot{x}_{Rob}$ = 0.16[m/s]','Target','Location','northwest');
-set(l2,'interpreter','latex','FontSize',15);
+set(l2,'interpreter','latex','FontSize',18);
 legend('boxoff');
 
 subplot(132);
@@ -321,8 +321,8 @@ hold on
 plot(Pose_Y_data_3,Pose_X_data_3,'g','LineWidth',2);
 hold on
 plot(y_circle,x_circle,'k--','LineWidth',3.4);
-title('$ {b) SM + Target}$','interpreter','latex','FontSize',20);
-xlabel('${y}_{mar}$ [m]','interpreter','latex','FontSize',20);
+% title('$ {b) SM + Target}$','interpreter','latex','FontSize',20);
+% xlabel('${y}_{mar}$ [m]','interpreter','latex','FontSize',20);
 % ylabel('${X}$ [m]','interpreter','latex');
 axis([-.033 -.01 -.26 -.195]);
 % grid on
@@ -335,7 +335,7 @@ hold on
 plot(Pose_Y_data_3,Pose_X_data_3,'g','LineWidth',2);
 hold on
 plot(y_circle,x_circle,'k--','LineWidth',3.4);
-title('$ {c) Target}$','interpreter','latex','FontSize',20);
+% title('$ {c) Target}$','interpreter','latex','FontSize',20);
 % xlabel('${y}_{mar}$ [m]','interpreter','latex','FontSize',14);
 % ylabel('${X}$ [m]','interpreter','latex');
 axis([-.0205 -.0175 -.206 -.20]);

Files_4_thesis/scanner_analysis.m

@@ -75,8 +75,8 @@ hold on;
 % hold on;
 plot(angle,dist_to_obst,'rx','LineWidth',1.05);
 title('');
-xlabel('${\theta_b}$ [rad]','interpreter','latex','FontSize',20);
-ylabel('${Distance}$ [m]','interpreter','latex','FontSize',20);
+% xlabel('${\theta_b}$ [rad]','interpreter','latex','FontSize',20);
+% ylabel('${Distance}$ [m]','interpreter','latex','FontSize',20);
 axis([-.09 .42 .08 .2]);
 % set(gca,'box','off','fontsize',20);
 % legend('Experiment 1','Experiment 2','Experiment 3','Safety Curve');
@@ -93,8 +93,8 @@ hold on
 % hold on
 plot(X_obst,Y_obst,'r','LineWidth',2.05);
 title('');
-xlabel('${X}$ [m]','interpreter','latex','FontSize',20);
-ylabel('${Y}$ [m]','interpreter','latex','FontSize',20);
+% xlabel('${X}$ [m]','interpreter','latex','FontSize',20);
+% ylabel('${Y}$ [m]','interpreter','latex','FontSize',20);
 axis([-.1 .16 -.18 .18]);
 % set(gca,'box','off','fontsize',20);
 l = legend('Trial 1','Trial 2','Trial 3','Safety Curve','Orientation','vertical');

MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/Sat_Solver.log

-Build started 12/10/2016 9:44:51 PM.
+Build started 12/10/2016 10:30:15 PM.
      1>Project "E:\LTH\Git_Repository\thesis\MobileRobot\Machine_Learning\Sat_Solver\Sat_Solver\Sat_Solver.vcxproj" on node 2 (Build target(s)).
      1>ClCompile:
          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /ZI /nologo /W3 /WX- /sdl /Od /Oy- /D WIN32 /D _CRT_SECURE_NO_WARNINGS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt sat.cpp
@@ -11,4 +11,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:03.95
+Time Elapsed 00:00:02.68

Readme_Git_Intro.txt

@@ -21,7 +21,7 @@ touch "name of the file"
 
 6. git add "name of the file"
 
-7. git commit -a (or -m) "short description"
+7. git commit -am "short description"
 
 8. send all the changes to gitlab.com
 git push