diff options
| author | David Thorén <davth346@student.liu.se> | 2019-11-28 13:03:10 +0100 |
|---|---|---|
| committer | Albin <albwa833@student.liu.se> | 2019-11-29 11:39:22 +0100 |
| commit | 603a0f3dec6953c1dd008687bfda5d49508dd413 (patch) | |
| tree | 9a197c3c880f5f169e5db3fab72476ffbc8038d8 /Kod/bilbana | |
| parent | 597c8a5a23044ecdf67af76df93529ee0a3f6ba2 (diff) | |
| download | tfyy51-603a0f3dec6953c1dd008687bfda5d49508dd413.tar.gz | |
Försökt anpassa bana 1
Diffstat (limited to 'Kod/bilbana')
| -rw-r--r-- | Kod/bilbana/files/Bana.mat | bin | 1194 -> 1192 bytes | |||
| -rw-r--r-- | Kod/bilbana/yc4/do_car.m | 2 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/do_gov.m | 8 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Kod/bilbana/files/Bana.mat b/Kod/bilbana/files/Bana.mat Binary files differindex 8167d4f..0d24a00 100644 --- a/Kod/bilbana/files/Bana.mat +++ b/Kod/bilbana/files/Bana.mat diff --git a/Kod/bilbana/yc4/do_car.m b/Kod/bilbana/yc4/do_car.m index ea7d901..2a5c873 100644 --- a/Kod/bilbana/yc4/do_car.m +++ b/Kod/bilbana/yc4/do_car.m @@ -112,7 +112,7 @@ if car.running == true track_remaining = car.pos_at(length(car.pos_at)) - car.pos_at(car.segment + 1); car.forecasts(car.lap, car.segment) = lap_time_now + track_remaining/prev_seg_v; - car.forecast_naive(car.lap, car.segment) = toc(car.seg_tic) / car.percents(car.segment) + car.forecasts_naive(car.lap, car.segment) = toc(car.seg_tic) / car.percents(car.segment) car.segment = car.segment + 1; car.seg_tic = tic; diff --git a/Kod/bilbana/yc4/do_gov.m b/Kod/bilbana/yc4/do_gov.m index e0dc45d..29d3b2e 100644 --- a/Kod/bilbana/yc4/do_gov.m +++ b/Kod/bilbana/yc4/do_gov.m @@ -5,8 +5,12 @@ if car.new_lap % TODO calculate stuff elseif car.new_check_point && (car.segment == 5 || car.segment == 8) if true %car.lap == 1 - status = car.forecasts(car.lap, car.segment-1)/car.ref_time; - car.constant = car.constant + (status - 1) * 0.08; + if car.lap == 1 + status = car.forecasts_naive(car.lap, car.segment-1)/car.ref_time; + else + status = car.forecasts(car.lap, car.segment-1)/car.ref_time; + end + car.constant = car.constant + (status - 1) * 0.08; car.governs(length(car.governs) + 1) = car.constant; end %{ diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index fbcdb6c..18fa982 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -308,7 +308,6 @@ end disp(highToc); disp(car1); disp(car2); - terminate(1); terminate(2); |