From ac0981fcd38ec7f07deb879fc8c3675d3210b930 Mon Sep 17 00:00:00 2001
From: EdouardParis <mail@edouard.paris>
Date: Mon, 30 May 2016 17:39:09 +0200
Subject: [PATCH] Keep it simple stupid
---
src/Makefile | 13 ++-----------
src/algo_ex1.cpp | 23 -----------------------
src/algo_ex1.h | 4 ----
src/question_3.cpp | 20 +++++++++++++++++++-
4 files changed, 21 insertions(+), 39 deletions(-)
delete mode 100644 src/algo_ex1.cpp
delete mode 100644 src/algo_ex1.h
diff --git a/src/Makefile b/src/Makefile
index 9c49f97..4169cd5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,13 +1,4 @@
all: question_3
-question_3: question_3.o algo_ex1.o
- g++ -o question_3 question_3.o algo_ex1.o
-
-algo_ex1.o: algo_ex1.h
- g++ -Wall -Wextra -lgmpxx -lgmp algo_ex1.cpp -o algo_ex1.o
-
-question_3.o: question_3.cpp algo_ex1.h
- g++ -Wall -Wextra -lgmpxx -lgmp question_3.cpp -o question_3.o
-
-clean:
- rm -rf *.o
+question_3: question_3.cpp
+ g++ -o question_3 question_3.cpp -Wall -Wextra -lgmp -lgmpxx
diff --git a/src/algo_ex1.cpp b/src/algo_ex1.cpp
deleted file mode 100644
index e6c32ea..0000000
--- a/src/algo_ex1.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//algo used by question 3 and 5
-//gmp ne retourne que la partie entière inférieure lors de ses opérations.
-#include <ctime>
-#include <gmpxx.h>
-
-time_t sqrt(mpz_class const& a, mpz_class & res)
-{
- mpz_class r1 = a;
- mpz_class r2 = a;
-
- struct timespec t0, t1;
-
- clock_gettime( CLOCK_REALTIME, &t0);
- while (r2 < r1) {
- r2 = (r1 + (a / r1))/2;
- r1 = r2;
- }
- res = r1;
- clock_gettime( CLOCK_REALTIME, &t1);
-
- time_t t_res = 1000.*(t1.tv_sec-t0.tv_sec) + (t1.tv_nsec-t0.tv_nsec)/1000000.;
- return t_res;
-};
diff --git a/src/algo_ex1.h b/src/algo_ex1.h
deleted file mode 100644
index 5509736..0000000
--- a/src/algo_ex1.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <ctime>
-#include <gmpxx.h>
-
-time_t algo_sqrt(mpz_class const& a, mpz_class & res);
diff --git a/src/question_3.cpp b/src/question_3.cpp
index 7f1c5a7..566a14b 100644
--- a/src/question_3.cpp
+++ b/src/question_3.cpp
@@ -8,7 +8,25 @@
#include <ctime>
#include <gmpxx.h>
#include <cassert>
-#include "algo_ex1.h"
+
+time_t algo_sqrt(mpz_class const& a, mpz_class & res)
+{
+ mpz_class r1 = a;
+ mpz_class r2 = a;
+
+ struct timespec t0, t1;
+
+ clock_gettime( CLOCK_REALTIME, &t0);
+ while (r2 < r1) {
+ r2 = (r1 + (a / r1))/2;
+ r1 = r2;
+ }
+ res = r1;
+ clock_gettime( CLOCK_REALTIME, &t1);
+
+ time_t t_res = 1000.*(t1.tv_sec-t0.tv_sec) + (t1.tv_nsec-t0.tv_nsec)/1000000.;
+ return t_res;
+};
int main(int argc, char** argv) {
assert(argc == 1);
--
GitLab