From 9fdf3c4599640c1ad14b1471d81796b154b774b6 Mon Sep 17 00:00:00 2001
From: Claudio <claudio.mandrioli@control.lth.se>
Date: Tue, 26 Feb 2019 13:55:51 +0100
Subject: [PATCH] defined two different get_setting scripts for the car and
cycling experiments
---
matlab/{get_settings.m => get_settings_car.m} | 3 ++-
matlab/get_settings_cycling.m | 3 ++-
matlab/run_many_car.m | 6 +++---
matlab/run_many_cycling.m | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
rename matlab/{get_settings.m => get_settings_car.m} (95%)
diff --git a/matlab/get_settings.m b/matlab/get_settings_car.m
similarity index 95%
rename from matlab/get_settings.m
rename to matlab/get_settings_car.m
index f4946dd..833d75b 100644
--- a/matlab/get_settings.m
+++ b/matlab/get_settings_car.m
@@ -5,9 +5,10 @@
%
% Edit: Isaac Skog (skog@kth.se), 2016-09-01
% Revised: Bo Bernhardsson 2018-01-01
+% Revised: Claudio Mandrioli 2019-02-26
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-function settings=get_settings()
+function settings=get_settings_car()
diff --git a/matlab/get_settings_cycling.m b/matlab/get_settings_cycling.m
index 117a770..966f063 100644
--- a/matlab/get_settings_cycling.m
+++ b/matlab/get_settings_cycling.m
@@ -5,9 +5,10 @@
%
% Edit: Isaac Skog (skog@kth.se), 2016-09-01
% Revised: Bo Bernhardsson 2018-01-01
+% Revised: Claudio Mandrioli 2019-02-26
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-function settings=get_settings()
+function settings=get_settings_cycling()
diff --git a/matlab/run_many_car.m b/matlab/run_many_car.m
index 1c0b64a..af2d2c9 100644
--- a/matlab/run_many_car.m
+++ b/matlab/run_many_car.m
@@ -6,14 +6,14 @@ load('GNSSaidedINS_data.mat');
%% Load filter settings
disp('Loads settings')
-settings=get_settings();
+settings=get_settings_car();
%vector of RGB colors for plotting for the different P references
color=[[0.7,0.0,0.0];[0.0,0.7,0.0];[0.7,0.0,0.7];[0.0,0.0,0.7];[0.0,0.7,0.7];[0.7,0.7,0.0]];
%vector of refrences for P
P_treshold=[4.0,5.0,6.0,8.0,10.0,12.0];
-%nubmer of runs per each P
-n_run=30;
+%number of runs per each P
+n_run=1;
%allocate memory for output
energy=zeros(n_run,length(P_treshold));
error=zeros(n_run,length(P_treshold));
diff --git a/matlab/run_many_cycling.m b/matlab/run_many_cycling.m
index b777297..a347c51 100644
--- a/matlab/run_many_cycling.m
+++ b/matlab/run_many_cycling.m
@@ -13,7 +13,7 @@ color=[[0.7,0.0,0.0];[0.0,0.7,0.0];[0.7,0.0,0.7];[0.0,0.0,0.7];[0.0,0.7,0.7];[0.
%vector of refrences for P
P_treshold=[4.0,5.0,6.0,8.0,10.0,12.0];
%nubmer of runs per each P
-n_run=30;
+n_run=1;
%allocate memory for output
energy=zeros(n_run,length(P_treshold));
error=zeros(n_run,length(P_treshold));
--
GitLab