From 4fd91c8fd7e72e248831b4c55742d1dc96dc2be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 22 Oct 2019 17:30:19 +0200 Subject: Implement #21 --- Kod/bilbana/yc4/main.m | 177 +++++++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 78 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 3bdf697..1efcd77 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -22,12 +22,14 @@ start_race(1) start_race(2) car1 = struct; +car1.running = false; car1.segment = 1; car1.lap = 0; car1.lap_times = []; car1.seg_times = []; car2 = struct; +car2.running = false; car2.segment = 1; car2.lap = 0; car2.lap_times = []; @@ -35,6 +37,10 @@ car2.seg_times = []; tocs = []; +%% ASK ACTIVE CARS +car1.running = (prompt('Vill du köra bil 1? (J/N) [N]', 's') == 'J') +car2.running = (prompt('Vill du köra bil 2? (J/N) [N]', 's') == 'J') + %% MAIN LOOP while 1 tic; @@ -48,91 +54,106 @@ while 1 drawnow %% READ - [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); - [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + if car1.running == true + [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); + end + if car2.running == true + [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + end %% CHECK LAP AND CHECKPOINT (CAR 1) - if car1.new_check_point == true - % beep; - if car1.lap ~= 0 - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - end - car1.segment = car1.segment + 1; - car1.seg_tic = tic; - end - if car1.new_lap == true - if car1.lap == 0 - % dont save time for first lap - car1.segment = 1; - car1.lap = car1.lap + 1; - car1.seg_tic = tic; - car1.lap_tic = tic; - continue; - end - beep; - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - car1.seg_tic = tic; - car1.lap_times(car1.lap) = toc(car1.lap_tic); - car1.lap_tic = tic; - - display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; - - car1.segment = 1; - car1.lap = car1.lap + 1; - - car1.seg_times(car1.lap, 1) = 0; - end - + if car1.running == true + if car1.new_check_point == true + % beep; + if car1.lap ~= 0 + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + end + car1.segment = car1.segment + 1; + car1.seg_tic = tic; + end + if car1.new_lap == true + if car1.lap == 0 + % dont save time for first lap + car1.segment = 1; + car1.lap = car1.lap + 1; + car1.seg_tic = tic; + car1.lap_tic = tic; + continue; + end + beep; + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + car1.seg_tic = tic; + car1.lap_times(car1.lap) = toc(car1.lap_tic); + car1.lap_tic = tic; + + display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; + + car1.segment = 1; + car1.lap = car1.lap + 1; + + car1.seg_times(car1.lap, 1) = 0; + end + end + %% CHECK LAP AND CHECKPOINT (CAR 2) - if car2.new_check_point == true - % beep; - if car2.lap ~= 0 - car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); - end - car2.segment = car2.segment + 1; - car2.seg_tic = tic; - end - if car2.new_lap == true - if car2.lap == 0 - % dont save time for first lap - car2.segment = 1; - car2.lap = car2.lap + 1; - car2.seg_tic = tic; - car2.lap_tic = tic; - disp('continuing'); - continue; - end - beep; - - car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); - car2.seg_tic = tic; - car2.lap_times(car2.lap) = toc(car2.lap_tic); - car2.lap_tic = tic; - - display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; - - car2.segment = 1; - car2.lap = car2.lap + 1; - - car2.seg_times(car2.lap, 1) = 0; - end - - %% CALCULATE (CAR 1) - car1.car_constant = get_car_constant(1); - car1.v = get_new_v(car1.segment); - car1.track_u_constant = get_track_u_constant(); - car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); + if car2.running == true + if car2.new_check_point == true + % beep; + if car2.lap ~= 0 + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + end + car2.segment = car2.segment + 1; + car2.seg_tic = tic; + end + if car2.new_lap == true + if car2.lap == 0 + % dont save time for first lap + car2.segment = 1; + car2.lap = car2.lap + 1; + car2.seg_tic = tic; + car2.lap_tic = tic; + disp('continuing'); + continue; + end + beep; + + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + car2.seg_tic = tic; + car2.lap_times(car2.lap) = toc(car2.lap_tic); + car2.lap_tic = tic; + + display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; + + car2.segment = 1; + car2.lap = car2.lap + 1; + + car2.seg_times(car2.lap, 1) = 0; + end + end + + %% CALCULATE (CAR 2) + if car1.running == true + car1.car_constant = get_car_constant(1); + car1.v = get_new_v(car1.segment); + car1.track_u_constant = get_track_u_constant(); + car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); + end %% CALCULATE (CAR 2) - car2.car_constant = get_car_constant(2); - car2.v = get_new_v(car2.segment); - car2.track_u_constant = get_track_u_constant(); - car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); + if car2.running == true + car2.car_constant = get_car_constant(2); + car2.v = get_new_v(car2.segment); + car2.track_u_constant = get_track_u_constant(); + car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); + end %% EXECUTE - set_car_speed(1, car1.u); - set_car_speed(2, car2.u); - + if car1.running == true + set_car_speed(1, car1.u); + end + if car2.running == true + set_car_speed(2, car2.u); + end %% DISPLAY %% END OF LOOP -- cgit v1.2.1 From 2d67630d832e4216a3eb70258d100dbd4f08a3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 22 Oct 2019 17:30:19 +0200 Subject: Implement #21 --- Kod/bilbana/yc4/main.m | 177 +++++++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 78 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 3bdf697..1efcd77 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -22,12 +22,14 @@ start_race(1) start_race(2) car1 = struct; +car1.running = false; car1.segment = 1; car1.lap = 0; car1.lap_times = []; car1.seg_times = []; car2 = struct; +car2.running = false; car2.segment = 1; car2.lap = 0; car2.lap_times = []; @@ -35,6 +37,10 @@ car2.seg_times = []; tocs = []; +%% ASK ACTIVE CARS +car1.running = (prompt('Vill du köra bil 1? (J/N) [N]', 's') == 'J') +car2.running = (prompt('Vill du köra bil 2? (J/N) [N]', 's') == 'J') + %% MAIN LOOP while 1 tic; @@ -48,91 +54,106 @@ while 1 drawnow %% READ - [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); - [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + if car1.running == true + [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); + end + if car2.running == true + [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + end %% CHECK LAP AND CHECKPOINT (CAR 1) - if car1.new_check_point == true - % beep; - if car1.lap ~= 0 - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - end - car1.segment = car1.segment + 1; - car1.seg_tic = tic; - end - if car1.new_lap == true - if car1.lap == 0 - % dont save time for first lap - car1.segment = 1; - car1.lap = car1.lap + 1; - car1.seg_tic = tic; - car1.lap_tic = tic; - continue; - end - beep; - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - car1.seg_tic = tic; - car1.lap_times(car1.lap) = toc(car1.lap_tic); - car1.lap_tic = tic; - - display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; - - car1.segment = 1; - car1.lap = car1.lap + 1; - - car1.seg_times(car1.lap, 1) = 0; - end - + if car1.running == true + if car1.new_check_point == true + % beep; + if car1.lap ~= 0 + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + end + car1.segment = car1.segment + 1; + car1.seg_tic = tic; + end + if car1.new_lap == true + if car1.lap == 0 + % dont save time for first lap + car1.segment = 1; + car1.lap = car1.lap + 1; + car1.seg_tic = tic; + car1.lap_tic = tic; + continue; + end + beep; + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + car1.seg_tic = tic; + car1.lap_times(car1.lap) = toc(car1.lap_tic); + car1.lap_tic = tic; + + display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; + + car1.segment = 1; + car1.lap = car1.lap + 1; + + car1.seg_times(car1.lap, 1) = 0; + end + end + %% CHECK LAP AND CHECKPOINT (CAR 2) - if car2.new_check_point == true - % beep; - if car2.lap ~= 0 - car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); - end - car2.segment = car2.segment + 1; - car2.seg_tic = tic; - end - if car2.new_lap == true - if car2.lap == 0 - % dont save time for first lap - car2.segment = 1; - car2.lap = car2.lap + 1; - car2.seg_tic = tic; - car2.lap_tic = tic; - disp('continuing'); - continue; - end - beep; - - car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); - car2.seg_tic = tic; - car2.lap_times(car2.lap) = toc(car2.lap_tic); - car2.lap_tic = tic; - - display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; - - car2.segment = 1; - car2.lap = car2.lap + 1; - - car2.seg_times(car2.lap, 1) = 0; - end - - %% CALCULATE (CAR 1) - car1.car_constant = get_car_constant(1); - car1.v = get_new_v(car1.segment); - car1.track_u_constant = get_track_u_constant(); - car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); + if car2.running == true + if car2.new_check_point == true + % beep; + if car2.lap ~= 0 + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + end + car2.segment = car2.segment + 1; + car2.seg_tic = tic; + end + if car2.new_lap == true + if car2.lap == 0 + % dont save time for first lap + car2.segment = 1; + car2.lap = car2.lap + 1; + car2.seg_tic = tic; + car2.lap_tic = tic; + disp('continuing'); + continue; + end + beep; + + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + car2.seg_tic = tic; + car2.lap_times(car2.lap) = toc(car2.lap_tic); + car2.lap_tic = tic; + + display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; + + car2.segment = 1; + car2.lap = car2.lap + 1; + + car2.seg_times(car2.lap, 1) = 0; + end + end + + %% CALCULATE (CAR 2) + if car1.running == true + car1.car_constant = get_car_constant(1); + car1.v = get_new_v(car1.segment); + car1.track_u_constant = get_track_u_constant(); + car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); + end %% CALCULATE (CAR 2) - car2.car_constant = get_car_constant(2); - car2.v = get_new_v(car2.segment); - car2.track_u_constant = get_track_u_constant(); - car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); + if car2.running == true + car2.car_constant = get_car_constant(2); + car2.v = get_new_v(car2.segment); + car2.track_u_constant = get_track_u_constant(); + car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); + end %% EXECUTE - set_car_speed(1, car1.u); - set_car_speed(2, car2.u); - + if car1.running == true + set_car_speed(1, car1.u); + end + if car2.running == true + set_car_speed(2, car2.u); + end %% DISPLAY %% END OF LOOP -- cgit v1.2.1 From d883d45a89fb81d8a2ac0607a9108a128a296bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 27 Oct 2019 14:46:46 +0100 Subject: Basic structure for #11 --- Kod/bilbana/yc4/main.m | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 1efcd77..15019c3 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -23,6 +23,7 @@ start_race(2) car1 = struct; car1.running = false; +car1.automatic = true; car1.segment = 1; car1.lap = 0; car1.lap_times = []; @@ -30,6 +31,7 @@ car1.seg_times = []; car2 = struct; car2.running = false; +car2.automatic = true; car2.segment = 1; car2.lap = 0; car2.lap_times = []; @@ -38,8 +40,30 @@ car2.seg_times = []; tocs = []; %% ASK ACTIVE CARS -car1.running = (prompt('Vill du köra bil 1? (J/N) [N]', 's') == 'J') -car2.running = (prompt('Vill du köra bil 2? (J/N) [N]', 's') == 'J') +disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); + +car1.response = prompt('Vill du köra bil 1? [N]'); +if car1.response == 'J' + car1.running = true; + car1.automatic = true; +elseif car1.response == 'M' + car1.running = true; + car1.automatic = false; +else + car1.running = false; +end + +car2.response = prompt('Vill du köra bil 2? [N]'); +if car2.response == 'J' + car2.running = true; + car2.automatic = true; +elseif car2.response == 'M' + car2.running = true; + car2.automatic = false; +else + car2.running = false; +end + %% MAIN LOOP while 1 @@ -132,7 +156,7 @@ while 1 end %% CALCULATE (CAR 2) - if car1.running == true + if car1.running == true & car1.automatic == true car1.car_constant = get_car_constant(1); car1.v = get_new_v(car1.segment); car1.track_u_constant = get_track_u_constant(); @@ -140,18 +164,29 @@ while 1 end %% CALCULATE (CAR 2) - if car2.running == true + if car2.running == true & car2.automatic == true car2.car_constant = get_car_constant(2); car2.v = get_new_v(car2.segment); car2.track_u_constant = get_track_u_constant(); car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); end + %% CONTROLLER (CAR 1) + if car1.running == true & car1.automatic == false + % TODO + end + + %% CONTROLLER (CAR 2) + if car2.running == true & car2.automatic == false + % TODO + end + + %% EXECUTE - if car1.running == true + if car1.running == true & car1.automatic == true set_car_speed(1, car1.u); end - if car2.running == true + if car2.running == true & car2.automatic == true set_car_speed(2, car2.u); end %% DISPLAY @@ -175,4 +210,4 @@ matlabclient(3); %% DISPLAY GRAPHS graphs(car1.lap_times, 13, car1.seg_times, 1); -graphs(car2.lap_times, 13, car2.seg_times, 2); \ No newline at end of file +graphs(car2.lap_times, 13, car2.seg_times, 2); -- cgit v1.2.1 From 5a80a50aaae165721f54bd9a4a93ceb8a98f7897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 27 Oct 2019 21:28:04 +0100 Subject: Fix #18 --- Kod/bilbana/yc4/main.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 15019c3..39f1d88 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -209,5 +209,9 @@ matlabclient(3); %% DISPLAY GRAPHS -graphs(car1.lap_times, 13, car1.seg_times, 1); -graphs(car2.lap_times, 13, car2.seg_times, 2); +if car1.running == true + graphs(car1.lap_times, 13, car1.seg_times, 1); +end +if car2.running == true + graphs(car2.lap_times, 13, car2.seg_times, 2); +end -- cgit v1.2.1 From d5263d43a80f5897068672275de08fa6bf1eb54f Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 29 Oct 2019 11:28:22 +0100 Subject: Minor fixes --- Kod/bilbana/yc4/main.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 39f1d88..b77684a 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -42,7 +42,7 @@ tocs = []; %% ASK ACTIVE CARS disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); -car1.response = prompt('Vill du köra bil 1? [N]'); +car1.response = input('Vill du köra bil 1? [N]', 's'); if car1.response == 'J' car1.running = true; car1.automatic = true; @@ -53,7 +53,7 @@ else car1.running = false; end -car2.response = prompt('Vill du köra bil 2? [N]'); +car2.response = input('Vill du köra bil 2? [N]', 's'); if car2.response == 'J' car2.running = true; car2.automatic = true; @@ -80,7 +80,7 @@ while 1 %% READ if car1.running == true [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); - end + end if car2.running == true [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); end -- cgit v1.2.1 From 0adfa98e9c8bfe25a8a27a92fe66b2732bf87375 Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 29 Oct 2019 11:28:52 +0100 Subject: Use && instead of & --- Kod/bilbana/yc4/main.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index b77684a..64ad6ce 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -156,7 +156,7 @@ while 1 end %% CALCULATE (CAR 2) - if car1.running == true & car1.automatic == true + if car1.running == true && car1.automatic == true car1.car_constant = get_car_constant(1); car1.v = get_new_v(car1.segment); car1.track_u_constant = get_track_u_constant(); @@ -164,7 +164,7 @@ while 1 end %% CALCULATE (CAR 2) - if car2.running == true & car2.automatic == true + if car2.running == true && car2.automatic == true car2.car_constant = get_car_constant(2); car2.v = get_new_v(car2.segment); car2.track_u_constant = get_track_u_constant(); @@ -172,21 +172,21 @@ while 1 end %% CONTROLLER (CAR 1) - if car1.running == true & car1.automatic == false + if car1.running == true && car1.automatic == false % TODO end %% CONTROLLER (CAR 2) - if car2.running == true & car2.automatic == false + if car2.running == true && car2.automatic == false % TODO end %% EXECUTE - if car1.running == true & car1.automatic == true + if car1.running == true && car1.automatic == true set_car_speed(1, car1.u); - end - if car2.running == true & car2.automatic == true + end + if car2.running == true && car2.automatic == true set_car_speed(2, car2.u); end %% DISPLAY -- cgit v1.2.1 From 441c23ae3afb247741d65cb0e92f6d9417d3933b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 24 Oct 2019 03:25:46 +0200 Subject: =?UTF-8?q?M=C3=B6te=202019-10-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Motesprotokoll/2019-10-23.tex | 91 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 Motesprotokoll/2019-10-23.tex diff --git a/Motesprotokoll/2019-10-23.tex b/Motesprotokoll/2019-10-23.tex new file mode 100644 index 0000000..e8c6a60 --- /dev/null +++ b/Motesprotokoll/2019-10-23.tex @@ -0,0 +1,91 @@ +\documentclass[11pt,a4paper]{article} +\usepackage{geometry} % gör texten lite bredare eftersom vanlig latex är för smal för a4 + +% minska storleken pÃ¥ rubriker och underrubriker +\usepackage{titlesec} +\titleformat{\section} + {\normalfont\Large\bfseries}{\thesection}{1em}{} + +\titleformat{\subsection} + {\normalfont\normalsize\bfseries}{\thesubsection}{1em}{}[\vspace{-0.4em}] +\usepackage[]{parskip} + +% undvik helst subsubsections + +%% FÖRKLARINGAR AV KOMMANDON OCH DYL. +% \\ skapar en radbrytning +% \\[1em] skapar en radbrytning med "1em" extra utrymme mellan rader +% (1 em är ganska stor) +% \textbf{Skapar text i fetstil} +% \begin{itemize} och \end{itemize} skapar en s.k. list-enviornment (list-miljö) +% Inuti itemize skriver man \item för att skapa en ny punkt, annars är det bara att skriva +% \section*{Titel} och \subsection*{Understitel} skapar nya sektioner och undersektioner +% Asterisken ser till att det inte dyker upp ett nummer bredvid namnet. +% I övrigt är det bara att skriva text där man vill ha den + +\begin{document} +\pagenumbering{gobble} % räkna inte (och skriv inte heller ut) sidnumrering + \begin{center} + \textbf{\Large TFYY51 - Yc4} \\[0.2em] + Mötesprotokoll för möte den 2019-10-23 i I204. + \end{center} + \vspace{1em} + \textbf{Närvarande:} + Albin (ordf), + Gustav (sek), + David (lokal), + Alexander. + \\[0.5em] + \textbf{FrÃ¥nvarande:} Mattias (bortrest) \\[0.5em] + \textbf{Övriga närvarande:} + + \section*{FöregÃ¥ende protokoll} + Inget föregÃ¥ende protokoll att gÃ¥ igenom. + + \section*{Dagordning} + \subsection*{Arbetsdisponering under tenta-/omtenta-p} + Nästa leverans är BP4b under projektvecka 7 (veckan med start 2019-11-11). + Tills dess vill vi ha implementerat alla de större funktionerna som + specifierades i designspecifikationen. Vi beslutade att Alexander och David + redan imorgon (2019-10-24) ska göra mätningar av banan, dels längd pÃ¥ olika + undersegment och dels mätning av spänning i dessa. + + Vi gick även igenom det som fanns kvar efter leveransen av BP4a. För att + fördela arbetet delade vi ut issues som fanns pÃ¥ Gitlab (och skrev in nÃ¥gra + nya som vi kom pÃ¥ under mötets gÃ¥ng). + + \subsection*{Beslut om struktur för gamla värden pÃ¥ position och hastighet} + + Under leveransen av designspecifikationen lyfte Erik fram möjligheten att + spara hastigheten i olika delar av banan under tidigare varv som en extra + datapunkt när den nuvarande hastigheten ska bestämmas. Vi beslutade att + implementera detta genom att utgÃ¥ frÃ¥n kartan som Alexander och David bygger + upp för att fÃ¥ de olika segmenten, och sedan spara värdena i en + tre-dimensionell matris. Matrisen har formated ((antal~varv) $\times$ (antal~ + undersegment) $\times$ 2) där $z$-ledet beskriver hastigheten och varvtiden + vid ett visst segment vid ett tidigare varv. Fördelen är att systemet vid en + viss tidpunkt kan applicera statistiska funktioner pÃ¥ de tidigare + mätpunkterna för ett visst segment som ett hjälpmedel vid nuvarande + beräkningar. Dessa mätvärden kan med lätthet utökas för att spara mer + information vid olika segment. + + För att underlätta prestandamässigt kan matrisen vid start göras sÃ¥ stor den + behöver vara givet att användaren matar in hur mÃ¥nga varv en viss bil ska + göra. + + \section*{Övrigt} + \begin{itemize} + \item \textbf{Beslut: } Under utveckling ska vi spara sÃ¥ mycket + information som möjligt för att bygga statistik över tid. + \item Vi gick igenom hur Gitlab automatiskt kan stänga issues med + magiska keywords (ex. "implements \#20" eller "fixes \#5"). + \item Vi beslutade att utveckling mellan leveranser i huvudsak sker + med en ny branch per feature som sedan mergas till master. I + praktiken använder vi oss därför frÃ¥n och med nu av Merge + Requests (i den mÃ¥n det är möjligt). + \end{itemize} + + \section*{Nästa möte} + Nästa mötes hÃ¥lls 2019-10-29. Lokalbokare kommer dÃ¥ vara Alexander. + Förhoppnigen är att alla medlemmar kan närvara. +\end{document} -- cgit v1.2.1 From 28ce14e9a128ea713b716befeb4efa5f7d11cc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 24 Oct 2019 03:23:40 +0200 Subject: =?UTF-8?q?Spr=C3=A5k=20och=20stil=20m=C3=B6tesprotokollmall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Motesprotokoll/mall.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Motesprotokoll/mall.tex b/Motesprotokoll/mall.tex index 85700dc..6b3f6cf 100644 --- a/Motesprotokoll/mall.tex +++ b/Motesprotokoll/mall.tex @@ -27,7 +27,7 @@ \pagenumbering{gobble} % räkna inte (och skriv inte heller ut) sidnumrering \begin{center} \textbf{\Large TFYY51 - Yc4} \\[0.2em] - Mötesprotokoll för DATUM i SAL + Mötesprotokoll för möte den DATUM i SAL. \end{center} \vspace{1em} \textbf{Närvarande:} Gustav (ordf), David (sek), Alexander (lokal), Mattias, Albin \\[0.5em] @@ -59,4 +59,4 @@ \section*{Nästa möte} Nästa mötes hÃ¥lls blabla. Lokalbokare kommer dÃ¥ vara Person D. -\end{document} \ No newline at end of file +\end{document} -- cgit v1.2.1 From 0365242a5e21ae69e6c4c212fd8437bc31cc6b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 22 Oct 2019 17:30:19 +0200 Subject: Implement #21 --- Kod/bilbana/yc4/main.m | 177 +++++++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 78 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 3bdf697..1efcd77 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -22,12 +22,14 @@ start_race(1) start_race(2) car1 = struct; +car1.running = false; car1.segment = 1; car1.lap = 0; car1.lap_times = []; car1.seg_times = []; car2 = struct; +car2.running = false; car2.segment = 1; car2.lap = 0; car2.lap_times = []; @@ -35,6 +37,10 @@ car2.seg_times = []; tocs = []; +%% ASK ACTIVE CARS +car1.running = (prompt('Vill du köra bil 1? (J/N) [N]', 's') == 'J') +car2.running = (prompt('Vill du köra bil 2? (J/N) [N]', 's') == 'J') + %% MAIN LOOP while 1 tic; @@ -48,91 +54,106 @@ while 1 drawnow %% READ - [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); - [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + if car1.running == true + [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); + end + if car2.running == true + [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + end %% CHECK LAP AND CHECKPOINT (CAR 1) - if car1.new_check_point == true - % beep; - if car1.lap ~= 0 - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - end - car1.segment = car1.segment + 1; - car1.seg_tic = tic; - end - if car1.new_lap == true - if car1.lap == 0 - % dont save time for first lap - car1.segment = 1; - car1.lap = car1.lap + 1; - car1.seg_tic = tic; - car1.lap_tic = tic; - continue; - end - beep; - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - car1.seg_tic = tic; - car1.lap_times(car1.lap) = toc(car1.lap_tic); - car1.lap_tic = tic; - - display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; - - car1.segment = 1; - car1.lap = car1.lap + 1; - - car1.seg_times(car1.lap, 1) = 0; - end - + if car1.running == true + if car1.new_check_point == true + % beep; + if car1.lap ~= 0 + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + end + car1.segment = car1.segment + 1; + car1.seg_tic = tic; + end + if car1.new_lap == true + if car1.lap == 0 + % dont save time for first lap + car1.segment = 1; + car1.lap = car1.lap + 1; + car1.seg_tic = tic; + car1.lap_tic = tic; + continue; + end + beep; + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + car1.seg_tic = tic; + car1.lap_times(car1.lap) = toc(car1.lap_tic); + car1.lap_tic = tic; + + display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; + + car1.segment = 1; + car1.lap = car1.lap + 1; + + car1.seg_times(car1.lap, 1) = 0; + end + end + %% CHECK LAP AND CHECKPOINT (CAR 2) - if car2.new_check_point == true - % beep; - if car2.lap ~= 0 - car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); - end - car2.segment = car2.segment + 1; - car2.seg_tic = tic; - end - if car2.new_lap == true - if car2.lap == 0 - % dont save time for first lap - car2.segment = 1; - car2.lap = car2.lap + 1; - car2.seg_tic = tic; - car2.lap_tic = tic; - disp('continuing'); - continue; - end - beep; - - car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); - car2.seg_tic = tic; - car2.lap_times(car2.lap) = toc(car2.lap_tic); - car2.lap_tic = tic; - - display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; - - car2.segment = 1; - car2.lap = car2.lap + 1; - - car2.seg_times(car2.lap, 1) = 0; - end - - %% CALCULATE (CAR 1) - car1.car_constant = get_car_constant(1); - car1.v = get_new_v(car1.segment); - car1.track_u_constant = get_track_u_constant(); - car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); + if car2.running == true + if car2.new_check_point == true + % beep; + if car2.lap ~= 0 + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + end + car2.segment = car2.segment + 1; + car2.seg_tic = tic; + end + if car2.new_lap == true + if car2.lap == 0 + % dont save time for first lap + car2.segment = 1; + car2.lap = car2.lap + 1; + car2.seg_tic = tic; + car2.lap_tic = tic; + disp('continuing'); + continue; + end + beep; + + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + car2.seg_tic = tic; + car2.lap_times(car2.lap) = toc(car2.lap_tic); + car2.lap_tic = tic; + + display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; + + car2.segment = 1; + car2.lap = car2.lap + 1; + + car2.seg_times(car2.lap, 1) = 0; + end + end + + %% CALCULATE (CAR 2) + if car1.running == true + car1.car_constant = get_car_constant(1); + car1.v = get_new_v(car1.segment); + car1.track_u_constant = get_track_u_constant(); + car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); + end %% CALCULATE (CAR 2) - car2.car_constant = get_car_constant(2); - car2.v = get_new_v(car2.segment); - car2.track_u_constant = get_track_u_constant(); - car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); + if car2.running == true + car2.car_constant = get_car_constant(2); + car2.v = get_new_v(car2.segment); + car2.track_u_constant = get_track_u_constant(); + car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); + end %% EXECUTE - set_car_speed(1, car1.u); - set_car_speed(2, car2.u); - + if car1.running == true + set_car_speed(1, car1.u); + end + if car2.running == true + set_car_speed(2, car2.u); + end %% DISPLAY %% END OF LOOP -- cgit v1.2.1 From 240f38ecad493a65c798347d9d15bad047d6e7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 27 Oct 2019 14:46:46 +0100 Subject: Basic structure for #11 --- Kod/bilbana/yc4/main.m | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 1efcd77..15019c3 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -23,6 +23,7 @@ start_race(2) car1 = struct; car1.running = false; +car1.automatic = true; car1.segment = 1; car1.lap = 0; car1.lap_times = []; @@ -30,6 +31,7 @@ car1.seg_times = []; car2 = struct; car2.running = false; +car2.automatic = true; car2.segment = 1; car2.lap = 0; car2.lap_times = []; @@ -38,8 +40,30 @@ car2.seg_times = []; tocs = []; %% ASK ACTIVE CARS -car1.running = (prompt('Vill du köra bil 1? (J/N) [N]', 's') == 'J') -car2.running = (prompt('Vill du köra bil 2? (J/N) [N]', 's') == 'J') +disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); + +car1.response = prompt('Vill du köra bil 1? [N]'); +if car1.response == 'J' + car1.running = true; + car1.automatic = true; +elseif car1.response == 'M' + car1.running = true; + car1.automatic = false; +else + car1.running = false; +end + +car2.response = prompt('Vill du köra bil 2? [N]'); +if car2.response == 'J' + car2.running = true; + car2.automatic = true; +elseif car2.response == 'M' + car2.running = true; + car2.automatic = false; +else + car2.running = false; +end + %% MAIN LOOP while 1 @@ -132,7 +156,7 @@ while 1 end %% CALCULATE (CAR 2) - if car1.running == true + if car1.running == true & car1.automatic == true car1.car_constant = get_car_constant(1); car1.v = get_new_v(car1.segment); car1.track_u_constant = get_track_u_constant(); @@ -140,18 +164,29 @@ while 1 end %% CALCULATE (CAR 2) - if car2.running == true + if car2.running == true & car2.automatic == true car2.car_constant = get_car_constant(2); car2.v = get_new_v(car2.segment); car2.track_u_constant = get_track_u_constant(); car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); end + %% CONTROLLER (CAR 1) + if car1.running == true & car1.automatic == false + % TODO + end + + %% CONTROLLER (CAR 2) + if car2.running == true & car2.automatic == false + % TODO + end + + %% EXECUTE - if car1.running == true + if car1.running == true & car1.automatic == true set_car_speed(1, car1.u); end - if car2.running == true + if car2.running == true & car2.automatic == true set_car_speed(2, car2.u); end %% DISPLAY @@ -175,4 +210,4 @@ matlabclient(3); %% DISPLAY GRAPHS graphs(car1.lap_times, 13, car1.seg_times, 1); -graphs(car2.lap_times, 13, car2.seg_times, 2); \ No newline at end of file +graphs(car2.lap_times, 13, car2.seg_times, 2); -- cgit v1.2.1 From 7dd139c45e4991562c4cdbc2caff519b19919a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 27 Oct 2019 21:28:04 +0100 Subject: Fix #18 --- Kod/bilbana/yc4/main.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 15019c3..39f1d88 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -209,5 +209,9 @@ matlabclient(3); %% DISPLAY GRAPHS -graphs(car1.lap_times, 13, car1.seg_times, 1); -graphs(car2.lap_times, 13, car2.seg_times, 2); +if car1.running == true + graphs(car1.lap_times, 13, car1.seg_times, 1); +end +if car2.running == true + graphs(car2.lap_times, 13, car2.seg_times, 2); +end -- cgit v1.2.1 From 106ac305c758766007ef682fd53caa3b089e60ec Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 29 Oct 2019 11:28:22 +0100 Subject: Minor fixes --- Kod/bilbana/yc4/main.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 39f1d88..b77684a 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -42,7 +42,7 @@ tocs = []; %% ASK ACTIVE CARS disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); -car1.response = prompt('Vill du köra bil 1? [N]'); +car1.response = input('Vill du köra bil 1? [N]', 's'); if car1.response == 'J' car1.running = true; car1.automatic = true; @@ -53,7 +53,7 @@ else car1.running = false; end -car2.response = prompt('Vill du köra bil 2? [N]'); +car2.response = input('Vill du köra bil 2? [N]', 's'); if car2.response == 'J' car2.running = true; car2.automatic = true; @@ -80,7 +80,7 @@ while 1 %% READ if car1.running == true [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); - end + end if car2.running == true [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); end -- cgit v1.2.1 From 6b234ca1ff1828a7fcf795ada97a40d9d4de3f4a Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 29 Oct 2019 11:28:52 +0100 Subject: Use && instead of & --- Kod/bilbana/yc4/main.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index b77684a..64ad6ce 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -156,7 +156,7 @@ while 1 end %% CALCULATE (CAR 2) - if car1.running == true & car1.automatic == true + if car1.running == true && car1.automatic == true car1.car_constant = get_car_constant(1); car1.v = get_new_v(car1.segment); car1.track_u_constant = get_track_u_constant(); @@ -164,7 +164,7 @@ while 1 end %% CALCULATE (CAR 2) - if car2.running == true & car2.automatic == true + if car2.running == true && car2.automatic == true car2.car_constant = get_car_constant(2); car2.v = get_new_v(car2.segment); car2.track_u_constant = get_track_u_constant(); @@ -172,21 +172,21 @@ while 1 end %% CONTROLLER (CAR 1) - if car1.running == true & car1.automatic == false + if car1.running == true && car1.automatic == false % TODO end %% CONTROLLER (CAR 2) - if car2.running == true & car2.automatic == false + if car2.running == true && car2.automatic == false % TODO end %% EXECUTE - if car1.running == true & car1.automatic == true + if car1.running == true && car1.automatic == true set_car_speed(1, car1.u); - end - if car2.running == true & car2.automatic == true + end + if car2.running == true && car2.automatic == true set_car_speed(2, car2.u); end %% DISPLAY -- cgit v1.2.1 From c7c6e7b4036cc66384c2ded8f2f67ec942de857a Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 29 Oct 2019 11:40:14 +0100 Subject: typo --- Kod/bilbana/yc4/main.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 64ad6ce..578f756 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -155,7 +155,7 @@ while 1 end end - %% CALCULATE (CAR 2) + %% CALCULATE (CAR 1) if car1.running == true && car1.automatic == true car1.car_constant = get_car_constant(1); car1.v = get_new_v(car1.segment); -- cgit v1.2.1 From f41d4ddd30ed882c91614fabb2666821fd8c9a38 Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 29 Oct 2019 11:45:47 +0100 Subject: typo again --- Kod/bilbana/yc4/main.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 578f756..04308bf 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -42,7 +42,7 @@ tocs = []; %% ASK ACTIVE CARS disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); -car1.response = input('Vill du köra bil 1? [N]', 's'); +car1.response = input('Vill du köra bil 1? [N] ', 's'); if car1.response == 'J' car1.running = true; car1.automatic = true; @@ -53,7 +53,7 @@ else car1.running = false; end -car2.response = input('Vill du köra bil 2? [N]', 's'); +car2.response = input('Vill du köra bil 2? [N] ', 's'); if car2.response == 'J' car2.running = true; car2.automatic = true; -- cgit v1.2.1