diff --git a/.gitignore b/.gitignore index 4ab5f76..45bb481 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ results** *.mlx *.zip video.m +gifs** +images** diff --git a/images/straightline/chill/1_error.png b/images/straightline/chill/1_error.png deleted file mode 100644 index b1078d6..0000000 Binary files a/images/straightline/chill/1_error.png and /dev/null differ diff --git a/images/straightline/chill/1_error_1.png b/images/straightline/chill/1_error_1.png deleted file mode 100644 index db5e6c2..0000000 Binary files a/images/straightline/chill/1_error_1.png and /dev/null differ diff --git a/images/straightline/chill/1_trajectory.png b/images/straightline/chill/1_trajectory.png deleted file mode 100644 index 598c043..0000000 Binary files a/images/straightline/chill/1_trajectory.png and /dev/null differ diff --git a/images/straightline/chill/2_error.png b/images/straightline/chill/2_error.png deleted file mode 100644 index 6dad066..0000000 Binary files a/images/straightline/chill/2_error.png and /dev/null differ diff --git a/plot_all.m b/plot_all.m index 93df3c8..2a5c5e4 100644 --- a/plot_all.m +++ b/plot_all.m @@ -8,21 +8,21 @@ disp('Photos will start in 3s') pause(3) PLOT_TESTS = [ - %"results/straightline/chill/01-Aug-2024 15:34:03"; - %"results/straightline/chill_errortheta_pisixths/01-Aug-2024 15:56:36"; - %"results/square/01-Aug-2024 16:18:51"; - %"results/circle/start_center/01-Aug-2024 16:46:41"; - %"results/circle/start_tangent/01-Aug-2024 16:55:09"; - %"results/circle/toofast/01-Aug-2024 17:35:25" - %"results/straightline/toofast/01-Aug-2024 15:37:48" - %"results/figure8/chill/15-Aug-2024 09:16:21"; - %"results/figure8/toofast/15-Aug-2024 09:10:32"cd - "results/straightline/abrupt_stop_chill/27-Aug-2024 10:27:31"; - "results/straightline/abrupt_stop_toofast/27-Aug-2024 10:44:35" - "results/sin/no_start_error/27-Aug-2024 19:28:17"; - "results/sin/no_start_error/27-Aug-2024 19:29:42"; - "results/sin/no_start_error/27-Aug-2024 19:31:17"; - "results/sin/no_start_error/27-Aug-2024 19:38:03" + %"results-diffdrive/straightline/chill/01-Aug-2024 15:34:03"; + %"results-diffdrive/straightline/chill_errortheta_pisixths/01-Aug-2024 15:56:36"; + %"results-diffdrive/square/01-Aug-2024 16:18:51"; + %"results-diffdrive/circle/start_center/01-Aug-2024 16:46:41"; + %"results-diffdrive/circle/start_tangent/01-Aug-2024 16:55:09"; + %"results-diffdrive/circle/toofast/01-Aug-2024 17:35:25" + %"results-diffdrive/straightline/toofast/01-Aug-2024 15:37:48" + %"results-diffdrive/figure8/chill/15-Aug-2024 09:16:21"; + %"results-diffdrive/figure8/toofast/15-Aug-2024 09:10:32"cd + "results-diffdrive/straightline/abrupt_stop_chill/27-Aug-2024 10:27:31"; + "results-diffdrive/straightline/abrupt_stop_toofast/27-Aug-2024 10:44:35" + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:28:17"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:29:42"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:31:17"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:38:03" ] s_ = size(PLOT_TESTS) @@ -33,7 +33,7 @@ for i = 1:s_(1) PLOT_TEST = [sPLOT_TEST, '/workspace_composite.mat'] load(PLOT_TEST) - dir = ['images/', sPLOT_TEST, '/'] + dir = ['images-diffdrive/', sPLOT_TEST, '/'] mkdir(dir); for n=1:3 clf; plot_trajectory(t{n}, ref_t{n}, q{n}) diff --git a/tesi.m b/tesi.m index 4827613..3b03432 100644 --- a/tesi.m +++ b/tesi.m @@ -50,7 +50,7 @@ for i = 1:s_(1) end f1 = [ TEST '/' datestr(datetime)]; - f = ['results/' f1]; + f = ['results-diffdrive/' f1]; mkdir(f) savefig(h, [f '/figure.fig']); diff --git a/video_all.m b/video_all.m index a207130..05b4d55 100644 --- a/video_all.m +++ b/video_all.m @@ -5,23 +5,23 @@ disp('Waiting 5s') pause(1) PLOT_TESTS = [ - "results/straightline/chill/01-Aug-2024 15:34:03"; - "results/straightline/chill_errortheta_pisixths/01-Aug-2024 15:56:36"; - "results/square/01-Aug-2024 16:18:51"; - "results/circle/start_center/01-Aug-2024 16:46:41"; - "results/circle/start_tangent/01-Aug-2024 16:55:09"; - "results/circle/toofast/01-Aug-2024 17:35:25" - "results/straightline/toofast/01-Aug-2024 15:37:48" - "results/figure8/chill/15-Aug-2024 09:16:21"; - "results/figure8/toofast/15-Aug-2024 09:10:32"; - "results/straightline/abrupt_stop_chill/27-Aug-2024 10:27:31"; - "results/straightline/abrupt_stop_toofast/27-Aug-2024 10:44:35" - "results/cardioid/start_tangent/01-Aug-2024 18:53:41"; - "results/figure8/fancyreps/09-Aug-2024 13:04:44"; - "results/sin/no_start_error/27-Aug-2024 19:28:17"; - "results/sin/no_start_error/27-Aug-2024 19:29:42"; - "results/sin/no_start_error/27-Aug-2024 19:31:17"; - "results/sin/no_start_error/27-Aug-2024 19:38:03" + "results-diffdrive/straightline/chill/01-Aug-2024 15:34:03"; + "results-diffdrive/straightline/chill_errortheta_pisixths/01-Aug-2024 15:56:36"; + "results-diffdrive/square/01-Aug-2024 16:18:51"; + "results-diffdrive/circle/start_center/01-Aug-2024 16:46:41"; + "results-diffdrive/circle/start_tangent/01-Aug-2024 16:55:09"; + "results-diffdrive/circle/toofast/01-Aug-2024 17:35:25" + "results-diffdrive/straightline/toofast/01-Aug-2024 15:37:48" + "results-diffdrive/figure8/chill/15-Aug-2024 09:16:21"; + "results-diffdrive/figure8/toofast/15-Aug-2024 09:10:32"; + "results-diffdrive/straightline/abrupt_stop_chill/27-Aug-2024 10:27:31"; + "results-diffdrive/straightline/abrupt_stop_toofast/27-Aug-2024 10:44:35" + "results-diffdrive/cardioid/start_tangent/01-Aug-2024 18:53:41"; + "results-diffdrive/figure8/fancyreps/09-Aug-2024 13:04:44"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:28:17"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:29:42"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:31:17"; + "results-diffdrive/sin/no_start_error/27-Aug-2024 19:38:03" ] @@ -33,7 +33,7 @@ for i = 1:s_(1) PLOT_TEST = [sPLOT_TEST, '/workspace_composite.mat'] load(PLOT_TEST) - dir = ['gifs/', sPLOT_TEST, '/'] + dir = ['gifs-diffdrive/', sPLOT_TEST, '/'] mkdir(dir); close all; pause(2); video(q{1}', ref_t{1}', Q_pred{1}, U_track{1}, U_corr{1}, 0, 0.12, t{1}, 4, sim_data{1}.tc*0.25, "track only");