Merge branch 'paul' of...

Merge branch 'paul' of https://gitlab-student.centralesupelec.fr/paul.chevalier/nekoma-tech into paul

test_nouveautestthreding.py

@@ -15,15 +15,20 @@ def thread_wrapper(start, end, results, index):
 # Single-threaded execution
 def single_threaded():
     start_time = time.time()
-    compute_task(0, 10_000_000)
+    compute_task(0, 100_000_000)
     end_time = time.time()
     return end_time - start_time
 
 # Multi-threaded execution
 def multi_threaded():
     start_time = time.time()
+<<<<<<< HEAD
     num_threads = 2
     step = 10_000_000 // num_threads
+=======
+    num_threads = 8
+    step = 100_000_000 // num_threads
+>>>>>>> 73f7a464704d2fa11671ba78a16771abe843918a
     threads = []
     results = [0] * num_threads