summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbin <albwa833@student.liu.se>2019-11-28 19:45:05 +0100
committerAlbin <albwa833@student.liu.se>2019-11-29 11:39:23 +0100
commit73117213ab2b46c6045be187797ad5734dcaf7d9 (patch)
treeefc8e8aff9b1da9859b71dc7d23ea35ac8387133
parent8979aecffd0ab85e1b23428cbef073f4c1ba7f36 (diff)
downloadtfyy51-73117213ab2b46c6045be187797ad5734dcaf7d9.tar.gz
Lite smartare END OF BOOTSTRAP
-rw-r--r--Kod/bilbana/yc4/do_boot.m11
-rw-r--r--Kod/bilbana/yc4/do_gov.m2
2 files changed, 6 insertions, 7 deletions
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
diff --git a/Kod/bilbana/yc4/do_gov.m b/Kod/bilbana/yc4/do_gov.m
index c92017a..8ebea57 100644
--- a/Kod/bilbana/yc4/do_gov.m
+++ b/Kod/bilbana/yc4/do_gov.m
@@ -1,7 +1,7 @@
function [ car ] = do_gov( car )
%UNTITLED Summary of this function goes here
% Detailed explanation goes here
-if car.new_lap
+if car.new_lap && car.lap > 1 % annars höjer den typ alltid första varvet
last_lap_time = car.lap_times(car.lap - 1);
time_diff = last_lap_time - car.ref_time; % diff >0 => car is too slow, go faster
car.constant = car.constant + (time_diff / car.ref_time) * 0.1;