From afdf3e41818285854d14426c28541e2c748ce738 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Priez <EliX@MacBook-Pro-de-Jean-Baptiste.local>
Date: Fri, 12 Feb 2016 07:05:41 +0100
Subject: [PATCH] JB: push and modify procedure math
---
.../data/procedure_math_exam_1.cpp | 15 ++++++-----
.../data/procedure_math_exam_2.cpp | 19 ++++++--------
.../data/procedure_math_pratice_1.cpp | 8 +++---
.../data/procedure_math_pratice_2.cpp | 25 +++++++++++++++++++
4 files changed, 46 insertions(+), 21 deletions(-)
create mode 100644 test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp
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 6edf846..e117208 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_math_exam_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_math_exam_1.cpp
@@ -2,15 +2,18 @@
using namespace std;
-void Blaise(int &acc, int n) {
- acc = n * (n+1) / 2;
+void Pascal(int &acc, int n) {
+ acc = 0;
+ for (int i = n; i > 0; i--)
+ acc += i;
+ return acc;
}
int main() {
- int somme = 0;
-
- Blaise(somme, 8);
- cout << "Blaise dit que la somme est de : " << somme << endl;
+ int somme;
+
+ Pascal(somme, 8);
+ cout << "La somme est de : " << somme << endl;
return 0;
}
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 5899047..37b21a6 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_math_exam_2.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_math_exam_2.cpp
@@ -4,22 +4,19 @@
using namespace std;
-bool premier(int n) {
-
+bool foo(int n) {
if (n % 2 == 0) return true;
- for (int d = 3; floor(sqrt(n)+1); d=d+2)
- if (n % d == 0)
- return false;
- return true;
+ for (int d = 3; floor(sqrt(n)+1); d=d+2)
+ if (n % d == 0)
+ return false;
+ return true;
}
int main() {
-
- if (premier(21))
- cout << "Prim" << endl;
+ if (foo(21))
+ cout << "Oui" << endl;
else
- cout << "Pas Prim" << endl;
-
+ cout << "Non" << endl;
return 0;
}
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 42a0793..497c638 100644
--- a/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_1.cpp
+++ b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_1.cpp
@@ -7,10 +7,10 @@ void Blaise(int &acc, int n) {
}
int main() {
- int somme = 0;
+ int prod;
- Blaise(somme, 8);
- cout << "Blaise dit que la somme est de : " << somme << endl;
+ Blaise(prod, 8);
+ cout << "Le produit retourne : " << prod << endl;
return 0;
-}
\ No newline at end of file
+}
diff --git a/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp
new file mode 100644
index 0000000..ec9a1f7
--- /dev/null
+++ b/test~coding~readingCppPrograms.fr/data/procedure_math_pratice_2.cpp
@@ -0,0 +1,25 @@
+#include <iostream>
+#include <math.h>
+
+using namespace std;
+
+
+bool foo(int n, int j) {
+ if (j == floor(sqrt(n) + 1))
+ return true;
+ else if (n % j == 0)
+ return false;
+ else
+ return foo(n, j+1);
+}
+
+int main() {
+
+ if (foo(13, 2))
+ cout << "Oui" << endl;
+ else
+ cout << "Non" << endl;
+
+
+ return 0;
+}
--
GitLab