From addf3ca49e3279be804f87d0ad3dc6f3d451d2e8 Mon Sep 17 00:00:00 2001
From: Alexandra Zaharia <zaharia@lri.fr>
Date: Wed, 10 Feb 2016 16:53:56 +0100
Subject: [PATCH] =?UTF-8?q?Simplifi=C3=A9=20exercices=20procedure=5Fcallin?=
=?UTF-8?q?g=5Fprocedure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...edure_calling_procedure_0_entrainement.cpp | 4 +---
.../procedure_calling_procedure_0_examen.cpp | 4 +---
...edure_calling_procedure_1_entrainement.cpp | 20 +++++--------------
.../procedure_calling_procedure_1_examen.cpp | 20 +++++--------------
4 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_entrainement.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_entrainement.cpp
index 03c531f..2359e68 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_entrainement.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_entrainement.cpp
@@ -25,9 +25,7 @@ int main() {
f(tab, 2, 3);
- for (i = 0; i < tab.size(); i++)
- cout << tab[i] << " ";
- cout << endl;
+ cout << tab[3] << endl;
return 0;
}
\ No newline at end of file
diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_examen.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_examen.cpp
index 5a101c0..e791bc5 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_examen.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_0_examen.cpp
@@ -25,9 +25,7 @@ int main() {
f(tab, 1, 3);
- for (i = 0; i < tab.size(); i++)
- cout << tab[i] << " ";
- cout << endl;
+ cout << tab[1] << endl;
return 0;
}
\ No newline at end of file
diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_entrainement.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_entrainement.cpp
index a7b652f..970b5f6 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_entrainement.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_entrainement.cpp
@@ -7,31 +7,21 @@ int g(int n) {
return (n + 1) * (n - 1);
}
-void f(vector<int> t, int a, int b, bool &c, int &d) {
- if (a == b || t[a] == t[b]) c = false;
- else {
- if (t[a] < t[b]) {
- c = true;
- d = g(t[b] - t[a]);
- } else {
- c = false;
- d = g(t[a] - t[b]);
- }
- }
+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() {
int i;
vector<int> tab = {2, 4, 5, 8};
- bool b;
int r = -1;
int x = 2;
int y = 3;
- f(tab, x, y, b, r);
+ f(tab, x, y, r);
- cout << tab[x] << (b ? " < " : " >= ") << tab[y] <<
- ", r = " << r << endl;
+ cout << r << endl;
return 0;
}
\ No newline at end of file
diff --git a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_examen.cpp b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_examen.cpp
index 04b2800..dd66b26 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_examen.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_calling_procedure_1_examen.cpp
@@ -7,31 +7,21 @@ int g(int n) {
return (n + 1) * (n - 1);
}
-void f(vector<int> t, int a, int b, bool &c, int &d) {
- if (a == b || t[a] == t[b]) c = false;
- else {
- if (t[a] < t[b]) {
- c = true;
- d = g(t[b] - t[a]);
- } else {
- c = false;
- d = g(t[a] - t[b]);
- }
- }
+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() {
int i;
vector<int> tab = {3, 1, 2, 6};
- bool b;
int r = -1;
int x = 0;
int y = 2;
- f(tab, x, y, b, r);
+ f(tab, x, y, r);
- cout << tab[x] << (b ? " < " : " >= ") << tab[y] <<
- ", r = " << r << endl;
+ cout << r << endl;
return 0;
}
\ No newline at end of file
--
GitLab