X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_13%2Fexo1%2Flib%2Farray.c;h=db8ab7e408d625d00db9873d5c363d5d22d1e0c8;hb=210f7f057cbb8acbc783ffd1ac7333d6cf613ce4;hp=ec612c1f82bd769dee7883aca6228a96397ff91c;hpb=475ee86d70921638c700bc0934441c7fe2c905d1;p=TD_C.git diff --git a/TP_13/exo1/lib/array.c b/TP_13/exo1/lib/array.c index ec612c1..db8ab7e 100644 --- a/TP_13/exo1/lib/array.c +++ b/TP_13/exo1/lib/array.c @@ -41,14 +41,20 @@ int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2) return tab_dest; } -int* resize_tab(int tab[], unsigned new_tab_size) { +int* resize_tab(int tab[], unsigned old_tab_size, unsigned new_tab_size) { tab = realloc(tab, sizeof(int) * new_tab_size); + if (old_tab_size < new_tab_size) { + for (unsigned i = old_tab_size; i < new_tab_size; i++) { + tab[i] = 0; + } + } return tab; } /* number of occurences of an element in an unsorted array */ -int count_tab_element(int tab[], unsigned tab_size, int element) { +unsigned 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++; @@ -57,6 +63,26 @@ int count_tab_element(int tab[], unsigned tab_size, int element) { return el_count; } -void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria) { - sort_bubble_array(tab, tab_size, criteria); +unsigned count_tab_criteria(int tab[], unsigned tab_size, c_criteria_cb c_criteria) { + unsigned cr_count = 0; + + for (unsigned i = 0; i < tab_size; i++) { + if (c_criteria(tab[i])) { + cr_count++; + } + } + return cr_count; +} + +bool is_even(int a) { + return (a % 2 == 0); +} + +bool is_odd(int a) { + return (a % 2 != 0); + +} + +void sort_tab(int tab[], unsigned tab_size, s_criteria_cb sort_criteria) { + sort_bubble_array(tab, tab_size, sort_criteria); }