diff --git a/Files_4_thesis/Different_controllers/docking_with_PID_controller.m b/Files_4_thesis/Different_controllers/docking_with_PID_controller.m index 7917c7c56b64f06d40c8be2a633b1ad4d74d830c..4ad2bf4b7756e077e5a4ff9f79667a92c9e24437 100644 --- a/Files_4_thesis/Different_controllers/docking_with_PID_controller.m +++ b/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); diff --git a/Files_4_thesis/Finding_X_dot_with_Pcontroller/docking_with_P_controller.m b/Files_4_thesis/Finding_X_dot_with_Pcontroller/docking_with_P_controller.m index 98cd5266cd6e258a84480cca4eb7ec640937c4c6..f9b081125bfef88b271061c5f884868730cd13e2 100644 --- a/Files_4_thesis/Finding_X_dot_with_Pcontroller/docking_with_P_controller.m +++ b/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]); diff --git a/Files_4_thesis/How2increase_line_fonts.pdf b/Files_4_thesis/How2increase_line_fonts.pdf new file mode 100644 index 0000000000000000000000000000000000000000..569719b457fe186b5abc66a624ff5e5ec66e63b8 Binary files /dev/null and b/Files_4_thesis/How2increase_line_fonts.pdf differ diff --git a/Files_4_thesis/how2increase_line_fonts.docx b/Files_4_thesis/how2increase_line_fonts.docx new file mode 100644 index 0000000000000000000000000000000000000000..bdab2a17e2078ddeb33239293f206e1406bcf83e Binary files /dev/null and b/Files_4_thesis/how2increase_line_fonts.docx differ diff --git a/Files_4_thesis/scanner_analysis.m b/Files_4_thesis/scanner_analysis.m index cfa8e40e88a3d9cade2d43d3edbbde5042690868..ce86cc66557426bffd9791a2af3f4689af8b52d5 100644 --- a/Files_4_thesis/scanner_analysis.m +++ b/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'); diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.exe b/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.exe index 551b5b48a41d6d068893c74fbf542c58fabcd444..7f3e3db9d6a821a2dc2bfe63618075deeffee637 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.exe and b/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.exe differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.ilk b/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.ilk index 41568fea9fa8ab3db032ad68eb72b929a1a41b19..0264177d0df9c1e8456a19b86c0ffa007fd84278 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.ilk and b/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.ilk differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.pdb b/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.pdb index b4324d6ea0d5bd3d07480a07c64936462dd6b620..cb432aab48b73cb497181141fa90ce0a61cd5e12 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.pdb and b/MobileRobot/Machine_Learning/Sat_Solver/Debug/Sat_Solver.pdb differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.sdf b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.sdf index c3f7deb6e8b993352593304570eb3cb575abcb66..c4f357cab01428c484b044ff061fb9932ecdf9c5 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.sdf and b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.sdf differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.v12.suo b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.v12.suo index b6318ee1d6fb54f6925064904b5fc65d68153de9..7f0f1dddef54ed781baab5e5f2eca57c38d4ef28 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.v12.suo and b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver.v12.suo differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/Sat_Solver.log b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/Sat_Solver.log index cafde6e53c4ad4b00a1c88f759d018cfc49b24de..19f21d1c73b0a155b54dc0a8b05a3e4b404a9570 100644 --- a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/Sat_Solver.log +++ b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/Sat_Solver.log @@ -1,4 +1,4 @@ -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 diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/sat.obj b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/sat.obj index ba82d33b3dbc0866c81db25fa25015508913091d..b9a73c0d4049818558d14540fecd7647ef94ad87 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/sat.obj and b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/sat.obj differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.idb b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.idb index 5f3f5878e1a20e1840ae044114037861a383f7d7..de03f4b43f1b4d144d364f605c50a4c79f245967 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.idb and b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.idb differ diff --git a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.pdb b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.pdb index 516ef8abf3182fa6af193e366339694cedbe0127..6be7225541e23ddd83ae540ad1af8baa139fa838 100644 Binary files a/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.pdb and b/MobileRobot/Machine_Learning/Sat_Solver/Sat_Solver/Debug/vc120.pdb differ diff --git a/Paper/IREIT/Paper_IREIT.docx b/Paper/IREIT/Paper_IREIT.docx index 8eae9122d1af4b5f43047ef06813ad60c660dedf..ccac33f8fa46668b19f1158c9eff3c20416abc95 100644 Binary files a/Paper/IREIT/Paper_IREIT.docx and b/Paper/IREIT/Paper_IREIT.docx differ diff --git a/Paper/IREIT/Paper_IREIT.pdf b/Paper/IREIT/Paper_IREIT.pdf new file mode 100644 index 0000000000000000000000000000000000000000..a546cd6d9bbf1a68f80352b8dfe1948ee31edcad Binary files /dev/null and b/Paper/IREIT/Paper_IREIT.pdf differ diff --git a/Readme_Git_Intro.txt b/Readme_Git_Intro.txt index 543dfad727a27be90de271444cacac504de542d0..be6630b1cec066d68b0162edcd3c7cb69c842da0 100644 --- a/Readme_Git_Intro.txt +++ b/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