From 65ee90878e6fa3b8e2a63a8c166fdd7518ecec7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gusso230@student.liu.se>
Date: Tue, 19 Nov 2019 16:33:18 +0100
Subject: use subarray from arrays

---
 Kod/bilbana/yc4/choose_position.m  | 3 +++
 Kod/bilbana/yc4/detect_missed.m    | 4 +++-
 Kod/bilbana/yc4/get_seg_constant.m | 3 +++
 Kod/bilbana/yc4/main.m             | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'Kod/bilbana')

diff --git a/Kod/bilbana/yc4/choose_position.m b/Kod/bilbana/yc4/choose_position.m
index 874f223..5d2dee3 100644
--- a/Kod/bilbana/yc4/choose_position.m
+++ b/Kod/bilbana/yc4/choose_position.m
@@ -5,6 +5,9 @@ function [new_position, seg_plus] = choose_position(position,segment, track, tra
 %   passerades. seg_plus anger om och med hur mycket car.segment bör
 %   justeras för att kompensera efter missad givare.
 pos_c = position;
+
+track_len = track_len(1: length(track_len) - 1);
+
 %% Vilken givare ligger närmast pos_c?
 near = [];
 for i = 1:length(track_len)
diff --git a/Kod/bilbana/yc4/detect_missed.m b/Kod/bilbana/yc4/detect_missed.m
index 087a750..1321920 100644
--- a/Kod/bilbana/yc4/detect_missed.m
+++ b/Kod/bilbana/yc4/detect_missed.m
@@ -1,6 +1,8 @@
-function [out] = detect_missed( position, segment, track)
+function [out] = detect_missed( position, segment, track, track_len)
 %DETECT_MISSED Retunerar true om position ligger utanför nuvarande segment
 %   
+
+track_len = track_len(2: length(track_len));
 a = track_len(segment);
 out = a <= position;
 end
diff --git a/Kod/bilbana/yc4/get_seg_constant.m b/Kod/bilbana/yc4/get_seg_constant.m
index 1ce861b..2de04ca 100644
--- a/Kod/bilbana/yc4/get_seg_constant.m
+++ b/Kod/bilbana/yc4/get_seg_constant.m
@@ -6,6 +6,9 @@ position - Position i meter fr
 lap_constants - De seg_constants som ska användas detta varv
 track - den bana/bil som beräkningarna ska göras för
 %}
+
+track_len = track_len(1: length(track_len) - 1);
+
 for i = 1:length(track_len)
     if position >= track_len(i)
         seg_constant_num = i;
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 11d4cad..2305d6e 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -51,7 +51,7 @@ car1.lap_times = [];
 car1.seg_times = [];
 car1.seg_constant_list = []; % TODO
 car1.position = 0;
-car1.pos_at  = [0.0 2.53 3.05 4.73 7.68 8.98 10.93 14.69 17.57];
+car1.pos_at  = [0.0 2.53 3.05 4.73 7.68 8.98 10.93 14.69 17.57 19.60];
 car1.seg_len = [2.53 0.53 1.68 2.92 1.2 2.01 3.83 2.89 1.99]
 car1.map = Bana1;
 car1.approximation = [];
@@ -69,7 +69,7 @@ car2.lap = 0;
 car2.lap_times = [];
 car2.seg_times = [];
 car2.position = 0;
-car2.pos_at  = [0.0 2.53 3.05 4.92 7.60 8.84 10.65 14.68 17.76];
+car2.pos_at  = [0.0 2.53 3.05 4.92 7.60 8.84 10.65 14.68 17.76 19.95];
 car2.seg_len = [2.53 0.53 1.87 2.68 1.24 1.81 4.03 3.09 2.19];
 car2.map = Bana2;
 car2.miss_probability = 0.1;
-- 
cgit v1.2.1