Move everything to matlab folder

This commit is contained in:
Thomas Dehaeze 2020-11-12 09:21:48 +01:00
parent 02795035f4
commit 2d373fbb6e
4 changed files with 32 additions and 50 deletions

Binary file not shown.

View File

@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head> <head>
<!-- 2020-11-12 jeu. 08:53 --> <!-- 2020-11-12 jeu. 09:21 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title>Gravity with Simscape Models</title> <title>Gravity with Simscape Models</title>
<meta name="generator" content="Org mode" /> <meta name="generator" content="Org mode" />
@ -34,12 +34,12 @@
<h2>Table of Contents</h2> <h2>Table of Contents</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
<ul> <ul>
<li><a href="#orgda17389">1. Simulink</a></li> <li><a href="#org951825b">1. Simulink</a></li>
<li><a href="#org926dcda">2. Initial Simulation</a></li> <li><a href="#org498d7ed">2. Initial Simulation</a></li>
<li><a href="#org37a8a81">3. Change the equilibrium position</a></li> <li><a href="#orgb1186cb">3. Change the equilibrium position</a></li>
<li><a href="#org542e71a">4. Add external force</a></li> <li><a href="#org93e0199">4. Add external force</a></li>
<li><a href="#org28c0d05">5. Change initial position</a></li> <li><a href="#org61f107b">5. Change initial position</a></li>
<li><a href="#orgc1f6457">6. Conclusion</a></li> <li><a href="#org84200cd">6. Conclusion</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -68,15 +68,8 @@ Then, the simulation will start at equilibrium, but all the elements will be &ld
The three solutions are tested below. The three solutions are tested below.
</p> </p>
<div class="note" id="orgaf7b6a0"> <div id="outline-container-org951825b" class="outline-2">
<p> <h2 id="org951825b"><span class="section-number-2">1</span> Simulink</h2>
All the files (data and Matlab scripts) are accessible <a href="data/simscape_gravity.zip">here</a>.
</p>
</div>
<div id="outline-container-orgda17389" class="outline-2">
<h2 id="orgda17389"><span class="section-number-2">1</span> Simulink</h2>
<div class="outline-text-2" id="text-1"> <div class="outline-text-2" id="text-1">
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-matlab">open <span class="org-string">'gravity_test.slx'</span> <pre class="src src-matlab">open <span class="org-string">'gravity_test.slx'</span>
@ -84,7 +77,7 @@ All the files (data and Matlab scripts) are accessible <a href="data/simscape_gr
</div> </div>
<div id="orgda6de48" class="figure"> <div id="orgd333d11" class="figure">
<p><img src="figs/simscape_model.png" alt="simscape_model.png" /> <p><img src="figs/simscape_model.png" alt="simscape_model.png" />
</p> </p>
<p><span class="figure-number">Figure 1: </span>Simscape model used for the simulations</p> <p><span class="figure-number">Figure 1: </span>Simscape model used for the simulations</p>
@ -92,8 +85,8 @@ All the files (data and Matlab scripts) are accessible <a href="data/simscape_gr
</div> </div>
</div> </div>
<div id="outline-container-org926dcda" class="outline-2"> <div id="outline-container-org498d7ed" class="outline-2">
<h2 id="org926dcda"><span class="section-number-2">2</span> Initial Simulation</h2> <h2 id="org498d7ed"><span class="section-number-2">2</span> Initial Simulation</h2>
<div class="outline-text-2" id="text-2"> <div class="outline-text-2" id="text-2">
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-matlab">g = <span class="org-type">-</span>10; <span class="org-comment">% [m/s^2]</span> <pre class="src src-matlab">g = <span class="org-type">-</span>10; <span class="org-comment">% [m/s^2]</span>
@ -134,7 +127,7 @@ title(<span class="org-string">''</span>);
</div> </div>
<div id="orgcdd507b" class="figure"> <div id="org521ff41" class="figure">
<p><img src="figs/sim_init.png" alt="sim_init.png" /> <p><img src="figs/sim_init.png" alt="sim_init.png" />
</p> </p>
<p><span class="figure-number">Figure 2: </span>Initial Simulation (<a href="./figs/sim_init.png">png</a>, <a href="./figs/sim_init.pdf">pdf</a>)</p> <p><span class="figure-number">Figure 2: </span>Initial Simulation (<a href="./figs/sim_init.png">png</a>, <a href="./figs/sim_init.pdf">pdf</a>)</p>
@ -142,8 +135,8 @@ title(<span class="org-string">''</span>);
</div> </div>
</div> </div>
<div id="outline-container-org37a8a81" class="outline-2"> <div id="outline-container-orgb1186cb" class="outline-2">
<h2 id="org37a8a81"><span class="section-number-2">3</span> Change the equilibrium position</h2> <h2 id="orgb1186cb"><span class="section-number-2">3</span> Change the equilibrium position</h2>
<div class="outline-text-2" id="text-3"> <div class="outline-text-2" id="text-3">
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-matlab">l0 = 0; <span class="org-comment">% Initial wanted position [m]</span> <pre class="src src-matlab">l0 = 0; <span class="org-comment">% Initial wanted position [m]</span>
@ -179,7 +172,7 @@ title(<span class="org-string">''</span>);
</div> </div>
<div id="orgc5782c2" class="figure"> <div id="org585d417" class="figure">
<p><img src="figs/sim_change_eq_position.png" alt="sim_change_eq_position.png" /> <p><img src="figs/sim_change_eq_position.png" alt="sim_change_eq_position.png" />
</p> </p>
<p><span class="figure-number">Figure 3: </span>Simulation after changing the equilibrium position of the joint (<a href="./figs/sim_change_eq_position.png">png</a>, <a href="./figs/sim_change_eq_position.pdf">pdf</a>)</p> <p><span class="figure-number">Figure 3: </span>Simulation after changing the equilibrium position of the joint (<a href="./figs/sim_change_eq_position.png">png</a>, <a href="./figs/sim_change_eq_position.pdf">pdf</a>)</p>
@ -187,8 +180,8 @@ title(<span class="org-string">''</span>);
</div> </div>
</div> </div>
<div id="outline-container-org542e71a" class="outline-2"> <div id="outline-container-org93e0199" class="outline-2">
<h2 id="org542e71a"><span class="section-number-2">4</span> Add external force</h2> <h2 id="org93e0199"><span class="section-number-2">4</span> Add external force</h2>
<div class="outline-text-2" id="text-4"> <div class="outline-text-2" id="text-4">
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-matlab">l0 = 0; <span class="org-comment">% Initial wanted position [m]</span> <pre class="src src-matlab">l0 = 0; <span class="org-comment">% Initial wanted position [m]</span>
@ -224,15 +217,15 @@ title(<span class="org-string">''</span>);
</div> </div>
<div id="org2d311aa" class="figure"> <div id="orge5eaa59" class="figure">
<p><img src="figs/sim_add_external_force.png" alt="sim_add_external_force.png" /> <p><img src="figs/sim_add_external_force.png" alt="sim_add_external_force.png" />
</p> </p>
<p><span class="figure-number">Figure 4: </span>Simulater after adding an external force applied to the solid (<a href="./figs/sim_add_external_force.png">png</a>, <a href="./figs/sim_add_external_force.pdf">pdf</a>)</p> <p><span class="figure-number">Figure 4: </span>Simulater after adding an external force applied to the solid (<a href="./figs/sim_add_external_force.png">png</a>, <a href="./figs/sim_add_external_force.pdf">pdf</a>)</p>
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-org28c0d05" class="outline-2"> <div id="outline-container-org61f107b" class="outline-2">
<h2 id="org28c0d05"><span class="section-number-2">5</span> Change initial position</h2> <h2 id="org61f107b"><span class="section-number-2">5</span> Change initial position</h2>
<div class="outline-text-2" id="text-5"> <div class="outline-text-2" id="text-5">
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-matlab">l0 = out_init.d.Data(end); <span class="org-comment">% Initial wanted position [m]</span> <pre class="src src-matlab">l0 = out_init.d.Data(end); <span class="org-comment">% Initial wanted position [m]</span>
@ -268,15 +261,15 @@ title(<span class="org-string">''</span>);
</div> </div>
<div id="org80b8e3e" class="figure"> <div id="orgc7e04f4" class="figure">
<p><img src="figs/sim_change_initial_position.png" alt="sim_change_initial_position.png" /> <p><img src="figs/sim_change_initial_position.png" alt="sim_change_initial_position.png" />
</p> </p>
<p><span class="figure-number">Figure 5: </span>Simulation after changing the initial position of the joint (<a href="./figs/sim_change_initial_position.png">png</a>, <a href="./figs/sim_change_initial_position.pdf">pdf</a>)</p> <p><span class="figure-number">Figure 5: </span>Simulation after changing the initial position of the joint (<a href="./figs/sim_change_initial_position.png">png</a>, <a href="./figs/sim_change_initial_position.pdf">pdf</a>)</p>
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-orgc1f6457" class="outline-2"> <div id="outline-container-org84200cd" class="outline-2">
<h2 id="orgc1f6457"><span class="section-number-2">6</span> Conclusion</h2> <h2 id="org84200cd"><span class="section-number-2">6</span> Conclusion</h2>
<div class="outline-text-2" id="text-6"> <div class="outline-text-2" id="text-6">
<p> <p>
Three techniques: Three techniques:
@ -297,7 +290,7 @@ Three techniques:
</ul></li> </ul></li>
</ul> </ul>
<div class="important" id="org55dcf26"> <div class="important" id="orgdb2539b">
<p> <p>
Changing the equilibrium position of each joint seem the most practical solution. Changing the equilibrium position of each joint seem the most practical solution.
</p> </p>
@ -308,7 +301,7 @@ Changing the equilibrium position of each joint seem the most practical solution
</div> </div>
<div id="postamble" class="status"> <div id="postamble" class="status">
<p class="author">Author: Dehaeze Thomas</p> <p class="author">Author: Dehaeze Thomas</p>
<p class="date">Created: 2020-11-12 jeu. 08:53</p> <p class="date">Created: 2020-11-12 jeu. 09:21</p>
</div> </div>
</body> </body>
</html> </html>

View File

@ -43,28 +43,17 @@ We can then think of three solutions to start a new simulation directly at the s
The three solutions are tested below. The three solutions are tested below.
* ZIP file containing the data and matlab files :ignore:
#+begin_src bash :exports none :results none
if [ matlab/simscape_gravity.m -nt data/simscape_gravity.zip ]; then
cp matlab/simscape_gravity.m simscape_gravity.m;
zip data/simscape_gravity \
gravity_test.slx \
simscape_gravity.m
rm simscape_gravity.m;
fi
#+end_src
#+begin_note
All the files (data and Matlab scripts) are accessible [[file:data/simscape_gravity.zip][here]].
#+end_note
* Matlab Init :noexport:ignore: * Matlab Init :noexport:ignore:
#+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) #+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
<<matlab-dir>> <<matlab-dir>>
#+end_src #+end_src
#+begin_src matlab :exports none :results silent :noweb yes #+begin_src matlab :exports none :results silent :noweb yes
<<matlab-init>> <<matlab-init>>
#+end_src
#+begin_src matlab :tangle no
addpath('./matlab');
#+end_src #+end_src
* Simulink * Simulink