From 7b5a3c521fce67ebefd9ed59e20ac4c461027bbf Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Thu, 12 Nov 2020 09:23:35 +0100 Subject: [PATCH] Move mat files --- index.org | 108 +++++++++--------- {mat => matlab/mat}/G_force_sensor_5kg.mat | Bin {mat => matlab/mat}/apa95ml_5kg_10V.mat | Bin {mat => matlab/mat}/apa95ml_5kg_1a_2s.mat | Bin {mat => matlab/mat}/apa95ml_5kg_2a_1s.mat | Bin {mat => matlab/mat}/apa95ml_5kg_2s_1a.mat | Bin {mat => matlab/mat}/apa95ml_5kg_Amp_E503.mat | Bin {mat => matlab/mat}/apa95ml_5kg_Amp_E505.mat | Bin .../mat}/apa95ml_5kg_Amp_E505_no_lpf.mat | Bin {mat => matlab/mat}/apa95ml_iff_g100_res.mat | Bin {mat => matlab/mat}/apa95ml_iff_g10_res.mat | Bin {mat => matlab/mat}/apa95ml_iff_off_res.mat | Bin {mat => matlab/mat}/apa95ml_iff_test.mat | Bin {mat => matlab/mat}/fem_model_5kg.mat | Bin {mat => matlab/mat}/fem_model_Gf_5kg.mat | Bin {mat => matlab/mat}/huddle_test.mat | Bin 16 files changed, 54 insertions(+), 54 deletions(-) rename {mat => matlab/mat}/G_force_sensor_5kg.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_10V.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_1a_2s.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_2a_1s.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_2s_1a.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_Amp_E503.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_Amp_E505.mat (100%) rename {mat => matlab/mat}/apa95ml_5kg_Amp_E505_no_lpf.mat (100%) rename {mat => matlab/mat}/apa95ml_iff_g100_res.mat (100%) rename {mat => matlab/mat}/apa95ml_iff_g10_res.mat (100%) rename {mat => matlab/mat}/apa95ml_iff_off_res.mat (100%) rename {mat => matlab/mat}/apa95ml_iff_test.mat (100%) rename {mat => matlab/mat}/fem_model_5kg.mat (100%) rename {mat => matlab/mat}/fem_model_Gf_5kg.mat (100%) rename {mat => matlab/mat}/huddle_test.mat (100%) diff --git a/index.org b/index.org index 9c2efb1..dda0e77 100644 --- a/index.org +++ b/index.org @@ -50,46 +50,6 @@ #+caption: Zoom on the APA [[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 :PROPERTIES: :header-args:matlab+: :tangle matlab/huddle_test.m @@ -105,9 +65,17 @@ <> #+end_src +#+begin_src matlab :tangle no + addpath('./matlab/mat/'); +#+end_src + +#+begin_src matlab :eval no + addpath('./mat/'); +#+end_src + ** Load Data :noexport: #+begin_src matlab - load('./mat/huddle_test.mat', 't', 'y'); + load('huddle_test.mat', 't', 'y'); #+end_src #+begin_src matlab @@ -179,10 +147,18 @@ Results presented in this sections are wrong as the ADC cannot deliver enought c <> #+end_src +#+begin_src matlab :tangle no + addpath('./matlab/mat/'); +#+end_src + +#+begin_src matlab :eval no + addpath('./mat/'); +#+end_src + ** Load Data :noexport: #+begin_src matlab - ht = load('./mat/huddle_test.mat', 't', 'u', 'y'); - load('./mat/apa95ml_5kg_10V.mat', 't', 'u', 'y'); + ht = load('huddle_test.mat', 't', 'u', 'y'); + load('apa95ml_5kg_10V.mat', 't', 'u', 'y'); #+end_src ** 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 #+begin_src matlab - load('mat/fem_model_5kg.mat', 'Ghm'); + load('fem_model_5kg.mat', 'Ghm'); #+end_src #+begin_src matlab :exports none @@ -357,10 +333,18 @@ In the next section, a current amplifier is used. <> #+end_src +#+begin_src matlab :tangle no + addpath('./matlab/mat/'); +#+end_src + +#+begin_src matlab :eval no + addpath('./mat/'); +#+end_src + ** Load Data #+begin_src matlab - ht = load('./mat/huddle_test.mat', 't', 'u', 'y'); - load('./mat/apa95ml_5kg_Amp_E505.mat', 't', 'u', 'um', 'y'); + ht = load('huddle_test.mat', 't', 'u', 'y'); + load('apa95ml_5kg_Amp_E505.mat', 't', 'u', 'um', 'y'); #+end_src #+begin_src matlab @@ -476,7 +460,7 @@ In the next section, a current amplifier is used. ** Comparison with the FEM model #+begin_src matlab - load('mat/fem_model_5kg.mat', 'G'); + load('fem_model_5kg.mat', 'G'); #+end_src #+begin_src matlab :exports none @@ -531,12 +515,20 @@ The obtained dynamics from force actuator to force sensor are compare with the F <> #+end_src +#+begin_src matlab :tangle no + addpath('./matlab/mat/'); +#+end_src + +#+begin_src matlab :eval no + addpath('./mat/'); +#+end_src + ** Load Data :ignore: The data are loaded: #+begin_src matlab - a_ss = load('mat/apa95ml_5kg_1a_2s.mat', 't', 'u', 'y', 'v'); - aa_s = load('mat/apa95ml_5kg_2a_1s.mat', 't', 'u', 'y', 'v'); - load('mat/G_force_sensor_5kg.mat', 'G'); + a_ss = load('apa95ml_5kg_1a_2s.mat', 't', 'u', 'y', 'v'); + aa_s = load('apa95ml_5kg_2a_1s.mat', 't', 'u', 'y', 'v'); + load('G_force_sensor_5kg.mat', 'G'); #+end_src ** Adjust gain :ignore: @@ -708,11 +700,19 @@ The transfer function from input voltage to output voltage are computed and show <> #+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 #+begin_src matlab - iff_g10 = load('./mat/apa95ml_iff_g10_res.mat', 'u', 't', 'y', 'v'); - iff_g100 = load('./mat/apa95ml_iff_g100_res.mat', 'u', 't', 'y', 'v'); - iff_of = load('./mat/apa95ml_iff_off_res.mat', 'u', 't', 'y', 'v'); + iff_g10 = load('apa95ml_iff_g10_res.mat', 'u', 't', 'y', 'v'); + iff_g100 = load('apa95ml_iff_g100_res.mat', 'u', 't', 'y', 'v'); + iff_of = load('apa95ml_iff_off_res.mat', 'u', 't', 'y', 'v'); #+end_src #+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 #+begin_src matlab - load('./mat/apa95ml_iff_test.mat', 'results'); + load('apa95ml_iff_test.mat', 'results'); #+end_src #+begin_src matlab diff --git a/mat/G_force_sensor_5kg.mat b/matlab/mat/G_force_sensor_5kg.mat similarity index 100% rename from mat/G_force_sensor_5kg.mat rename to matlab/mat/G_force_sensor_5kg.mat diff --git a/mat/apa95ml_5kg_10V.mat b/matlab/mat/apa95ml_5kg_10V.mat similarity index 100% rename from mat/apa95ml_5kg_10V.mat rename to matlab/mat/apa95ml_5kg_10V.mat diff --git a/mat/apa95ml_5kg_1a_2s.mat b/matlab/mat/apa95ml_5kg_1a_2s.mat similarity index 100% rename from mat/apa95ml_5kg_1a_2s.mat rename to matlab/mat/apa95ml_5kg_1a_2s.mat diff --git a/mat/apa95ml_5kg_2a_1s.mat b/matlab/mat/apa95ml_5kg_2a_1s.mat similarity index 100% rename from mat/apa95ml_5kg_2a_1s.mat rename to matlab/mat/apa95ml_5kg_2a_1s.mat diff --git a/mat/apa95ml_5kg_2s_1a.mat b/matlab/mat/apa95ml_5kg_2s_1a.mat similarity index 100% rename from mat/apa95ml_5kg_2s_1a.mat rename to matlab/mat/apa95ml_5kg_2s_1a.mat diff --git a/mat/apa95ml_5kg_Amp_E503.mat b/matlab/mat/apa95ml_5kg_Amp_E503.mat similarity index 100% rename from mat/apa95ml_5kg_Amp_E503.mat rename to matlab/mat/apa95ml_5kg_Amp_E503.mat diff --git a/mat/apa95ml_5kg_Amp_E505.mat b/matlab/mat/apa95ml_5kg_Amp_E505.mat similarity index 100% rename from mat/apa95ml_5kg_Amp_E505.mat rename to matlab/mat/apa95ml_5kg_Amp_E505.mat diff --git a/mat/apa95ml_5kg_Amp_E505_no_lpf.mat b/matlab/mat/apa95ml_5kg_Amp_E505_no_lpf.mat similarity index 100% rename from mat/apa95ml_5kg_Amp_E505_no_lpf.mat rename to matlab/mat/apa95ml_5kg_Amp_E505_no_lpf.mat diff --git a/mat/apa95ml_iff_g100_res.mat b/matlab/mat/apa95ml_iff_g100_res.mat similarity index 100% rename from mat/apa95ml_iff_g100_res.mat rename to matlab/mat/apa95ml_iff_g100_res.mat diff --git a/mat/apa95ml_iff_g10_res.mat b/matlab/mat/apa95ml_iff_g10_res.mat similarity index 100% rename from mat/apa95ml_iff_g10_res.mat rename to matlab/mat/apa95ml_iff_g10_res.mat diff --git a/mat/apa95ml_iff_off_res.mat b/matlab/mat/apa95ml_iff_off_res.mat similarity index 100% rename from mat/apa95ml_iff_off_res.mat rename to matlab/mat/apa95ml_iff_off_res.mat diff --git a/mat/apa95ml_iff_test.mat b/matlab/mat/apa95ml_iff_test.mat similarity index 100% rename from mat/apa95ml_iff_test.mat rename to matlab/mat/apa95ml_iff_test.mat diff --git a/mat/fem_model_5kg.mat b/matlab/mat/fem_model_5kg.mat similarity index 100% rename from mat/fem_model_5kg.mat rename to matlab/mat/fem_model_5kg.mat diff --git a/mat/fem_model_Gf_5kg.mat b/matlab/mat/fem_model_Gf_5kg.mat similarity index 100% rename from mat/fem_model_Gf_5kg.mat rename to matlab/mat/fem_model_Gf_5kg.mat diff --git a/mat/huddle_test.mat b/matlab/mat/huddle_test.mat similarity index 100% rename from mat/huddle_test.mat rename to matlab/mat/huddle_test.mat