From d34821edb451374581c96c899613c30811b4d299 Mon Sep 17 00:00:00 2001
From: Lucas Schmidt <lucas.schmidt@etu.unistra.fr>
Date: Fri, 31 Jan 2020 15:10:53 +0100
Subject: [PATCH] Modification de tris pour qu'il utilise utils
---
makefile | 2 +-
tris.c | 23 -----------------------
tris.h | 6 +-----
3 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/makefile b/makefile
index 2f1fa91..a98c276 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
all: main triFusion triInsertion triRapide
-main: main.c tris.o
+main: main.c tris.o utils.o
gcc -Wall -o $@ $^
%.o: %.c
diff --git a/tris.c b/tris.c
index 3a1b14f..77d002b 100644
--- a/tris.c
+++ b/tris.c
@@ -1,11 +1,5 @@
#include "tris.h"
-void copierTableau(long* dest,long* src,size_t n){
- for(size_t i = 0;i < n;i++){
- dest[i] = src[i];
- }
-}
-
void fusion(long* A,size_t p,size_t q,size_t r){
size_t n1 = q-p;
size_t n2 = r-q;
@@ -49,17 +43,6 @@ void triFusion(long* A,size_t n){
sousTriFusion(A,0,n);
}
-void printTab(long* A,size_t n){
- printf("{");
- for(size_t i = 0;i < n;i++){
- if(i != 0){
- printf(",");
- }
- printf("%ld",A[i]);
- }
- printf("}\n");
-}
-
void triInsertion(long* A, size_t n){
for(size_t i = 1; i < n; i ++){
long cle = A[i];
@@ -72,12 +55,6 @@ void triInsertion(long* A, size_t n){
}
}
-void permuter(long* a,long* b){
- long tmp = *a;
- *a = *b;
- *b = tmp;
-}
-
size_t partition(long* A,size_t p,size_t r){
long pivot = A[r-1];
size_t i = p;
diff --git a/tris.h b/tris.h
index d9bb60d..ebbe906 100644
--- a/tris.h
+++ b/tris.h
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-void copierTableau(long* dest,long* src,size_t n);
+#include "utils.h"
void fusion(long* A,size_t p,size_t q,size_t r);
@@ -9,12 +9,8 @@ void sousTriFusion(long* A,size_t p,size_t r);
void triFusion(long* A,size_t n);
-void printTab(long* A,size_t n);
-
void triInsertion(long* A, size_t n);
-void permuter(long* a,long* b);
-
size_t partition(long* A,size_t p,size_t r);
void sousTriRapide(long* A,size_t p,size_t r);
--
GitLab