Commit 855988fc authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

Minor modifications in two remaining notebooks and in first TP ones.

parent f00198ca
......@@ -43,7 +43,9 @@
"\n",
"As part of the TP, the number of bits allowed to store the numerator will be arbitrarily fixed, and the effect on the accuracy of the approximation will be calculated. Note that if you have N bits to store an integer, the largest possible integer is 2<sup>N</sup> - 1.\n",
"\n",
"The file you need to start is [provided](/notebooks/TP/1-ProceduralProgramming/initial_file.cpp) in the TP folder of ProceduralProgramming lectures."
"The file you need to start is [provided](/notebooks/TP/1-ProceduralProgramming/initial_file.cpp) in the TP folder of ProceduralProgramming lectures.\n",
"\n",
"Note: you may found more about the context of the formation exercises in [this article](https://sites.ualberta.ca/~kbeach/phys420_580_2010/docs/ACM-Goldberg.pdf)."
]
},
{
......@@ -76,13 +78,6 @@
"_The present version has been written by Sébastien Gilles and Vincent Rouvreau (Inria)_\n",
"\n"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
......
......@@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"# [Getting started in C++](/) - [Procedural programming](/notebooks/1-ProceduralProgramming/0-main.ipynb) - [TP 2](/notebooks/1-ProceduralProgramming/4b-TP.ipynb)"
"# [Getting started in C++](/) - [Procedural programming](./0-main.ipynb) - [TP 2](./4b-TP.ipynb)"
]
},
{
......@@ -45,7 +45,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"_Expected result_:\n",
"*Expected result*:\n",
"\n",
"0.65 ~ 1 / 2^1 \n",
"0.65 ~ 3 / 2^2 \n",
......@@ -204,7 +204,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"_Expected result_:\n",
"*Expected result*:\n",
"\n",
"````\n",
"[With 2 bits]: 0.65 ~ 0.75 (3/2^2)\n",
......@@ -257,7 +257,7 @@
"\n",
"Absolute value may be computed with `std::fabs`, which is in header file `cmath`.\n",
" \n",
"_Expected result_:\n",
"*Expected result*:\n",
"\n",
"````\n",
"[With 2 bits]: 0.65 ~ 0.75 (3/2^2) [error = 15/100]\n",
......@@ -277,7 +277,7 @@
"metadata": {},
"source": [
"\n",
"© _CNRS 2016_ - _Inria 2018-2019_ \n",
"© _CNRS 2016_ - _Inria 2018-2020_ \n",
"_This notebook is an adaptation of a lecture prepared by David Chamont (CNRS) under the terms of the licence [Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)](http://creativecommons.org/licenses/by-nc-sa/4.0/)_ \n",
"_The present version has been written by Sébastien Gilles and Vincent Rouvreau (Inria)_\n",
"\n"
......@@ -288,14 +288,14 @@
"kernelspec": {
"display_name": "C++17",
"language": "C++17",
"name": "xeus-cling-cpp17"
"name": "xcpp17"
},
"language_info": {
"codemirror_mode": "text/x-c++src",
"file_extension": ".cpp",
"mimetype": "text/x-c++src",
"name": "c++",
"version": "-std=c++17"
"version": "17"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
......
......@@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"# [Getting started in C++](/) - [Procedural programming](/notebooks/1-ProceduralProgramming/0-main.ipynb) - [TP 3](/notebooks/1-ProceduralProgramming/7b-TP.ipynb)"
"# [Getting started in C++](/) - [Procedural programming](./0-main.ipynb) - [TP 3](./7b-TP.ipynb)"
]
},
{
......@@ -143,7 +143,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"_Expected result_:\n",
"*Expected result*:\n",
"\n",
" [With 2 bits]: 0.65 ~ 0.75 (3 / 2^2) [error = 15/100]\n",
" [With 4 bits]: 0.65 ~ 0.625 (10 / 2^4) [error = 4/100]\n",
......@@ -173,7 +173,7 @@
"\n",
"Modify slightly the function defined above to add display of the error; we will express it over 1000 (see exercice 7 which was roughly the same!)\n",
"\n",
"_Expected result_:\n",
"*Expected result*:\n",
"\n",
"````\n",
"[With 2 bits]: 0.65 ~ 0.75 (3/2^2) [error = 15/100]\n",
......@@ -287,7 +287,7 @@
"metadata": {},
"source": [
"\n",
"© _CNRS 2016_ - _Inria 2018-2019_ \n",
"© _CNRS 2016_ - _Inria 2018-2020_ \n",
"_This notebook is an adaptation of a lecture prepared by David Chamont (CNRS) under the terms of the licence [Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)](http://creativecommons.org/licenses/by-nc-sa/4.0/)_ \n",
"_The present version has been written by Sébastien Gilles and Vincent Rouvreau (Inria)_\n",
"\n"
......@@ -298,14 +298,14 @@
"kernelspec": {
"display_name": "C++17",
"language": "C++17",
"name": "xeus-cling-cpp17"
"name": "xcpp17"
},
"language_info": {
"codemirror_mode": "text/x-c++src",
"file_extension": ".cpp",
"mimetype": "text/x-c++src",
"name": "c++",
"version": "-std=c++17"
"version": "17"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
......
......@@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"# [Getting started in C++](/) - [How to do the TP](/notebooks/TP/HowTo.ipynb)"
"# [Getting started in C++](/) - [How to do the TP](./HowTo.ipynb)"
]
},
{
......@@ -37,7 +37,7 @@
"\n",
"[Coliru](https://coliru.stacked-crooked.com/) or [Wandbox](https://wandbox.org/) provides online compilers in which you may paste code, compile it and then run it.\n",
"\n",
"They are clearly the easiest way to go (except for the [TP related to file structure](/notebooks/6-InRealEnvironment/2-b-TP.ipynb) for which we will need to work locally). \n",
"They are clearly the easiest way to go (except for the [TP related to file structure](..6-InRealEnvironment/2-b-TP.ipynb) for which we will need to work locally). \n",
"\n",
"### On your local machine\n",
"\n",
......@@ -95,7 +95,7 @@
"\n",
"The steps to compile are the same as presented in the previous section.\n",
"\n",
"For more informations about the Docker way please look the dedicated [README](https://gitlab.inria.fr/formations/cpp/gettingstartedwithmoderncpp/blob/master/TP/README.md) (the one within the TP folder of the root directory).\n"
"For more informations about the Docker way please look the dedicated [README](https://gitlab.inria.fr/formations/cpp/gettingstartedwithmoderncpp/blob/master/TP/README.md) (the one within the TP folder of the root directory)."
]
},
{
......@@ -103,7 +103,7 @@
"metadata": {},
"source": [
"\n",
"© _CNRS 2016_ - _Inria 2018-2019_ \n",
"© _CNRS 2016_ - _Inria 2018-2020_ \n",
"_This notebook is an adaptation of a lecture prepared by David Chamont (CNRS) under the terms of the licence [Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)](http://creativecommons.org/licenses/by-nc-sa/4.0/)_ \n",
"_The present version has been written by Sébastien Gilles and Vincent Rouvreau (Inria)_"
]
......@@ -113,14 +113,14 @@
"kernelspec": {
"display_name": "C++17",
"language": "C++17",
"name": "xeus-cling-cpp17"
"name": "xcpp17"
},
"language_info": {
"codemirror_mode": "text/x-c++src",
"file_extension": ".cpp",
"mimetype": "text/x-c++src",
"name": "c++",
"version": "-std=c++17"
"version": "17"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
......
......@@ -25,11 +25,11 @@
"\n",
"### Modern C++ Design \\cite{Alexandrescu2001}\n",
"\n",
"A very brillant book to understand the reasoning behind metaprogramming, by one of the father of this branch of software development. Clearly not for the faint of heart, but a really enlightening reading; I especially recommend the chapter about policies (the first one is also very interesting but some of the stuff there is now directly available in the standard library.\n",
"A very brillant book to understand the reasoning behind metaprogramming, by one of the father of this branch of software development. Clearly not for the faint of heart, but a really enlightening reading; I especially recommend the chapter about policies (the first one is also very interesting but some of the stuff there is now directly available in the standard library).\n",
"\n",
"### Exceptional C++ / More Exceptional C++ \\cite{Sutter1999, Sutter2002}\n",
"\n",
"These books are questions and answers that provide very helpful insight; the reading is however a bit terser than Scott Meyers. The content is a bit more advanced - in introduction Herb Sutter tells his books should be the third reading after Meyers' Effective C++ one... \n",
"These books are questions and answers that provide very helpful insight; the reading is however a bit terser than Scott Meyers' books. The content is a bit more advanced - in introduction Herb Sutter tells his books should be the third reading after Meyers' Effective C++ one... \n",
"\n",
"\n",
"### Effective STL \\cite{Meyers2001}\n",
......@@ -96,17 +96,10 @@
"metadata": {},
"source": [
"\n",
"© _CNRS 2016_ - _Inria 2018-2019_ \n",
"© _CNRS 2016_ - _Inria 2018-2020_ \n",
"_This notebook is an adaptation of a lecture prepared by David Chamont (CNRS) under the terms of the licence [Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)](http://creativecommons.org/licenses/by-nc-sa/4.0/)_ \n",
"_The present version has been written by Sébastien Gilles and Vincent Rouvreau (Inria)_"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
......@@ -125,7 +118,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.7"
"version": "3.8.2"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment