diff options
| author | Albin <albwa833@student.liu.se> | 2019-11-20 18:23:55 +0100 |
|---|---|---|
| committer | Albin <albwa833@student.liu.se> | 2019-11-20 18:23:55 +0100 |
| commit | 9b04ca018663d2f1015a3c77f545ed2df6b7b79d (patch) | |
| tree | 62cf8e5decf0451e3b1de444efb3689d637028cb /Kod/bilbana | |
| parent | 92c7372b418f3160d50fbe2fe5ab795aac1ccb4f (diff) | |
| download | tfyy51-9b04ca018663d2f1015a3c77f545ed2df6b7b79d.tar.gz | |
Tog bort seg_constant
Diffstat (limited to 'Kod/bilbana')
| -rw-r--r-- | Kod/bilbana/yc4/do_car.m | 6 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Kod/bilbana/yc4/do_car.m b/Kod/bilbana/yc4/do_car.m index 96b328d..46d1a9d 100644 --- a/Kod/bilbana/yc4/do_car.m +++ b/Kod/bilbana/yc4/do_car.m @@ -90,7 +90,6 @@ if car.running == true if car.new_lap == false % choose_position krachar vid nytt varv (seg 10) if car.lap ~= 0 car.seg_times(car.lap, car.segment) = toc(car.seg_tic); - car.seg_constant_list(car.lap, car.segment) = car.seg_constant; end car.segment = car.segment + 1; car.seg_tic = tic; @@ -106,7 +105,6 @@ if car.running == true end if seg_plus ~= 0 car.seg_times(car.lap, car.segment - seg_plus - 1) = 0; - car.seg_constant_list(car.lap, car.segment - seg_plus - 1) = 0; disp(car.seg_times(car.lap, :)) disp(seg_plus) end @@ -134,7 +132,6 @@ if car.running == true % Spara inte seg_time om missad givare if car.segment == 9 car.seg_times(car.lap, car.segment) = toc(car.seg_tic); - car.seg_constant_list(car.lap, car.segment) = car.seg_constant; end car.seg_tic = tic; car.lap_times(car.lap) = toc(car.lap_tic); @@ -159,8 +156,7 @@ end %% CALCULATE if car.running == true && car.automatic == true car.v = get_new_v(car.position, car.map); - car.seg_constant = get_seg_constant(car.position, car.lap_constants, car.num, car.pos_at); - car.u = get_new_u(car.v, car.seg_constant); + car.u = get_new_u(car.v, car.constant); end %% CONTROLLER diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 5481aa0..6794831 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -224,9 +224,9 @@ disp(car2); terminate(1); terminate(2) - -matlabclient(3); - +if display_active + matlabclient(3); +end %% DISPLAY GRAPHS if car1.running == true |