diff --git a/ex1/ft_range.c b/ex1/ft_range.c index ff86ac0..0e01a77 100644 --- a/ex1/ft_range.c +++ b/ex1/ft_range.c @@ -6,7 +6,7 @@ /* By: lclerel- +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/03/16 14:44:51 by lclerel- #+# #+# */ -/* Updated: 2026/03/19 11:38:03 by lclerel- ### ########.fr */ +/* Updated: 2026/03/19 14:05:04 by lclerel- ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,8 +37,8 @@ int *ft_range(int min, int max) } return (range); } -/* -void ft_putchar(char c) + +/*void ft_putchar(char c) { write(1, &c, 1); } @@ -70,45 +70,47 @@ int main(void) int *tab; int min = 2; int max = 10; - int size = max - min; int i = 0; - int max_err = 2; - int min_err = 9; - int i_err = 0; - int *tab_err; - int size_err = max_err - min_err; - - tab_err = ft_range(min_err, max_err); - + // TEST 1 : Cas Normal tab = ft_range(min, max); + write(1, "/~~~Test 1~~~\\\n", 15); + write(1, "> Min : ", 8); + ft_putnbr(min); + write(1, " <\n> Max : ", 11); + ft_putnbr(max); + write(1, " <\n> Resultat : ", 16); if (!tab) + write(1, "NULL", 4); + else { - return (1); + while (i < (max - min)) + { + ft_putnbr(tab[i]); + if (i < (max - min - 1)) + write(1, ", ", 2); + i++; + } } - write(1, "Test avec Min : 2, Max : 10. : ", 31); - while (i < size) - { - ft_putnbr(tab[i]); - ft_putchar(','); - i++; - } - ft_putchar('\n'); - - // Test avec full Error (Pour sa que les variables sont Err) - write(1, "Test avec Min : 9, Max : 2. : ", 30); - if (!tab_err) - { - write(1, "Retourne Null (Min a 9, Max a 2)", 32); - } - while (i_err < size_err) - { - ft_putnbr(tab_err[i_err]); - ft_putchar(','); - i++; - } - - ft_putchar('\n'); + write(1, " <\n\\~~~Test 1~~~/\n\n", 18); free(tab); - free(tab_err); + // TEST 2 : Cas Erreur (Min > Max) + int min_err = 9; + int max_err = 2; + int *tab_err = ft_range(min_err, max_err); + + write(1, "/~~~Test 2~~~\\\n", 15); + write(1, "> Min : ", 8); + ft_putnbr(min_err); + write(1, " <\n> Max : ", 11); + ft_putnbr(max_err); + write(1, " <\n> Resultat : ", 16); + if (!tab_err) + write(1, "NULL (OK)", 9); + else + write(1, "ERREUR : Devrait etre NULL", 26); + write(1, " <\n\\~~~Test 2~~~/\n", 18); + if (tab_err) + free(tab_err); + return (0); }*/ diff --git a/ex2/ft_ultimate_range.c b/ex2/ft_ultimate_range.c index d0a8a8b..50f2a71 100644 --- a/ex2/ft_ultimate_range.c +++ b/ex2/ft_ultimate_range.c @@ -6,7 +6,7 @@ /* By: lclerel- +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/03/16 16:07:45 by lclerel- #+# #+# */ -/* Updated: 2026/03/19 11:38:13 by lclerel- ### ########.fr */ +/* Updated: 2026/03/19 14:02:24 by lclerel- ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,8 +40,8 @@ int ft_ultimate_range(int **range, int min, int max) *range = tab; return (size); } -/* -void ft_putchar(char c) + +/*void ft_putchar(char c) { write(1, &c, 1); } @@ -74,42 +74,52 @@ int main(void) int min = 2; int max = 10; int size; - int i = 0; // Integers pour les errors int max_err = 2; int min_err = 9; - int i_err = 0; int *tab_err; int size_err; - + // Integers pour le 3eme Test + int max2 = -5; + int min2 = -1; + int *tab2; + int size2; size_err = ft_ultimate_range(&tab_err ,min_err, max_err); size = ft_ultimate_range(&tab, min, max); + size2 = ft_ultimate_range(&tab2, min2, max2); if (size == -1) { return (1); } - write(1, "Test avec Min : 2, Max : 10. : ", 31); - while (i < size) - { - ft_putnbr(tab[i]); - ft_putchar(','); - i++; - } + // Test 1, Test Min 2 Max 10. + write(1, "/~~~Test 1~~~\\ \n", 16); + write(1, "> Min : ", 8); + ft_putnbr(min); + write(1, " <\n> Max : ", 11); + ft_putnbr(max); + write(1, " <\n> Resultat : ", 17); + ft_putnbr(size); + write(1, " <\n\\~~~Test 1~~~/", 18); ft_putchar('\n'); - write(1, "10 n'est pas present car il est exclu (MAX excluded)", 52); - write(1, "\n", 1); - // Test avec full Error (Pour sa que les variables sont Err) - write(1, "Test avec Min : 9, Max : 2. : ", 30); - if (size_err == 0) - { - write(1, "Retourne Null (Min a 9, Max a 2)", 32); - } - while (i_err < size_err) - { - ft_putnbr(tab_err[i_err]); - ft_putchar(','); - i++; - } + // Test 2, Test Min 9 Max 2 (Return Error) + write(1, "/~~~Test 2~~~\\ \n", 16); + write(1, "> Min : ", 8); + ft_putnbr(min_err); + write(1, " <\n> Max : ", 11); + ft_putnbr(max_err); + write(1, " <\n> Resultat : ", 17); + ft_putnbr(size_err); + write(1, " <\n\\~~~Test 2~~~/", 18); + ft_putchar('\n'); + // Test 3, Test Min -1 Max -5. + write(1, "/~~~Test 3~~~\\ \n", 16); + write(1, "> Min : ", 8); + ft_putnbr(min2); + write(1, " <\n> Max : ", 11); + ft_putnbr(max2); + write(1, " <\n> Resultat : ", 17); + ft_putnbr(size2); + write(1, " <\n\\~~~Test 3~~~/", 18); ft_putchar('\n'); free(tab); }*/