diff --git a/module2/exo1/cars.png b/module2/exo1/cars.png index b555e2dc3fe05b699092df6bc1405af1cde70fa6..a1d92052d1634ae839142b4355b675aa3fcaeeb4 100644 Binary files a/module2/exo1/cars.png and b/module2/exo1/cars.png differ diff --git a/module2/exo1/cosxsx.png b/module2/exo1/cosxsx.png index 90c19d9683fc5673b35b3481174a8afb47b04e6f..c291551bcba6f849193dce38c98a902802c1ffbe 100644 Binary files a/module2/exo1/cosxsx.png and b/module2/exo1/cosxsx.png differ diff --git a/module2/exo1/toy_document_orgmode_R_en.org b/module2/exo1/toy_document_orgmode_R_en.org index e10cbd30182e592a81807685e407a94b51c1af3f..f48656f1b4203ba6a91fd54fdb305ec0c6fe0492 100644 --- a/module2/exo1/toy_document_orgmode_R_en.org +++ b/module2/exo1/toy_document_orgmode_R_en.org @@ -41,21 +41,47 @@ persistent from one code block to the next. The code is still executed using ~C-c C-c~. #+begin_src R :results output :session *R* :exports both -summary(cars) +summary(mtcars) #+end_src #+RESULTS: -: speed dist -: Min. : 4.0 Min. : 2.00 -: 1st Qu.:12.0 1st Qu.: 26.00 -: Median :15.0 Median : 36.00 -: Mean :15.4 Mean : 42.98 -: 3rd Qu.:19.0 3rd Qu.: 56.00 -: Max. :25.0 Max. :120.00 +#+begin_example + mpg cyl disp hp + Min. :10.40 Min. :4.000 Min. : 71.1 Min. : 52.0 + 1st Qu.:15.43 1st Qu.:4.000 1st Qu.:120.8 1st Qu.: 96.5 + Median :19.20 Median :6.000 Median :196.3 Median :123.0 + Mean :20.09 Mean :6.188 Mean :230.7 Mean :146.7 + 3rd Qu.:22.80 3rd Qu.:8.000 3rd Qu.:326.0 3rd Qu.:180.0 + Max. :33.90 Max. :8.000 Max. :472.0 Max. :335.0 + drat wt qsec vs + Min. :2.760 Min. :1.513 Min. :14.50 Min. :0.0000 + 1st Qu.:3.080 1st Qu.:2.581 1st Qu.:16.89 1st Qu.:0.0000 + Median :3.695 Median :3.325 Median :17.71 Median :0.0000 + Mean :3.597 Mean :3.217 Mean :17.85 Mean :0.4375 + 3rd Qu.:3.920 3rd Qu.:3.610 3rd Qu.:18.90 3rd Qu.:1.0000 + Max. :4.930 Max. :5.424 Max. :22.90 Max. :1.0000 + am gear carb + Min. :0.0000 Min. :3.000 Min. :1.000 + 1st Qu.:0.0000 1st Qu.:3.000 1st Qu.:2.000 + Median :0.0000 Median :4.000 Median :2.000 + Mean :0.4062 Mean :3.688 Mean :2.812 + 3rd Qu.:1.0000 3rd Qu.:4.000 3rd Qu.:4.000 + Max. :1.0000 Max. :5.000 Max. :8.000 +#+end_example Finally, an example for graphical output: #+begin_src R :results output graphics :file "./cars.png" :exports results :width 600 :height 400 :session *R* -plot(cars) +library(ggplot2) + +ggplot() + + geom_point(data=mtcars, mapping=aes(x=wt, y=mpg, color=factor(gear))) + + scale_x_continuous("Weight") + + scale_y_continuous("Milage") + + scale_color_discrete("Gear") + + theme_bw() + +ggsave('./cars.png', width=5, height=2.5, units="in", dpi=120) + #+end_src #+RESULTS: diff --git a/module2/exo1/toy_document_orgmode_python_en.org b/module2/exo1/toy_document_orgmode_python_en.org index 5782f493934678ba782fb65634a4d86e5f3adefc..b23a4b867d3472c8299eb5445cf36aae3d9e5b3b 100644 --- a/module2/exo1/toy_document_orgmode_python_en.org +++ b/module2/exo1/toy_document_orgmode_python_en.org @@ -63,11 +63,11 @@ Finally, an example for graphical output: #+begin_src python :results output file :session :var matplot_lib_filename="./cosxsx.png" :exports results import matplotlib.pyplot as plt -plt.figure(figsize=(10,5)) +plt.figure(figsize=(6,3)) plt.plot(x,numpy.cos(x)/x) plt.tight_layout() -plt.savefig(matplot_lib_filename) +plt.savefig(matplot_lib_filename, bbox_inches='tight') print(matplot_lib_filename) #+end_src diff --git a/module2/exo2/exercice_en.Rmd b/module2/exo2/exercice_en.Rmd index 13b258ddd0da29bc3bf08c64b6a1db742f6d5409..7796e79e75af09ef640385db144555bb81e7992f 100644 --- a/module2/exo2/exercice_en.Rmd +++ b/module2/exo2/exercice_en.Rmd @@ -23,7 +23,14 @@ summary(cars) It is also straightforward to include figures. For example: ```{r pressure, echo=FALSE} -plot(pressure) +library(ggplot2) + +ggplot() + + geom_point(data=mtcars, mapping=aes(x=wt, y=mpg, color=factor(gear))) + + scale_x_continuous("Weight") + + scale_y_continuous("Milage") + + scale_color_discrete("Gear") + + theme_bw() ``` Note the parameter `echo = FALSE` that indicates that the code will not appear in the final version of the document. We recommend not to use this parameter in the context of this MOOC, because we want your data analyses to be perfectly transparent and reproducible.