diff options
Diffstat (limited to 'Kod/bilbana')
| -rw-r--r-- | Kod/bilbana/Graph/graphs.m | 6 | ||||
| -rw-r--r-- | Kod/bilbana/Graph/segment_time_graph.m | 12 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/graphs.m | 15 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 9 |
4 files changed, 18 insertions, 24 deletions
diff --git a/Kod/bilbana/Graph/graphs.m b/Kod/bilbana/Graph/graphs.m index 42a1196..a4ebf11 100644 --- a/Kod/bilbana/Graph/graphs.m +++ b/Kod/bilbana/Graph/graphs.m @@ -1,4 +1,4 @@ -function [] = graphs(lap_times,ref_lap_time, seg_times, track) +function [] = graphs(lap_times, ref_lap_time, seg_times, track) %{GRAPHS: Två grafer i samma figur. Varvtider och medeltid/segment %{ lap_times: vektor med alla varvtider, @@ -8,7 +8,7 @@ track: den bana som de andra argumenten gäller för %} figure(track); clf; -lap_time_graph(lap_times,track,ref_lap_time); -segment_time_graph(seg_times,track); +lap_time_graph(lap_times, track, ref_lap_time); +segment_time_graph(seg_times, track); end diff --git a/Kod/bilbana/Graph/segment_time_graph.m b/Kod/bilbana/Graph/segment_time_graph.m index f88c836..602938b 100644 --- a/Kod/bilbana/Graph/segment_time_graph.m +++ b/Kod/bilbana/Graph/segment_time_graph.m @@ -1,15 +1,15 @@ -function [] = segment_time_graph(seg_time,track) +function [] = segment_time_graph(seg_time, track) %SEGMENT_TIME_GRAPH Snittid för varje segment. - -avr_seg_time = mean(seg_time); -subplot(20,1,13:20); +seg_time_size = size(seg_time); +avr_seg_time = mean(seg_time(1:(seg_time_size(1) - 1), 1:(seg_time_size(2)))); +subplot(20, 1, 13:20); Plot = bar(avr_seg_time); %Plot.Marker = 'o'; Plot.FaceColor = 'k'; xlabel('Segment'); ylabel('Tid [s]'); -Tit = join(['Medeltid/segment bana',string(track)]); -title(Tit); +tit = join(['Medeltid/segment bana',string(track)]); +title(tit); end diff --git a/Kod/bilbana/yc4/graphs.m b/Kod/bilbana/yc4/graphs.m deleted file mode 100644 index 09d3604..0000000 --- a/Kod/bilbana/yc4/graphs.m +++ /dev/null @@ -1,15 +0,0 @@ -function [] = grapfs(inputArg1,inputArg2) -%{ -GRAPHS: Efter avslutad körning skall plottar som sammanfattar körningen -visas på styrdatorns skärm. Nödvändiga plottar är: -• En graf som visar varv och varvtider där referenstiden och -maximalt tillåtna avvikelser är utmärkta. Figuren skall också inkludera en -text som anger standardavvikelsen. -• Gaspådrag mot tid/hastighet för varje segment. -%} -% Detailed explanation goes here -%% -figure(1) -subplot(1,1,1) -end - diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 4c700bb..3bdf697 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -79,6 +79,8 @@ while 1 car1.segment = 1; car1.lap = car1.lap + 1; + + car1.seg_times(car1.lap, 1) = 0; end %% CHECK LAP AND CHECKPOINT (CAR 2) @@ -111,6 +113,8 @@ while 1 car2.segment = 1; car2.lap = car2.lap + 1; + + car2.seg_times(car2.lap, 1) = 0; end %% CALCULATE (CAR 1) @@ -146,3 +150,8 @@ terminate(1); terminate(2); matlabclient(3); + +%% DISPLAY GRAPHS + +graphs(car1.lap_times, 13, car1.seg_times, 1); +graphs(car2.lap_times, 13, car2.seg_times, 2);
\ No newline at end of file |
