TP 13 exo1: Add more library functions

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/TP_13/exo1/lib/array.c b/TP_13/exo1/lib/array.c
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0c56db6594ba5b9b13563048660f81431b498723 100644 (file)
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -0,0 +1,55 @@
+#include <stdlib.h>
+
+#include "sort.h"
+
+int create_tab(int tab[], unsigned tab_size) {
+    tab = malloc(sizeof(unsigned) * tab_size);
+    if (tab == NULL) {
+        return -1;
+    } else {
+        return 0;
+    }
+}
+
+void free_tab(int tab[]) {
+    free(tab);
+}
+
+/* we suppose both tab are already created */
+static void copy_tab(int src_tab[], int dest_tab[], unsigned min_tab_size, unsigned index_offset) {
+    for (unsigned i = 0; i < min_tab_size; i++) {
+        dest_tab[i + index_offset] = src_tab[i];
+    }
+}
+
+int concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]) {
+    int rt = create_tab(tab_dest, tab_size1 + tab_size2);
+
+    copy_tab(tab1, tab_dest, tab_size1, 0);
+    copy_tab(tab2, tab_dest, tab_size2, tab_size1);
+    return rt;
+}
+
+int resize_tab(int tab[], unsigned tab_size) {
+    tab = realloc(tab, sizeof(int) * tab_size);
+    if (tab == NULL) {
+        return -1;
+    } else {
+        return 0;
+    }
+}
+
+/* number of occurences of an element in an unsorted array  */
+int count_tab_element(int tab[], unsigned tab_size, int element) {
+    unsigned el_count = 0;
+    for (unsigned i = 0; i < tab_size; i++) {
+        if (tab[i] == element) {
+            el_count++;
+        }
+    }
+    return el_count;
+}
+
+void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria) {
+    sort_bubble_array(tab, tab_size, criteria);
+}

diff --git a/TP_13/exo1/lib/array.h b/TP_13/exo1/lib/array.h
index 3326460fca7b414e9705de030ff683c441d3e424..3bc6573f4af22f8ec7b758027a6d32350cd5f542 100644 (file)
--- a/TP_13/exo1/lib/array.h
+++ b/TP_13/exo1/lib/array.h
@@ -1,6 +1,11 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-
+int create_tab(int tab[], unsigned tab_size);
+void free_tab(int tab[]);
+int concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]);
+int resize_tab(int tab[], unsigned tab_size);
+int count_tab_element(int tab[], unsigned tab_size, int element);
+void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria);
 
 #endif /* ARRAY_H */

diff --git a/TP_13/exo1/lib/macros.h b/TP_13/exo1/lib/macros.h
index ab500dfb25d34e25e6e17272e317505f0a887886..4b39cf49e3ad8c88b4fae4414f8e33c0f1368916 100644 (file)
--- a/TP_13/exo1/lib/macros.h
+++ b/TP_13/exo1/lib/macros.h
@@ -19,12 +19,14 @@
 #ifndef MACROS_H
 #define MACROS_H
 
+#include <stdlib.h>
+
 /* definition to expand macro then apply to pragma message */
 #define VALUE_TO_STRING(x) #x
 #define VALUE(x) VALUE_TO_STRING(x)
 #define VAR_NAME_VALUE(var) #var "=" VALUE(var)
 
-#define ARRAY_SIZE(arr) ({typeof (arr) arr ## _is_a_pointer __attribute__((unused)) = {}; \
-                          sizeof(arr) / sizeof(arr[0]);})
+/* FIXME: ensure we manipulate real array */
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
 #endif /*  MACROS_H */

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index 8b196ffe3c6662ad1ec687a117ec09ca0bd70943..0fdb0be30c6ef0c087d8088dc2f3afdc0c0ca18d 100644 (file)
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -9,9 +9,17 @@ bool descending(int a, int b) {
     return a < b;
 }
 
-static bool sort_first(int* array, int length, criteria_cb criteria) {
+bool ascending_and_even(int a, int b) {
+    return (ascending(a, b) && (a % 2 == 0));
+}
+
+bool ascending_and_odd(int a, int b) {
+    return (ascending(a, b) && (a % 2 != 0));
+}
+
+static bool sort_first(int* array, unsigned length, criteria_cb criteria) {
     bool rt = false;
-    for (int i = 0; i < length-1; i++) {
+    for (unsigned i = 0; i < length-1; i++) {
         if (criteria(array[i], array[i+1])) {
             swap_int(&array[i], &array[i+1]);
             if (!rt) { rt = true; };
@@ -21,7 +29,7 @@ static bool sort_first(int* array, int length, criteria_cb criteria) {
 }
 
 /* this function is awaited in the array.c file */
-void sort_array(int* array, int length, criteria_cb criteria) {
+void sort_bubble_array(int* array, unsigned length, criteria_cb criteria) {
     bool rt;
     do {
         rt = sort_first(array, length, criteria);

diff --git a/TP_13/exo1/lib/sort.h b/TP_13/exo1/lib/sort.h
index 57b51decddee5570580cb92e3b3c8fdcbd4f4c7f..8986302931f4fe68402a8acc9b3f47ce34732803 100644 (file)
--- a/TP_13/exo1/lib/sort.h
+++ b/TP_13/exo1/lib/sort.h
@@ -8,7 +8,9 @@ typedef bool(*criteria_cb)(int a, int b);
 /* sort criteria */
 bool ascending(int a, int b);
 bool descending(int a, int b);
+bool ascending_and_even(int a, int b);
+bool ascending_and_odd(int a, int b);
 
-void sort_array(int* array, int length, criteria_cb criteria);
+void sort_bubble_array(int* array, unsigned length, criteria_cb criteria);
 
 #endif /* SORT_H */

diff --git a/TP_13/exo1/src/main.c b/TP_13/exo1/src/main.c
index 06f5f8d66140d669cb3a97bedd47405c4593e2f5..315ed331a2007a350bef7fdc06cf70478041aee0 100644 (file)
--- a/TP_13/exo1/src/main.c
+++ b/TP_13/exo1/src/main.c
@@ -1,7 +1,8 @@
+#include <stdlib.h>
 #include <stdio.h>
 
 int main() {
     printf("Hello world\n");
 
-    return 0;
+    exit(EXIT_SUCCESS);
 }