From 1a989c55ec63460c38fa09f3922991ab48adca5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Thor=C3=A9n?= Date: Thu, 28 Nov 2019 12:08:21 +0100 Subject: =?UTF-8?q?N=C3=A5got=20b=C3=A4ttre=20bana=201=20typ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Kod/bilbana/yc4/do_boot.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Kod/bilbana/yc4/do_boot.m') diff --git a/Kod/bilbana/yc4/do_boot.m b/Kod/bilbana/yc4/do_boot.m index 9c4930c..1049910 100644 --- a/Kod/bilbana/yc4/do_boot.m +++ b/Kod/bilbana/yc4/do_boot.m @@ -5,7 +5,7 @@ if car.running == true %% BEFORE FIRST LAP if car.lap == 0 t = toc(boot.time); - if t > 0.6 + if t > 0.7 car.constant = car.constant + 0.12; disp('###') disp(car.num) @@ -15,7 +15,7 @@ if car.running == true end %% WHEN NEW LAP if car.new_lap == 1 - car.constant = car.constant * 1.2; + car.constant = car.constant + 0.2; disp('###') disp(car.num) disp(car.constant) @@ -23,7 +23,7 @@ if car.running == true %% First segment if car.lap == 1 && car.segment == 1 || car.lap == 1 && car.segment == 2 t = toc(boot.time); - if t > 0.8 + if t > 1 car.constant = car.constant + 0.04; disp('###') disp(car.num) @@ -51,9 +51,9 @@ if car.running == true seg_time = car.seg_times(1, 3); laptime_forecast = seg_time / 0.102; forecast_ref_diff = laptime_forecast - car.ref_time; - forecast_ref_diff_rel = forecast_ref_diff / car.ref_time; - car.constant = car.constant + (forecast_ref_diff_rel * 0.15); - car.constant = car.constant * 1.05; % kompensation för kall bana + forecast_ref_diff_rel = forecast_ref_diff / 20;%car.ref_time; + car.constant = car.constant + (forecast_ref_diff_rel * 0.5); + %car.constant = car.constant * 1.05; % kompensation för kall bana boot.status = 0; disp('END OF BOOTSTRAP') disp(car.num) -- cgit v1.2.1 From 73117213ab2b46c6045be187797ad5734dcaf7d9 Mon Sep 17 00:00:00 2001 From: Albin Date: Thu, 28 Nov 2019 19:45:05 +0100 Subject: Lite smartare END OF BOOTSTRAP --- Kod/bilbana/yc4/do_boot.m | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Kod/bilbana/yc4/do_boot.m') diff --git a/Kod/bilbana/yc4/do_boot.m b/Kod/bilbana/yc4/do_boot.m index 1049910..2d4784d 100644 --- a/Kod/bilbana/yc4/do_boot.m +++ b/Kod/bilbana/yc4/do_boot.m @@ -47,17 +47,16 @@ if car.running == true %% END BOOTSTRAP if car.segment > 3 + car.governs(length(car.governs) + 1) = car.constant; disp(car.constant); - seg_time = car.seg_times(1, 3); - laptime_forecast = seg_time / 0.102; - forecast_ref_diff = laptime_forecast - car.ref_time; - forecast_ref_diff_rel = forecast_ref_diff / 20;%car.ref_time; - car.constant = car.constant + (forecast_ref_diff_rel * 0.5); - %car.constant = car.constant * 1.05; % kompensation för kall bana + status = car.forecasts_naive(car.lap, car.segment-1)/20; + car.constant = car.constant + (status - 1) * 0.08; + boot.status = 0; disp('END OF BOOTSTRAP') disp(car.num) disp(car.constant) + car.governs(length(car.governs) + 1) = car.constant; end end end \ No newline at end of file -- cgit v1.2.1 From d178a9de2ede3f11b990fc08dd4054513b7d2d8d Mon Sep 17 00:00:00 2001 From: Albin Date: Thu, 28 Nov 2019 20:03:27 +0100 Subject: =?UTF-8?q?Gr=C3=A5=2067=20k=C3=B6r=20b=C3=A4ttre'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Kod/bilbana/yc4/do_boot.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Kod/bilbana/yc4/do_boot.m') diff --git a/Kod/bilbana/yc4/do_boot.m b/Kod/bilbana/yc4/do_boot.m index 2d4784d..a9306ef 100644 --- a/Kod/bilbana/yc4/do_boot.m +++ b/Kod/bilbana/yc4/do_boot.m @@ -20,10 +20,10 @@ if car.running == true disp(car.num) disp(car.constant) end - %% First segment + %% First segments if car.lap == 1 && car.segment == 1 || car.lap == 1 && car.segment == 2 t = toc(boot.time); - if t > 1 + if t > 1.2 car.constant = car.constant + 0.04; disp('###') disp(car.num) -- cgit v1.2.1 From eb9ecb33847612eca9d48dd3a88b4cf1396b70dd Mon Sep 17 00:00:00 2001 From: Albin Date: Fri, 29 Nov 2019 11:35:42 +0100 Subject: =?UTF-8?q?Inf=C3=B6r=20bp5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Kod/bilbana/yc4/do_boot.m | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'Kod/bilbana/yc4/do_boot.m') diff --git a/Kod/bilbana/yc4/do_boot.m b/Kod/bilbana/yc4/do_boot.m index a9306ef..5b60eb8 100644 --- a/Kod/bilbana/yc4/do_boot.m +++ b/Kod/bilbana/yc4/do_boot.m @@ -7,27 +7,31 @@ if car.running == true t = toc(boot.time); if t > 0.7 car.constant = car.constant + 0.12; - disp('###') - disp(car.num) - disp(car.constant) + % disp('###') + % disp(car.num) + % disp(car.constant) boot.time = tic; end end %% WHEN NEW LAP if car.new_lap == 1 car.constant = car.constant + 0.2; - disp('###') - disp(car.num) - disp(car.constant) + % disp('###') + % disp(car.num) + % disp(car.constant) end %% First segments if car.lap == 1 && car.segment == 1 || car.lap == 1 && car.segment == 2 t = toc(boot.time); if t > 1.2 - car.constant = car.constant + 0.04; - disp('###') - disp(car.num) - disp(car.constant) + if car.num == 1 + car.constant = car.constant + 0.06; + else + car.constant = car.constant + 0.04; + end + % disp('###') + % disp(car.num) + % disp(car.constant) boot.time = tic; end @@ -42,20 +46,19 @@ if car.running == true % disp(car.constant) % boot.time = tic; % end - % % end %% END BOOTSTRAP if car.segment > 3 car.governs(length(car.governs) + 1) = car.constant; - disp(car.constant); - status = car.forecasts_naive(car.lap, car.segment-1)/20; + % disp(car.constant); + status = car.forecasts_naive(car.lap, car.segment-1) / 15; car.constant = car.constant + (status - 1) * 0.08; boot.status = 0; - disp('END OF BOOTSTRAP') - disp(car.num) - disp(car.constant) + % disp('END OF BOOTSTRAP') + % disp(car.num) + % disp(car.constant) car.governs(length(car.governs) + 1) = car.constant; end end -- cgit v1.2.1