From 6634ab89d690523f82db5958ba24f870b05690a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=2E=20Thi=C3=A9ry?= <nthiery@users.sf.net>
Date: Wed, 24 Feb 2016 12:06:48 +0100
Subject: [PATCH] Reformatage avec astyle
---
test~coding~readingCppPrograms.fr/Makefile | 18 ++++++++
test~coding~readingCppPrograms.fr/README.rst | 42 +++++++++++++++++++
.../data/file_ostringstream.cpp | 2 +-
.../data/function_blackjack.cpp | 16 +++----
.../data/function_call_1.cpp | 2 +-
.../data/function_call_2.cpp | 2 +-
.../data/function_call_3.cpp | 8 ++--
.../data/function_call_4.cpp | 8 ++--
.../data/function_if.cpp | 5 +--
.../data/function_inversion_arguments.cpp | 8 ++--
.../data/if_calculation.cpp | 3 +-
.../data/if_oppose.cpp | 2 +-
.../data/if_semicolon.cpp | 2 +-
.../data/io_basic_input.cpp | 2 +-
.../data/io_output_expr.cpp | 2 +-
.../data/loop_1_input.cpp | 4 +-
.../data/loop_for_factorial.cpp | 2 +-
.../data/loop_indices.cpp | 2 +-
.../data/loop_indices_2.cpp | 2 +-
.../data/loop_odd.cpp | 2 +-
.../data/loop_substract.cpp | 2 +-
.../data/loop_syracuse.cpp | 6 +--
.../data/procedure-calling_1.cpp | 2 +-
.../data/procedure-calling_1_input.cpp | 4 +-
.../data/procedure-calling_2.cpp | 12 +++---
.../data/procedure-calling_2_input.cpp | 6 +--
.../data/procedure-calling_3.cpp | 8 ++--
.../data/procedure-calling_4.cpp | 8 ++--
.../data/procedure-loop_no_1.cpp | 18 ++++----
.../data/procedure-loop_no_2.cpp | 17 ++++----
.../data/procedure-loop_yes_1.cpp | 17 ++++----
.../data/procedure-loop_yes_2.cpp | 17 ++++----
.../data/procedure-simplest_1.cpp | 4 +-
.../data/procedure-simplest_2.cpp | 4 +-
.../data/procedure-simplest_3.cpp | 4 +-
.../data/procedure-simplest_4.cpp | 4 +-
.../data/procedure_calling_1.cpp | 2 +-
.../data/procedure_calling_1_input.cpp | 4 +-
.../data/procedure_calling_2.cpp | 12 +++---
.../data/procedure_calling_2_input.cpp | 6 +--
.../data/procedure_calling_3.cpp | 8 ++--
.../data/procedure_calling_4.cpp | 8 ++--
.../data/procedure_loop_no_1.cpp | 18 ++++----
.../data/procedure_loop_no_2.cpp | 17 ++++----
.../data/procedure_loop_yes_1.cpp | 17 ++++----
.../data/procedure_loop_yes_2.cpp | 17 ++++----
.../data/procedure_math_1.cpp | 2 +-
.../data/procedure_math_2.cpp | 2 +-
.../data/procedure_math_3.cpp | 2 +-
.../data/procedure_math_4.cpp | 6 +--
.../data/procedure_math_exam_1.cpp | 4 +-
.../data/procedure_math_exam_2.cpp | 2 +-
.../data/procedure_math_pratice_1.cpp | 2 +-
.../data/procedure_math_pratice_2.cpp | 6 +--
.../data/procedure_simplest_1.cpp | 2 +-
.../data/procedure_simplest_2.cpp | 2 +-
.../data/procedure_simplest_2_input.cpp | 2 +-
.../data/procedure_simplest_3.cpp | 2 +-
.../data/procedure_simplest_4.cpp | 2 +-
.../data/variable_division_entiere.cpp | 4 +-
.../data/vector1D_1_input.cpp | 2 +-
.../data/vector1D_2_input.cpp | 4 +-
.../data/vector1D_3_input.cpp | 8 ++--
.../data/vector2D_1_input.cpp | 4 +-
.../data/vector2D_2_input.cpp | 8 ++--
.../data/vector2D_loop_1.cpp | 4 +-
.../data/vector2D_loop_2.cpp | 4 +-
.../data/vector2D_loop_3.cpp | 4 +-
68 files changed, 265 insertions(+), 189 deletions(-)
diff --git a/test~coding~readingCppPrograms.fr/Makefile b/test~coding~readingCppPrograms.fr/Makefile
index 132d42c..9b20f02 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 5914c89..baa702e 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 9c9867a..2857870 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 6244905..e9bbd26 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 04039f4..7ba10d8 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 19056bc..ceeb94b 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 65eff79..4f9e0e5 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 7e069b3..c027058 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 7d2e269..38ac324 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 99c714f..8dd2e37 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 0d8b7f8..65d1e36 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 89d8f21..dcaec29 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 14942a8..18b0e06 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 c35f12e..1acb6a6 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 c0592f4..113cbd9 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 392e5e5..938b4e3 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 d6b9606..6afaa3e 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 32a59d7..9af4027 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 5f80cf9..a788da8 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 50fb6e1..a8788cf 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 fef4273..6a3d6af 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 a22e0c7..102377d 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 f33d31b..f3bbe5b 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 82ba255..e5cf0e1 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 7185eb0..85de653 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 505d0b4..d252acd 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 cd9eb63..890809d 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 bd6712a..f6c834c 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 1e5cc3b..16d6478 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 59efae5..ebb1d38 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 55ea5c5..e2e54ba 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 59efae5..ebb1d38 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 15581db..80e15be 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 4d8b937..0eb83ba 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 79018ba..cd04e3f 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 e2c2293..e988305 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 f33d31b..f3bbe5b 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 82ba255..e5cf0e1 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 7185eb0..85de653 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 bae4fdf..dc69180 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 cd9eb63..890809d 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 bd6712a..f6c834c 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 1e5cc3b..16d6478 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 59efae5..ebb1d38 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 55ea5c5..e2e54ba 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 59efae5..ebb1d38 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 639bbb0..da9d15a 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 37b21a6..934b1a3 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 497c638..148fd76 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 ec9a1f7..a05c752 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 e117208..ac5b24c 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 37b21a6..934b1a3 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 497c638..148fd76 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 ec9a1f7..a05c752 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 0789e4f..209866d 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 fad7ee1..be076fc 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 4b91736..b35e53d 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 12849ab..624cda6 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 8b61816..84f29c1 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 f61dabe..b9a689a 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 2c8633f..a049d53 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 5fade72..9ea2a24 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 b684235..0633744 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 75a5e27..9eec5a1 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 d904a9b..c95bdf8 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 c65be01..4c70750 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 0af366e..192eea3 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 5d5a290..c1f6908 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;
}
}
--
GitLab