diff --git a/module2/exo2/exercice_python_en.org b/module2/exo2/exercice_python_en.org
index 8f993ccb78146e20fccd0e18da3d0599dc7205d3..565e79c03d4cd84608daae11798612253575aec5 100644
--- a/module2/exo2/exercice_python_en.org
+++ b/module2/exo2/exercice_python_en.org
@@ -12,7 +12,7 @@
#+HTML_HEAD:
* Data
-#+begin_src :export output python :session *python*
+#+begin_src python :results output :export none :session *python*
import numpy as np
data = np.array([14.0, 7.6, 11.2, 12.8, 12.5, 9.9, 14.9, 9.4, 16.9, 10.2, 14.9, 18.1, 7.3, 9.8, 10.9,12.2, 9.9, 2.9, 2.8, 15.4, 15.7, 9.7, 13.1, 13.2, 12.3, 11.7, 16.0, 12.4, 17.9, 12.2, 16.2, 18.7, 8.9, 11.9, 12.1, 14.6, 12.1, 4.7, 3.9, 16.9, 16.8, 11.3, 14.4, 15.7, 14.0, 13.6, 18.0, 13.6, 19.9, 13.7, 17.0, 20.5, 9.9, 12.5, 13.2, 16.1, 13.5, 6.3, 6.4, 17.6, 19.1, 12.8, 15.5, 16.3, 15.2, 14.6, 19.1, 14.4, 21.4, 15.1, 19.6, 21.7, 11.3, 15.0, 14.3, 16.8, 14.0, 6.8, 8.2, 19.9, 20.4, 14.6, 16.4, 18.7, 16.8, 15.8, 20.4, 15.8, 22.4, 16.2, 20.3, 23.4, 12.1, 15.5, 15.4, 18.4, 15.7, 10.2, 8.9, 21.0])
@@ -21,7 +21,6 @@ data
#+end_src
#+RESULTS:
-| 14 | 7.6 | 11.2 | 12.8 | 12.5 | 9.9 | 14.9 | 9.4 | 16.9 | 10.2 | 14.9 | 18.1 | 7.3 | 9.8 | 10.9 | 12.2 | 9.9 | 2.9 | 2.8 | 15.4 | 15.7 | 9.7 | 13.1 | 13.2 | 12.3 | 11.7 | 16 | 12.4 | 17.9 | 12.2 | 16.2 | 18.7 | 8.9 | 11.9 | 12.1 | 14.6 | 12.1 | 4.7 | 3.9 | 16.9 | 16.8 | 11.3 | 14.4 | 15.7 | 14 | 13.6 | 18 | 13.6 | 19.9 | 13.7 | 17 | 20.5 | 9.9 | 12.5 | 13.2 | 16.1 | 13.5 | 6.3 | 6.4 | 17.6 | 19.1 | 12.8 | 15.5 | 16.3 | 15.2 | 14.6 | 19.1 | 14.4 | 21.4 | 15.1 | 19.6 | 21.7 | 11.3 | 15 | 14.3 | 16.8 | 14 | 6.8 | 8.2 | 19.9 | 20.4 | 14.6 | 16.4 | 18.7 | 16.8 | 15.8 | 20.4 | 15.8 | 22.4 | 16.2 | 20.3 | 23.4 | 12.1 | 15.5 | 15.4 | 18.4 | 15.7 | 10.2 | 8.9 | 21 |
* Calculations
What is the average
diff --git a/module2/exo3/exercice_python_en.org b/module2/exo3/exercice_python_en.org
index 5782f493934678ba782fb65634a4d86e5f3adefc..994746b038f1f660ede318d0903cf906d7b4a1ae 100644
--- a/module2/exo3/exercice_python_en.org
+++ b/module2/exo3/exercice_python_en.org
@@ -1,6 +1,6 @@
-#+TITLE: Your title
-#+AUTHOR: Your name
-#+DATE: Today's date
+#+TITLE: Module 2 Exercise 2
+#+AUTHOR: Jamal KHAN
+#+DATE: 2020-09-15
#+LANGUAGE: en
# #+PROPERTY: header-args :eval never-export
@@ -11,84 +11,46 @@
#+HTML_HEAD:
#+HTML_HEAD:
-* Some explanations
+* Data
+#+begin_src python :results output :export none :session *mod2_exo2*
+import numpy as np
-This is an org-mode document with code examples in R. Once opened in
-Emacs, this document can easily be exported to HTML, PDF, and Office
-formats. For more information on org-mode, see
-https://orgmode.org/guide/.
+data = np.array([14.0, 7.6, 11.2, 12.8, 12.5, 9.9, 14.9, 9.4, 16.9, 10.2, 14.9, 18.1, 7.3, 9.8, 10.9,12.2, 9.9, 2.9, 2.8, 15.4, 15.7, 9.7, 13.1, 13.2, 12.3, 11.7, 16.0, 12.4, 17.9, 12.2, 16.2, 18.7, 8.9, 11.9, 12.1, 14.6, 12.1, 4.7, 3.9, 16.9, 16.8, 11.3, 14.4, 15.7, 14.0, 13.6, 18.0, 13.6, 19.9, 13.7, 17.0, 20.5, 9.9, 12.5, 13.2, 16.1, 13.5, 6.3, 6.4, 17.6, 19.1, 12.8, 15.5, 16.3, 15.2, 14.6, 19.1, 14.4, 21.4, 15.1, 19.6, 21.7, 11.3, 15.0, 14.3, 16.8, 14.0, 6.8, 8.2, 19.9, 20.4, 14.6, 16.4, 18.7, 16.8, 15.8, 20.4, 15.8, 22.4, 16.2, 20.3, 23.4, 12.1, 15.5, 15.4, 18.4, 15.7, 10.2, 8.9, 21.0])
-When you type the shortcut =C-c C-e h o=, this document will be
-exported as HTML. All the code in it will be re-executed, and the
-results will be retrieved and included into the exported document. If
-you do not want to re-execute all code each time, you can delete the #
-and the space before ~#+PROPERTY:~ in the header of this document.
-
-Like we showed in the video, Python code is included as follows (and
-is exxecuted by typing ~C-c C-c~):
-
-#+begin_src python :results output :exports both
-print("Hello world!")
+data
#+end_src
#+RESULTS:
-: Hello world!
-
-And now the same but in an Python session. With a session, Python's
-state, i.e. the values of all the variables, remains persistent from
-one code block to the next. The code is still executed using ~C-c
-C-c~.
-
-#+begin_src python :results output :session :exports both
-import numpy
-x=numpy.linspace(-15,15)
-print(x)
-#+end_src
-#+RESULTS:
-#+begin_example
-[-15. -14.3877551 -13.7755102 -13.16326531 -12.55102041
- -11.93877551 -11.32653061 -10.71428571 -10.10204082 -9.48979592
- -8.87755102 -8.26530612 -7.65306122 -7.04081633 -6.42857143
- -5.81632653 -5.20408163 -4.59183673 -3.97959184 -3.36734694
- -2.75510204 -2.14285714 -1.53061224 -0.91836735 -0.30612245
- 0.30612245 0.91836735 1.53061224 2.14285714 2.75510204
- 3.36734694 3.97959184 4.59183673 5.20408163 5.81632653
- 6.42857143 7.04081633 7.65306122 8.26530612 8.87755102
- 9.48979592 10.10204082 10.71428571 11.32653061 11.93877551
- 12.55102041 13.16326531 13.7755102 14.3877551 15. ]
-#+end_example
-
-Finally, an example for graphical output:
-#+begin_src python :results output file :session :var matplot_lib_filename="./cosxsx.png" :exports results
+* Timeseries Plot
+#+begin_src python :results output file :exports both :var figname="mod2_exo2_plot1.png" :session *mod2_exo2*
import matplotlib.pyplot as plt
-plt.figure(figsize=(10,5))
-plt.plot(x,numpy.cos(x)/x)
-plt.tight_layout()
+fig, ax = plt.subplots()
+ax.plot(data, 'b-')
+ax.set_xlim([0, 100])
+ax.set_ylim([0, 25])
+ax.grid(color='gray', linestyle='--')
-plt.savefig(matplot_lib_filename)
-print(matplot_lib_filename)
+plt.savefig(figname)
+print(figname)
#+end_src
#+RESULTS:
-[[file:./cosxsx.png]]
+[[file:mod2_exo2_plot1.png]]
-Note the parameter ~:exports results~, which indicates that the code
-will not appear in the exported document. We recommend that in the
-context of this MOOC, you always leave this parameter setting as
-~:exports both~, because we want your analyses to be perfectly
-transparent and reproducible.
+* Histogram plot
+#+begin_src python :results output file :exports both :var figname="mod2_exo2_plot2.png" :session *mod2_exo2*
-Watch out: the figure generated by the code block is /not/ stored in
-the org document. It's a plain file, here named ~cosxsx.png~. You have
-to commit it explicitly if you want your analysis to be legible and
-understandable on GitLab.
+fig, ax = plt.subplots()
+ax.hist(data, color='blue', edgecolor='black')
+ax.set_xlim([0, 25])
+ax.set_ylim([0, 25])
+ax.grid(color='gray', linestyle='--')
-Finally, don't forget that we provide in the resource section of this
-MOOC a configuration with a few keyboard shortcuts that allow you to
-quickly create code blocks in Python by typing ~