Move mat files

This commit is contained in:
Thomas Dehaeze 2020-11-12 09:23:35 +01:00
parent 2a0b6be82f
commit 7b5a3c521f
16 changed files with 54 additions and 54 deletions

108
index.org
View File

@ -50,46 +50,6 @@
#+caption: Zoom on the APA #+caption: Zoom on the APA
[[file:figs/setup_zoom.png]] [[file:figs/setup_zoom.png]]
* Setup
:PROPERTIES:
:header-args:matlab+: :tangle matlab/setup_experiment.m
:header-args:matlab+: :comments org :mkdirp yes
:END:
** Parameters
#+begin_src matlab
Ts = 1e-4;
#+end_src
** Filter White Noise
#+begin_src matlab
Glpf = 1/(1 + s/2/pi/500);
Gz = c2d(Glpf, Ts, 'tustin');
#+end_src
* Run Experiment and Save Data
:PROPERTIES:
:header-args:matlab+: :tangle matlab/run_experiment.m
:header-args:matlab+: :comments org :mkdirp yes
:END:
** Load Data
#+begin_src matlab
data = SimulinkRealTime.utils.getFileScopeData('data/apa95ml.dat').data;
#+end_src
** Save Data
#+begin_src matlab
u = data(:, 1); % Input Voltage [V]
y = data(:, 2); % Output Displacement [m]
t = data(:, 3); % Time [s]
#+end_src
#+begin_src matlab
save('./mat/huddle_test.mat', 't', 'u', 'y', 'Glpf');
#+end_src
* Huddle Test * Huddle Test
:PROPERTIES: :PROPERTIES:
:header-args:matlab+: :tangle matlab/huddle_test.m :header-args:matlab+: :tangle matlab/huddle_test.m
@ -105,9 +65,17 @@
<<matlab-init>> <<matlab-init>>
#+end_src #+end_src
#+begin_src matlab :tangle no
addpath('./matlab/mat/');
#+end_src
#+begin_src matlab :eval no
addpath('./mat/');
#+end_src
** Load Data :noexport: ** Load Data :noexport:
#+begin_src matlab #+begin_src matlab
load('./mat/huddle_test.mat', 't', 'y'); load('huddle_test.mat', 't', 'y');
#+end_src #+end_src
#+begin_src matlab #+begin_src matlab
@ -179,10 +147,18 @@ Results presented in this sections are wrong as the ADC cannot deliver enought c
<<matlab-init>> <<matlab-init>>
#+end_src #+end_src
#+begin_src matlab :tangle no
addpath('./matlab/mat/');
#+end_src
#+begin_src matlab :eval no
addpath('./mat/');
#+end_src
** Load Data :noexport: ** Load Data :noexport:
#+begin_src matlab #+begin_src matlab
ht = load('./mat/huddle_test.mat', 't', 'u', 'y'); ht = load('huddle_test.mat', 't', 'u', 'y');
load('./mat/apa95ml_5kg_10V.mat', 't', 'u', 'y'); load('apa95ml_5kg_10V.mat', 't', 'u', 'y');
#+end_src #+end_src
** Time Domain Data ** Time Domain Data
@ -306,7 +282,7 @@ Results presented in this sections are wrong as the ADC cannot deliver enought c
** Comparison with the FEM model ** Comparison with the FEM model
#+begin_src matlab #+begin_src matlab
load('mat/fem_model_5kg.mat', 'Ghm'); load('fem_model_5kg.mat', 'Ghm');
#+end_src #+end_src
#+begin_src matlab :exports none #+begin_src matlab :exports none
@ -357,10 +333,18 @@ In the next section, a current amplifier is used.
<<matlab-init>> <<matlab-init>>
#+end_src #+end_src
#+begin_src matlab :tangle no
addpath('./matlab/mat/');
#+end_src
#+begin_src matlab :eval no
addpath('./mat/');
#+end_src
** Load Data ** Load Data
#+begin_src matlab #+begin_src matlab
ht = load('./mat/huddle_test.mat', 't', 'u', 'y'); ht = load('huddle_test.mat', 't', 'u', 'y');
load('./mat/apa95ml_5kg_Amp_E505.mat', 't', 'u', 'um', 'y'); load('apa95ml_5kg_Amp_E505.mat', 't', 'u', 'um', 'y');
#+end_src #+end_src
#+begin_src matlab #+begin_src matlab
@ -476,7 +460,7 @@ In the next section, a current amplifier is used.
** Comparison with the FEM model ** Comparison with the FEM model
#+begin_src matlab #+begin_src matlab
load('mat/fem_model_5kg.mat', 'G'); load('fem_model_5kg.mat', 'G');
#+end_src #+end_src
#+begin_src matlab :exports none #+begin_src matlab :exports none
@ -531,12 +515,20 @@ The obtained dynamics from force actuator to force sensor are compare with the F
<<matlab-init>> <<matlab-init>>
#+end_src #+end_src
#+begin_src matlab :tangle no
addpath('./matlab/mat/');
#+end_src
#+begin_src matlab :eval no
addpath('./mat/');
#+end_src
** Load Data :ignore: ** Load Data :ignore:
The data are loaded: The data are loaded:
#+begin_src matlab #+begin_src matlab
a_ss = load('mat/apa95ml_5kg_1a_2s.mat', 't', 'u', 'y', 'v'); a_ss = load('apa95ml_5kg_1a_2s.mat', 't', 'u', 'y', 'v');
aa_s = load('mat/apa95ml_5kg_2a_1s.mat', 't', 'u', 'y', 'v'); aa_s = load('apa95ml_5kg_2a_1s.mat', 't', 'u', 'y', 'v');
load('mat/G_force_sensor_5kg.mat', 'G'); load('G_force_sensor_5kg.mat', 'G');
#+end_src #+end_src
** Adjust gain :ignore: ** Adjust gain :ignore:
@ -708,11 +700,19 @@ The transfer function from input voltage to output voltage are computed and show
<<matlab-init>> <<matlab-init>>
#+end_src #+end_src
#+begin_src matlab :tangle no
addpath('./matlab/mat/');
#+end_src
#+begin_src matlab :eval no
addpath('./mat/');
#+end_src
** First tests with few gains ** First tests with few gains
#+begin_src matlab #+begin_src matlab
iff_g10 = load('./mat/apa95ml_iff_g10_res.mat', 'u', 't', 'y', 'v'); iff_g10 = load('apa95ml_iff_g10_res.mat', 'u', 't', 'y', 'v');
iff_g100 = load('./mat/apa95ml_iff_g100_res.mat', 'u', 't', 'y', 'v'); iff_g100 = load('apa95ml_iff_g100_res.mat', 'u', 't', 'y', 'v');
iff_of = load('./mat/apa95ml_iff_off_res.mat', 'u', 't', 'y', 'v'); iff_of = load('apa95ml_iff_off_res.mat', 'u', 't', 'y', 'v');
#+end_src #+end_src
#+begin_src matlab #+begin_src matlab
@ -789,7 +789,7 @@ The transfer function from input voltage to output voltage are computed and show
** Second test with many Gains ** Second test with many Gains
#+begin_src matlab #+begin_src matlab
load('./mat/apa95ml_iff_test.mat', 'results'); load('apa95ml_iff_test.mat', 'results');
#+end_src #+end_src
#+begin_src matlab #+begin_src matlab