diff --git a/test~coding~readingCppPrograms.fr/Makefile b/test~coding~readingCppPrograms.fr/Makefile index 132d42c6df8e5843b4d5fa3c8838b74f3f3708e7..9b20f02daad829b273aa90007fe069a2afc29da9 100644 --- a/test~coding~readingCppPrograms.fr/Makefile +++ b/test~coding~readingCppPrograms.fr/Makefile @@ -52,3 +52,21 @@ archive: all # cd programs/guess-output; make all.oef # cat header.oef programs/guess-output/all.oef footer.oef > main.oef +reformat: + astyle \ + --style=java --indent=spaces --indent=spaces=4 --indent-switches --indent-namespaces \ + --indent-modifiers \ + --indent-col1-comments \ + --min-conditional-indent=0 \ + --pad-oper \ + --pad-header \ + --align-pointer=name \ + --align-reference=name \ + --keep-one-line-statements \ + --convert-tabs \ + --close-templates \ + --break-after-logical \ + --max-code-length=78 \ + 'data/*.cpp' + +# --exclude=data/static \ diff --git a/test~coding~readingCppPrograms.fr/README.rst b/test~coding~readingCppPrograms.fr/README.rst index 5914c89e1db9456f82baa20882d52f78eafde07d..baa702e56e7745cb206f5509992248c2a8fa5d89 100644 --- a/test~coding~readingCppPrograms.fr/README.rst +++ b/test~coding~readingCppPrograms.fr/README.rst @@ -67,6 +67,40 @@ L'infrastructure du module est implant premier type affiche au moins un caractère. Éviter les caractères unicode compliqués aussi :-) +Conventions de style +-------------------- + +Pour faciliter une lecture rapide, il est bon pour les élèves que tous +les programmes soient écrits dans un style cohérent (indentation, +espaces, ...). Pour donner cette cohérence, ce module utilise `astyle +<http://astyle.sourceforge.net/>`_ pour reformater systématiquement +tous les programmes. Voir: + + make reformat + +Les choix suivants, forcément un peu arbitraire, ont été fait. Voir la +documentation de astyle pour les détails: + + --style=java --indent=spaces --indent=spaces=4 --indent-switches --indent-namespaces + À voir: --indent-modifiers + --indent-col1-comments: À voir en pratique si cela devient gênant + --min-conditional-indent=0 + --pad-oper + --pad-header + --align-pointer=name Sous réserve que, dans "char *f, g", le * ne s'applique qu'à f + --align-reference=name + --keep-one-line-statements + --convert-tabs + --close-templates + --break-after-logical + --max-code-length=78 + --recursive + +Pour utiliser ce module dans un contexte utilisant d'autres +conventions, il serait tout à fait possible de reformater le code +selon d'autres conventions, soit au vol dans wims, ou au moment moment +de la fabrication de la version static. + Création automatique des exercices de type OEF ---------------------------------------------- @@ -94,6 +128,14 @@ Charger l'archive dans son compte modtools sur WIMS avec: wims.u-psud.fr -> serveur de l'université -> Accueil WIMS -> modtools -> login -> Restauration +TODO +---- + +- data/function_if.cpp: + le contenu de la fonction semble trop compliqué par rapport à ce que + l'on veut tester +- data/procedure-simplest_1.cpp: a conserver? + Documentation générique des modules WIMS ======================================== diff --git a/test~coding~readingCppPrograms.fr/data/file_ostringstream.cpp b/test~coding~readingCppPrograms.fr/data/file_ostringstream.cpp index 9c9867a8e8ed6bf3c3f8fb53de6aa8f8db6b2fca..28578700433bebfaf4c74a38bfa38e968ba55f72 100644 --- a/test~coding~readingCppPrograms.fr/data/file_ostringstream.cpp +++ b/test~coding~readingCppPrograms.fr/data/file_ostringstream.cpp @@ -5,7 +5,7 @@ using namespace std; int main() { ostringstream flux; - flux << "8+CI1=" << 8+CI1; + flux << "8+CI1=" << 8 + CI1; string s = flux.str(); cout << s.length() << endl; diff --git a/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp b/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp index 624490583a5c133c1b7a65c1a3278dfae5c2cc35..e9bbd26feaff05bbece5e85e7c5de839f3d2d06c 100644 --- a/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_blackjack.cpp @@ -18,26 +18,26 @@ int blackJack(int x, int y) { if (y > 21) { return x; } - return max(x,y); + return max(x, y); } int main() { - int x,y; + int x, y; x = 15; y = 22; - cout << max(x,y) << endl; - cout << blackJack(x,y) << endl; + cout << max(x, y) << endl; + cout << blackJack(x, y) << endl; x = 12; y = 17; - cout << max(x,y) << endl; - cout << blackJack(x,y) << endl; + cout << max(x, y) << endl; + cout << blackJack(x, y) << endl; x = 23; y = 25; - cout << max(x,y) << endl; - cout << blackJack(x,y) << endl; + cout << max(x, y) << endl; + cout << blackJack(x, y) << endl; return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/function_call_1.cpp b/test~coding~readingCppPrograms.fr/data/function_call_1.cpp index 04039f4facb9672051d3c01d9da5ef288fa8a700..7ba10d825a478f276c1a0969dddf2a080b2126ca 100644 --- a/test~coding~readingCppPrograms.fr/data/function_call_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_call_1.cpp @@ -2,7 +2,7 @@ using namespace std; int f(int n) { - return n*n; + return n * n; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/function_call_2.cpp b/test~coding~readingCppPrograms.fr/data/function_call_2.cpp index 19056bce1ee9e8bfb88363b313ed6fb9fa8fd0b7..ceeb94b05856141402cce6e400d7b648cb78ee69 100644 --- a/test~coding~readingCppPrograms.fr/data/function_call_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_call_2.cpp @@ -2,7 +2,7 @@ using namespace std; int f(int n) { - return 2*n - 1; + return 2 * n - 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/function_call_3.cpp b/test~coding~readingCppPrograms.fr/data/function_call_3.cpp index 65eff79d5940b2d80783ad5c8aac2e9bde3f5dd2..4f9e0e56b39386c5c1c09ead7c4686bbab08e13a 100644 --- a/test~coding~readingCppPrograms.fr/data/function_call_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_call_3.cpp @@ -2,14 +2,14 @@ using namespace std; void f(int x, int y) { - x = x+1; - y = y-1; + x = x + 1; + y = y - 1; } int main() { - int x,y; + int x, y; x = 1; y = 2; - f(y,x); + f(y, x); cout << x << ", " << y << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/function_call_4.cpp b/test~coding~readingCppPrograms.fr/data/function_call_4.cpp index 7e069b3cb831f96d29511939b245cdaa21b047c4..c02705873370790d7fa4abe2b0047076a0015a0e 100644 --- a/test~coding~readingCppPrograms.fr/data/function_call_4.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_call_4.cpp @@ -2,14 +2,14 @@ using namespace std; int g(int x, int y) { - x = x+1; - return y-1; + x = x + 1; + return y - 1; } int main() { - int x,y; + int x, y; x = 1; y = 2; - g(x,y); + g(x, y); cout << x << ", " << y << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/function_if.cpp b/test~coding~readingCppPrograms.fr/data/function_if.cpp index 7d2e269911e77f40b66618affb35f9fae6614778..38ac32456f42df573313336ce8d25dd6b607d64d 100644 --- a/test~coding~readingCppPrograms.fr/data/function_if.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_if.cpp @@ -4,7 +4,7 @@ using namespace std; int f(int n) { int i; int cpt = 0; - for(i=1; i<=n; i++){ + for (i = 1; i <= n; i++) { cpt = cpt + i; } return cpt; @@ -13,8 +13,7 @@ int f(int n) { int main() { if (f(5) < 11) { cout << "Petit" << endl; - } - else { + } else { cout << "Grand" << endl; } } diff --git a/test~coding~readingCppPrograms.fr/data/function_inversion_arguments.cpp b/test~coding~readingCppPrograms.fr/data/function_inversion_arguments.cpp index 99c714ff01fb9bcad5cdfba27c12a63ca2a6982c..8dd2e370d827d6db794a8d416345f867cbf30cf9 100644 --- a/test~coding~readingCppPrograms.fr/data/function_inversion_arguments.cpp +++ b/test~coding~readingCppPrograms.fr/data/function_inversion_arguments.cpp @@ -2,14 +2,14 @@ using namespace std; int f(int x, int y) { - x = x+1; - return y-1; + x = x + 1; + return y - 1; } int main() { - int x,y; + int x, y; x = 1; y = 2; - x = f(y,x); + x = f(y, x); cout << x << ", " << y << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/if_calculation.cpp b/test~coding~readingCppPrograms.fr/data/if_calculation.cpp index 0d8b7f837793646b2b824e1d4e64d7545d0cd0f8..65d1e360696ed6cf484fa14060bcf02ec63000b8 100644 --- a/test~coding~readingCppPrograms.fr/data/if_calculation.cpp +++ b/test~coding~readingCppPrograms.fr/data/if_calculation.cpp @@ -7,8 +7,7 @@ int main() { if (a + b - 1 == 3) { a = a + 1; b = b + 1; - } - else { + } else { a = a - 1; b = b + 2; } diff --git a/test~coding~readingCppPrograms.fr/data/if_oppose.cpp b/test~coding~readingCppPrograms.fr/data/if_oppose.cpp index 89d8f214df0df21f65f1f2d566b4d0e584815fa1..dcaec291eafb78551723e186ccba2c8f0a655226 100644 --- a/test~coding~readingCppPrograms.fr/data/if_oppose.cpp +++ b/test~coding~readingCppPrograms.fr/data/if_oppose.cpp @@ -6,7 +6,7 @@ int main () { y = -3; x = -y; if ( y > 0 ) { - y = 2*x; + y = 2 * x; } else { y = -y; } diff --git a/test~coding~readingCppPrograms.fr/data/if_semicolon.cpp b/test~coding~readingCppPrograms.fr/data/if_semicolon.cpp index 14942a8ad10b935948b346d051402ba0a4216aa5..18b0e0669f882993a75d52d57de28ea3ef2be1b2 100644 --- a/test~coding~readingCppPrograms.fr/data/if_semicolon.cpp +++ b/test~coding~readingCppPrograms.fr/data/if_semicolon.cpp @@ -2,7 +2,7 @@ using namespace std; int main() { - int x = 1+2; + int x = 1 + 2; if ( x == 3 ); { cout << "Bonjour!" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/io_basic_input.cpp b/test~coding~readingCppPrograms.fr/data/io_basic_input.cpp index c35f12ed01e4ce343ade605d5aa7fc035159bd1a..1acb6a6645742fe046d08247075d9cb46d733526 100644 --- a/test~coding~readingCppPrograms.fr/data/io_basic_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/io_basic_input.cpp @@ -5,6 +5,6 @@ int main() { int x; cin >> x; - cout << x+3 << endl; + cout << x + 3 << endl; return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/io_output_expr.cpp b/test~coding~readingCppPrograms.fr/data/io_output_expr.cpp index c0592f4f3905fcb1db126d6cc03d3a8311033385..113cbd90d44aab6a465360c8e1d40df8fc655995 100644 --- a/test~coding~readingCppPrograms.fr/data/io_output_expr.cpp +++ b/test~coding~readingCppPrograms.fr/data/io_output_expr.cpp @@ -3,6 +3,6 @@ using namespace std; int main() { cout << "CI1+CI2" << endl; - cout << CI1+CI2 << endl; + cout << CI1 + CI2 << endl; return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/loop_1_input.cpp b/test~coding~readingCppPrograms.fr/data/loop_1_input.cpp index 392e5e54398dbd79d5e96630fcc943a03a8ef099..938b4e308d0a1ac1ec28c288b2b3c74b7261bb5a 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_1_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_1_input.cpp @@ -5,8 +5,8 @@ int main() { int v = 1; int s; - while(2*v < 42) { - v = 2*v; + while (2 * v < 42) { + v = 2 * v; } cin >> s; diff --git a/test~coding~readingCppPrograms.fr/data/loop_for_factorial.cpp b/test~coding~readingCppPrograms.fr/data/loop_for_factorial.cpp index d6b960603aab458a80ddeacc8420151ef4d45b05..6afaa3e5982773c13087f98d166023ed5d98d96c 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_for_factorial.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_for_factorial.cpp @@ -4,7 +4,7 @@ using namespace std; int main() { int n, resultat; - n=5; + n = 5; resultat = 1; for ( int k = 1; k <= n; k++ ) { diff --git a/test~coding~readingCppPrograms.fr/data/loop_indices.cpp b/test~coding~readingCppPrograms.fr/data/loop_indices.cpp index 32a59d73aba3d700f27067e6b47bef937519f9d6..9af402737fa2381d77e695f9750fd2c9f45279c8 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_indices.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_indices.cpp @@ -4,7 +4,7 @@ using namespace std; int main() { int i = 0; - while(i < 11) { + while (i < 11) { cout << i << endl; i = i + 2; } diff --git a/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp b/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp index 5f80cf99327585e5eec95121ab218ceea8417ca0..a788da815f8abaf0b381ee6872d3315296c043f3 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_indices_2.cpp @@ -4,7 +4,7 @@ using namespace std; int main() { int i = 1; - while(i < 11) { + while (i < 11) { cout << i << endl; i = i * 2; } diff --git a/test~coding~readingCppPrograms.fr/data/loop_odd.cpp b/test~coding~readingCppPrograms.fr/data/loop_odd.cpp index 50fb6e17be769c31455f9faf154645169ad510a9..a8788cf79ae27520912125aa3ed270a4e5217590 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_odd.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_odd.cpp @@ -4,7 +4,7 @@ using namespace std; int main() { int x, I1; for ( I1 = 0; I1 < 6; I1++ ) { - x = 2*I1 + 1; + x = 2 * I1 + 1; cout << x << endl; } } diff --git a/test~coding~readingCppPrograms.fr/data/loop_substract.cpp b/test~coding~readingCppPrograms.fr/data/loop_substract.cpp index fef4273332fe094e44b60ac32e70c719427261b5..6a3d6af0fd51cda2734bb5bdd35e7a40e95a45b7 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_substract.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_substract.cpp @@ -3,7 +3,7 @@ using namespace std; int main() { int n = 43; - while (n > 8){ + while (n > 8) { n = n - 8; } cout << n << endl; diff --git a/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp b/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp index a22e0c7566b287ba633f0dfed4a9d8ab1bf1556d..102377d36348a0ff768e7f28194e4b1d3f9daae0 100644 --- a/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp +++ b/test~coding~readingCppPrograms.fr/data/loop_syracuse.cpp @@ -5,10 +5,10 @@ int main() { int i = 6; while ( i != 1 ) { cout << i << endl; - if ( i%2 == 1 ) { - i = 3*i + 1; + if ( i % 2 == 1 ) { + i = 3 * i + 1; } else { - i = i/2; + i = i / 2; } } return 0; diff --git a/test~coding~readingCppPrograms.fr/data/procedure-calling_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure-calling_1.cpp index f33d31b4e5db130885ce4caeec3f9f1f9f491a91..f3bbe5b5acef5fda5111ed83512ae1e675d46b74 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-calling_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-calling_1.cpp @@ -5,7 +5,7 @@ using namespace std; int g(int n) { int i, r = 0; - for (i = 1; i <=n; i++) + for (i = 1; i <= n; i++) r += i; return r; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-calling_1_input.cpp b/test~coding~readingCppPrograms.fr/data/procedure-calling_1_input.cpp index 82ba255bcdbda7f0d7538f9371d3ee600efd259e..e5cf0e1a8a32ac25e836c0af2eab5d879e5a1b3d 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-calling_1_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-calling_1_input.cpp @@ -3,11 +3,11 @@ using namespace std; void g(int i) { - i = i*2; + i = i * 2; } void f(int &i) { - i = i+3; + i = i + 3; g(i); } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-calling_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure-calling_2.cpp index 7185eb0d90f79d37713e47544593668c0e649823..85de653537f1c12a8aa62105f20427702725e9ec 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-calling_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-calling_2.cpp @@ -5,7 +5,7 @@ using namespace std; int g(int n) { int i, r = 0; - for (i = 1; i <=n; i++) + for (i = 1; i <= n; i++) r += i; return r; } @@ -13,18 +13,18 @@ int g(int n) { void f(vector<int> &t, int a, int b) { int c; if (a < t.size() && b < t.size()) { - c = g(t[a]); + c = g(t[a]); t[a] = g(t[b]); t[b] = c; } } - + int main() { vector<int> tab = {3, 1, 2, 6}; - + f(tab, 1, 3); - + cout << tab[1] << endl; - + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-calling_2_input.cpp b/test~coding~readingCppPrograms.fr/data/procedure-calling_2_input.cpp index 505d0b4d13f2ebb5e98c8cf360aa19549a070648..d252acda4ddca49767517f4b028b13ea8610c097 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-calling_2_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-calling_2_input.cpp @@ -3,11 +3,11 @@ using namespace std; void g(int &i, int j) { - i = i+j; + i = i + j; } void f(int i, int &j) { - i = i+3; + i = i + 3; g(i, j); } @@ -15,7 +15,7 @@ int main() { int i; int j; cin >> i; - j = j+5; + j = j + 5; f(i, j); cout << i << endl; return 0; diff --git a/test~coding~readingCppPrograms.fr/data/procedure-calling_3.cpp b/test~coding~readingCppPrograms.fr/data/procedure-calling_3.cpp index cd9eb632bbc1b535dda30de92d6d515193fa1aca..890809d39f6622ad81746a9847419220f85b8499 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-calling_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-calling_3.cpp @@ -11,16 +11,16 @@ void f(vector<int> t, int a, int b, int &c) { if (t[a] < t[b]) c = g(t[b] - t[a]); else c = g(t[a] - t[b]); } - + int main() { vector<int> tab = {2, 4, 5, 8}; int r = -1; int x = 2; int y = 3; - + f(tab, x, y, r); - + cout << r << endl; - + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-calling_4.cpp b/test~coding~readingCppPrograms.fr/data/procedure-calling_4.cpp index bd6712aa655870e135dfd08c8c95decff518e221..f6c834ccd0442664e71e948391cefc0a8633b9a8 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-calling_4.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-calling_4.cpp @@ -11,16 +11,16 @@ void f(vector<int> t, int a, int b, int &c) { if (t[a] < t[b]) c = g(t[b] - t[a]); else c = g(t[a] - t[b]); } - + int main() { vector<int> tab = {3, 1, 2, 6}; int r = -1; int x = 0; int y = 2; - + f(tab, x, y, r); - + cout << r << endl; - + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-loop_no_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure-loop_no_1.cpp index 1e5cc3b9fba6d5e64075ecf27d1be12d48094ac2..16d6478596396345aacea5dc6e432815fd0b53df 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-loop_no_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-loop_no_1.cpp @@ -3,13 +3,13 @@ using namespace std; void blourg(vector<int> t, int v, int i, bool &b) { - i=-1; - b=false; - for( int j=0; j<t.size();j++) { - if(t[j] == v) { - i=j; - b=true; - } + i = -1; + b = false; + for ( int j = 0; j < t.size(); j++) { + if (t[j] == v) { + i = j; + b = true; + } } } @@ -18,7 +18,7 @@ int main() { bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,2,s,toto); - if(toto) cout << s << endl; + blourg(tab, 2, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-loop_no_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure-loop_no_2.cpp index 59efae55f5380f7a4fc68b7ac1d9885591572e24..ebb1d3877f7521cc71cbab0bcc5b0c19811e405f 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-loop_no_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-loop_no_2.cpp @@ -5,17 +5,20 @@ using namespace std; void blourg(vector<int> t, int v, int &i, bool &b) { - i=-1;b=false; - for( int j=0; j<t.size();j++) - if(t[j] == v) - {i=j; b=true;} + i = -1; b = false; + for ( int j = 0; j < t.size(); j++) + if (t[j] == v) { + i = j; + b = true; + } } -int main() {bool toto; +int main() { + bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,5,s,toto); - if(toto) cout << s << endl; + blourg(tab, 5, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_1.cpp index 55ea5c5c0ec08ca5b901e81dc727bd8b9be05aa8..e2e54ba796cfda59ee4cb91591db8caf1ea0e68d 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_1.cpp @@ -5,17 +5,20 @@ using namespace std; void blourg(vector<int> t, int v, int i, bool &b) { - i=-1;b=false; - for( int j=0; j<t.size();j++) - if(t[j] == v) - {i=j; b=true;} + i = -1; b = false; + for ( int j = 0; j < t.size(); j++) + if (t[j] == v) { + i = j; + b = true; + } } -int main() {bool toto; +int main() { + bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,5,s,toto); - if(toto) cout << s << endl; + blourg(tab, 5, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_2.cpp index 59efae55f5380f7a4fc68b7ac1d9885591572e24..ebb1d3877f7521cc71cbab0bcc5b0c19811e405f 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-loop_yes_2.cpp @@ -5,17 +5,20 @@ using namespace std; void blourg(vector<int> t, int v, int &i, bool &b) { - i=-1;b=false; - for( int j=0; j<t.size();j++) - if(t[j] == v) - {i=j; b=true;} + i = -1; b = false; + for ( int j = 0; j < t.size(); j++) + if (t[j] == v) { + i = j; + b = true; + } } -int main() {bool toto; +int main() { + bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,5,s,toto); - if(toto) cout << s << endl; + blourg(tab, 5, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure-simplest_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure-simplest_1.cpp index 15581dbb3a39e2e91bf455d8cd6c158c1bb987a5..80e15bef5fbc637574fc2e4992e45ada732112d6 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-simplest_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-simplest_1.cpp @@ -1,6 +1,6 @@ //============================================================================ // Name : testCpp.cpp -// Author : +// Author : // Version : // Copyright : Your copyright notice // Description : Hello World in C++, Ansi-style @@ -11,7 +11,7 @@ using namespace std; void decrement(int n) { - n=n-1; + n = n - 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure-simplest_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure-simplest_2.cpp index 4d8b937a78f052bd1513e4846e9997af89363cc7..0eb83bacbbe5c71514573d690140b84fa591aa45 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-simplest_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-simplest_2.cpp @@ -1,6 +1,6 @@ //============================================================================ // Name : testCpp.cpp -// Author : +// Author : // Version : // Copyright : Your copyright notice // Description : Hello World in C++, Ansi-style @@ -11,7 +11,7 @@ using namespace std; void increment(int n) { - n=n+1; + n = n + 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure-simplest_3.cpp b/test~coding~readingCppPrograms.fr/data/procedure-simplest_3.cpp index 79018bae8e81b6c09900b0e778e79076905112eb..cd04e3f4d5c6fbe2f92b844db3eeb378ba077949 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-simplest_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-simplest_3.cpp @@ -1,6 +1,6 @@ //============================================================================ // Name : -// Author : +// Author : // Version : // Copyright : Your copyright notice // Description : Hello World in C++, Ansi-style @@ -11,7 +11,7 @@ using namespace std; void decrement(int &n) { - n=n-1; + n = n - 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure-simplest_4.cpp b/test~coding~readingCppPrograms.fr/data/procedure-simplest_4.cpp index e2c2293519492f5d19c98abb324e6d8725662c88..e988305992916c447894eab04309dc8ebc76abbc 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure-simplest_4.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure-simplest_4.cpp @@ -1,6 +1,6 @@ //============================================================================ // Name : -// Author : +// Author : // Version : // Copyright : Your copyright notice // Description : Hello World in C++, Ansi-style @@ -11,7 +11,7 @@ using namespace std; void increment(int &n) { - n=n+1; + n = n + 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_1.cpp index f33d31b4e5db130885ce4caeec3f9f1f9f491a91..f3bbe5b5acef5fda5111ed83512ae1e675d46b74 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_calling_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_1.cpp @@ -5,7 +5,7 @@ using namespace std; int g(int n) { int i, r = 0; - for (i = 1; i <=n; i++) + for (i = 1; i <= n; i++) r += i; return r; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_1_input.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_1_input.cpp index 82ba255bcdbda7f0d7538f9371d3ee600efd259e..e5cf0e1a8a32ac25e836c0af2eab5d879e5a1b3d 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_calling_1_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_1_input.cpp @@ -3,11 +3,11 @@ using namespace std; void g(int i) { - i = i*2; + i = i * 2; } void f(int &i) { - i = i+3; + i = i + 3; g(i); } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_2.cpp index 7185eb0d90f79d37713e47544593668c0e649823..85de653537f1c12a8aa62105f20427702725e9ec 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_calling_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_2.cpp @@ -5,7 +5,7 @@ using namespace std; int g(int n) { int i, r = 0; - for (i = 1; i <=n; i++) + for (i = 1; i <= n; i++) r += i; return r; } @@ -13,18 +13,18 @@ int g(int n) { void f(vector<int> &t, int a, int b) { int c; if (a < t.size() && b < t.size()) { - c = g(t[a]); + c = g(t[a]); t[a] = g(t[b]); t[b] = c; } } - + int main() { vector<int> tab = {3, 1, 2, 6}; - + f(tab, 1, 3); - + cout << tab[1] << endl; - + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_2_input.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_2_input.cpp index bae4fdf567a7cbb3c14511310d9b7f57b3e93ecc..dc69180103e35eef0f4b9cf8f675ca7f439a1277 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_calling_2_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_2_input.cpp @@ -3,11 +3,11 @@ using namespace std; void g(int &i, int j) { - i = i+j; + i = i + j; } void f(int i, int &j) { - i = i+3; + i = i + 3; g(i, j); } @@ -15,7 +15,7 @@ int main() { int i; int j; cin >> i; - j = i+5; + j = i + 5; f(i, j); cout << i << endl; return 0; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_3.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_3.cpp index cd9eb632bbc1b535dda30de92d6d515193fa1aca..890809d39f6622ad81746a9847419220f85b8499 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_calling_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_3.cpp @@ -11,16 +11,16 @@ void f(vector<int> t, int a, int b, int &c) { if (t[a] < t[b]) c = g(t[b] - t[a]); else c = g(t[a] - t[b]); } - + int main() { vector<int> tab = {2, 4, 5, 8}; int r = -1; int x = 2; int y = 3; - + f(tab, x, y, r); - + cout << r << endl; - + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_4.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_4.cpp index bd6712aa655870e135dfd08c8c95decff518e221..f6c834ccd0442664e71e948391cefc0a8633b9a8 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_calling_4.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_4.cpp @@ -11,16 +11,16 @@ void f(vector<int> t, int a, int b, int &c) { if (t[a] < t[b]) c = g(t[b] - t[a]); else c = g(t[a] - t[b]); } - + int main() { vector<int> tab = {3, 1, 2, 6}; int r = -1; int x = 0; int y = 2; - + f(tab, x, y, r); - + cout << r << endl; - + return 0; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_loop_no_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_loop_no_1.cpp index 1e5cc3b9fba6d5e64075ecf27d1be12d48094ac2..16d6478596396345aacea5dc6e432815fd0b53df 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_loop_no_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_loop_no_1.cpp @@ -3,13 +3,13 @@ using namespace std; void blourg(vector<int> t, int v, int i, bool &b) { - i=-1; - b=false; - for( int j=0; j<t.size();j++) { - if(t[j] == v) { - i=j; - b=true; - } + i = -1; + b = false; + for ( int j = 0; j < t.size(); j++) { + if (t[j] == v) { + i = j; + b = true; + } } } @@ -18,7 +18,7 @@ int main() { bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,2,s,toto); - if(toto) cout << s << endl; + blourg(tab, 2, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_loop_no_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_loop_no_2.cpp index 59efae55f5380f7a4fc68b7ac1d9885591572e24..ebb1d3877f7521cc71cbab0bcc5b0c19811e405f 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_loop_no_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_loop_no_2.cpp @@ -5,17 +5,20 @@ using namespace std; void blourg(vector<int> t, int v, int &i, bool &b) { - i=-1;b=false; - for( int j=0; j<t.size();j++) - if(t[j] == v) - {i=j; b=true;} + i = -1; b = false; + for ( int j = 0; j < t.size(); j++) + if (t[j] == v) { + i = j; + b = true; + } } -int main() {bool toto; +int main() { + bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,5,s,toto); - if(toto) cout << s << endl; + blourg(tab, 5, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_1.cpp index 55ea5c5c0ec08ca5b901e81dc727bd8b9be05aa8..e2e54ba796cfda59ee4cb91591db8caf1ea0e68d 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_1.cpp @@ -5,17 +5,20 @@ using namespace std; void blourg(vector<int> t, int v, int i, bool &b) { - i=-1;b=false; - for( int j=0; j<t.size();j++) - if(t[j] == v) - {i=j; b=true;} + i = -1; b = false; + for ( int j = 0; j < t.size(); j++) + if (t[j] == v) { + i = j; + b = true; + } } -int main() {bool toto; +int main() { + bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,5,s,toto); - if(toto) cout << s << endl; + blourg(tab, 5, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_2.cpp index 59efae55f5380f7a4fc68b7ac1d9885591572e24..ebb1d3877f7521cc71cbab0bcc5b0c19811e405f 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_loop_yes_2.cpp @@ -5,17 +5,20 @@ using namespace std; void blourg(vector<int> t, int v, int &i, bool &b) { - i=-1;b=false; - for( int j=0; j<t.size();j++) - if(t[j] == v) - {i=j; b=true;} + i = -1; b = false; + for ( int j = 0; j < t.size(); j++) + if (t[j] == v) { + i = j; + b = true; + } } -int main() {bool toto; +int main() { + bool toto; vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; - blourg(tab,5,s,toto); - if(toto) cout << s << endl; + blourg(tab, 5, s, toto); + if (toto) cout << s << endl; else cout << "blourg" << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_1.cpp index 639bbb071a420f75461d5d198cfa4ea1b79750a0..da9d15a0de9fce0c1ffd097656f4f0aab184ce4a 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_1.cpp @@ -5,7 +5,7 @@ using namespace std; void Pascal(int &acc, int n) { acc = 0; for (int i = n; i > 0; i--) - acc += i; + acc += i; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_2.cpp index 37b21a6897a74d2ec8d2d83c01735e4cdae69d4c..934b1a36328e71127c1b568661d52c6883ccc07c 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_2.cpp @@ -6,7 +6,7 @@ using namespace std; bool foo(int n) { if (n % 2 == 0) return true; - for (int d = 3; floor(sqrt(n)+1); d=d+2) + for (int d = 3; floor(sqrt(n) + 1); d = d + 2) if (n % d == 0) return false; return true; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_3.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_3.cpp index 497c6385b566424744056762f6c17ac04ee60c97..148fd76685968afb620903211b861013858b1228 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_3.cpp @@ -3,7 +3,7 @@ using namespace std; void Blaise(int &acc, int n) { - acc = n * (n+1) / 2; + acc = n * (n + 1) / 2; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_4.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_4.cpp index ec9a1f731bcff8507efcf1d0979b0633e67c04c2..a05c7523109059401d44e3d201b00a3dd97a53c1 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_4.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_4.cpp @@ -10,15 +10,15 @@ bool foo(int n, int j) { else if (n % j == 0) return false; else - return foo(n, j+1); + return foo(n, j + 1); } int main() { if (foo(13, 2)) - cout << "Oui" << endl; + cout << "Oui" << endl; else - cout << "Non" << endl; + cout << "Non" << endl; return 0; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_exam_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_exam_1.cpp index e117208a8bd0d3138b24c8c29dbd493b95e86c7c..ac5b24c6163ca71c2340d7e48bf857cd022272a9 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_exam_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_exam_1.cpp @@ -5,13 +5,13 @@ using namespace std; void Pascal(int &acc, int n) { acc = 0; for (int i = n; i > 0; i--) - acc += i; + acc += i; return acc; } int main() { int somme; - + Pascal(somme, 8); cout << "La somme est de : " << somme << endl; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_exam_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_exam_2.cpp index 37b21a6897a74d2ec8d2d83c01735e4cdae69d4c..934b1a36328e71127c1b568661d52c6883ccc07c 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_exam_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_exam_2.cpp @@ -6,7 +6,7 @@ using namespace std; bool foo(int n) { if (n % 2 == 0) return true; - for (int d = 3; floor(sqrt(n)+1); d=d+2) + for (int d = 3; floor(sqrt(n) + 1); d = d + 2) if (n % d == 0) return false; return true; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_1.cpp index 497c6385b566424744056762f6c17ac04ee60c97..148fd76685968afb620903211b861013858b1228 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_1.cpp @@ -3,7 +3,7 @@ using namespace std; void Blaise(int &acc, int n) { - acc = n * (n+1) / 2; + acc = n * (n + 1) / 2; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp index ec9a1f731bcff8507efcf1d0979b0633e67c04c2..a05c7523109059401d44e3d201b00a3dd97a53c1 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp @@ -10,15 +10,15 @@ bool foo(int n, int j) { else if (n % j == 0) return false; else - return foo(n, j+1); + return foo(n, j + 1); } int main() { if (foo(13, 2)) - cout << "Oui" << endl; + cout << "Oui" << endl; else - cout << "Non" << endl; + cout << "Non" << endl; return 0; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_simplest_1.cpp b/test~coding~readingCppPrograms.fr/data/procedure_simplest_1.cpp index 0789e4fae3d02edf9a912ad18fa4b3e23cbcc781..209866dd75ca90180509bd778d1f33286116db1b 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_simplest_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_simplest_1.cpp @@ -4,7 +4,7 @@ using namespace std; void decrement(int n) { - n=n-1; + n = n - 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_simplest_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_simplest_2.cpp index fad7ee1788b87f087c02a8250db7c3193ca5311b..be076fca5cf58a9547fe1c41e62fea557fbac1c4 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_simplest_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_simplest_2.cpp @@ -4,7 +4,7 @@ using namespace std; void increment(int n) { - n=n+1; + n = n + 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_simplest_2_input.cpp b/test~coding~readingCppPrograms.fr/data/procedure_simplest_2_input.cpp index 4b917362e46553c8d36eff9990ec8d2b536b951e..b35e53dce19bf980997ad0dd777323dc75509d8b 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_simplest_2_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_simplest_2_input.cpp @@ -2,7 +2,7 @@ using namespace std; -void saisie(int &a){ +void saisie(int &a) { int b; cin >> b; a = a + b; diff --git a/test~coding~readingCppPrograms.fr/data/procedure_simplest_3.cpp b/test~coding~readingCppPrograms.fr/data/procedure_simplest_3.cpp index 12849abc856cb9d7f475e07a3de723d983135f98..624cda694ea47cca9920f01755c2ac673eba6169 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_simplest_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_simplest_3.cpp @@ -4,7 +4,7 @@ using namespace std; void decrement(int &n) { - n=n-1; + n = n - 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/procedure_simplest_4.cpp b/test~coding~readingCppPrograms.fr/data/procedure_simplest_4.cpp index 8b61816e2d48aa8e8675ca60799e8214c0d66847..84f29c1106acef3f385397ce9a0d89aea554720f 100644 --- a/test~coding~readingCppPrograms.fr/data/procedure_simplest_4.cpp +++ b/test~coding~readingCppPrograms.fr/data/procedure_simplest_4.cpp @@ -4,7 +4,7 @@ using namespace std; void increment(int &n) { - n=n+1; + n = n + 1; } int main() { diff --git a/test~coding~readingCppPrograms.fr/data/variable_division_entiere.cpp b/test~coding~readingCppPrograms.fr/data/variable_division_entiere.cpp index f61dabec7d8a68d1cbf24366f6a428597328c7f3..b9a689a7f1078c52c445547da5de1a4a8ffc1b7b 100644 --- a/test~coding~readingCppPrograms.fr/data/variable_division_entiere.cpp +++ b/test~coding~readingCppPrograms.fr/data/variable_division_entiere.cpp @@ -3,7 +3,7 @@ using namespace std; int main () { int x, y; - x = 5*(2/5); - y = (5*2)/5; + x = 5 * (2 / 5); + y = (5 * 2) / 5; cout << x << ", " << y << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/vector1D_1_input.cpp b/test~coding~readingCppPrograms.fr/data/vector1D_1_input.cpp index 2c8633f57fae687c9d9b1f49f7d13a50b9fb4561..a049d53b231fbb3f3f6e19ff3037693b835cb121 100644 --- a/test~coding~readingCppPrograms.fr/data/vector1D_1_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector1D_1_input.cpp @@ -7,6 +7,6 @@ int main() { int i; cin >> i; - cout << tab[i-2] << endl; + cout << tab[i - 2] << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/vector1D_2_input.cpp b/test~coding~readingCppPrograms.fr/data/vector1D_2_input.cpp index 5fade726052ae495b31bdd0f8995b83b95932f61..9ea2a247867c7d2331fe9d3080c78f0177b13dd2 100644 --- a/test~coding~readingCppPrograms.fr/data/vector1D_2_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector1D_2_input.cpp @@ -6,8 +6,8 @@ int main() { vector<int> tab = {4, 10, 13, 7, 5, 6}; int s = 0; cin >> tab[3]; - for(int i=0; i<tab.size();i++) { - if(tab[i]%2 == 0) { + for (int i = 0; i < tab.size(); i++) { + if (tab[i] % 2 == 0) { s = s + tab[i]; } } diff --git a/test~coding~readingCppPrograms.fr/data/vector1D_3_input.cpp b/test~coding~readingCppPrograms.fr/data/vector1D_3_input.cpp index b684235bb8fd47163c134e5eeb979e6fb0c65ca6..0633744a3b055b59bddbab1a8c0830469eaaa2fa 100644 --- a/test~coding~readingCppPrograms.fr/data/vector1D_3_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector1D_3_input.cpp @@ -4,9 +4,9 @@ using namespace std; int mystere(vector<int> tab, int v) { int c = 0; - for(int i=0; i<tab.size(); i++) { - if(tab[i]==v) { - c = c +1; + for (int i = 0; i < tab.size(); i++) { + if (tab[i] == v) { + c = c + 1; } } return c; @@ -16,5 +16,5 @@ int main() { vector<int> tab = {10, 2, 5, 2, 10, 5, 5, 2}; int s; cin >> s; - cout << s + mystere(tab,10) << endl; + cout << s + mystere(tab, 10) << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp index 75a5e2763aa51eb9b9e7f63091fd0a1099d95455..9eec5a12ec99ebbd52c80d669ece3effb5885388 100644 --- a/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector2D_1_input.cpp @@ -9,9 +9,9 @@ int main() { { 0, 0, 42, 0, 0}, { 0, 0, 0, 42, 0}, { 0, 0, 0, 0, 42} - }; + }; int j; cin >> j; - if (0<=j and j<5) + if (0 <= j and j < 5) cout << tab[3][j] << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp index d904a9b195d8108c1db277b062af72e6239ffdf6..c95bdf8ee30214fca8d1ab8aea81fc6725404380 100644 --- a/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector2D_2_input.cpp @@ -4,7 +4,7 @@ using namespace std; int mystere(vector<vector<int>> tab, int j) { int s = 0; - for(int i=0; i <tab.size();i++) { + for (int i = 0; i < tab.size(); i++) { s = s + tab[i][j]; } return s; @@ -16,9 +16,9 @@ int main() { {10, 20, 10, 1}, {20, 10, 10, 3}, { 1, 3, 2, 0} - }; + }; int j; cin >> j; - if (0<=j and j<4) - cout << mystere(tab,j) << endl; + if (0 <= j and j < 4) + cout << mystere(tab, j) << endl; } diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_loop_1.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_loop_1.cpp index c65be01710a155be4f1e86baa2fd3a4569946ad3..4c7075081020be20bc1ab9771dbfea182fc02b9d 100644 --- a/test~coding~readingCppPrograms.fr/data/vector2D_loop_1.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector2D_loop_1.cpp @@ -5,9 +5,9 @@ using namespace std; int main() { vector<vector <int>> tab = {{1, 2, 3}, {4, 5, 6}}; - for(int i=0; i< tab.size(); i++) { + for (int i = 0; i < tab.size(); i++) { int s = 0; - for(int j=0; j<tab[i].size();j++) { + for (int j = 0; j < tab[i].size(); j++) { s = s + tab[i][j]; } cout << s << endl; diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_loop_2.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_loop_2.cpp index 0af366e8ddb376012ec7d65b78e9b8c6e4a248ed..192eea3a14269405f13478058d27560c8ecfb5d4 100644 --- a/test~coding~readingCppPrograms.fr/data/vector2D_loop_2.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector2D_loop_2.cpp @@ -6,8 +6,8 @@ int main() { vector<vector <int>> tab = {{1, 2, 3}, {4, 5, 6}}; int s = 0; - for(int i=0; i< tab.size(); i++) { - for(int j=0; j<tab[i].size();j++) { + for (int i = 0; i < tab.size(); i++) { + for (int j = 0; j < tab[i].size(); j++) { s = s + tab[i][j]; } cout << s << endl; diff --git a/test~coding~readingCppPrograms.fr/data/vector2D_loop_3.cpp b/test~coding~readingCppPrograms.fr/data/vector2D_loop_3.cpp index 5d5a290511df2875447faecb85782cea11979350..c1f690830bcdad275721526f39da7550de5449dd 100644 --- a/test~coding~readingCppPrograms.fr/data/vector2D_loop_3.cpp +++ b/test~coding~readingCppPrograms.fr/data/vector2D_loop_3.cpp @@ -5,8 +5,8 @@ using namespace std; int main() { vector<vector <int>> tab = {{2, 5}, {1, 4}}; - for(int i=0; i< tab.size(); i++) { - for(int j=0; j<tab[i].size();j++) { + for (int i = 0; i < tab.size(); i++) { + for (int j = 0; j < tab[i].size(); j++) { cout << tab[i][j] << endl; } }