From 16332fec341653a5e6365a923b3e033894de54cf Mon Sep 17 00:00:00 2001 From: Emmanuel Srivastava Date: Mon, 9 Dec 2024 14:58:52 +0100 Subject: [PATCH] update --- DEV.1.1/CM2/CM2A/2.Separation/Makefile | 8 ---- DEV.1.1/CM2/CM2A/2.Separation/carre.c | 5 ++- DEV.1.1/CM2/CM2A/2.Separation/lightness.c | 1 - DEV.1.1/CM2/CM2A/2.Separation/lightness.h | 3 -- DEV.1.1/CM2/CM2A/Makefile | 8 ++++ DEV.1.1/CM2/CM2A/reitne | Bin 0 -> 4 bytes DEV.1.1/CM2/CM2A/reitne.txt | 2 - DEV.1.1/CM2/CM2B/1.Décomposition.c | 17 ++++++++ DEV.1.1/CM2/CM2B/2.Division/Makefile | 8 ++++ DEV.1.1/CM2/CM2B/2.Division/carre.c | 47 ++++++++++++++++++++++ DEV.1.1/CM2/CM2B/2.Division/hue.c | 12 ++++++ DEV.1.1/CM2/CM2B/2.Division/hue.h | 10 +++++ 12 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 DEV.1.1/CM2/CM2A/Makefile create mode 100644 DEV.1.1/CM2/CM2A/reitne delete mode 100644 DEV.1.1/CM2/CM2A/reitne.txt create mode 100644 DEV.1.1/CM2/CM2B/1.Décomposition.c create mode 100644 DEV.1.1/CM2/CM2B/2.Division/Makefile create mode 100644 DEV.1.1/CM2/CM2B/2.Division/carre.c create mode 100644 DEV.1.1/CM2/CM2B/2.Division/hue.c create mode 100644 DEV.1.1/CM2/CM2B/2.Division/hue.h diff --git a/DEV.1.1/CM2/CM2A/2.Separation/Makefile b/DEV.1.1/CM2/CM2A/2.Separation/Makefile index 6a197fb..4352d00 100644 --- a/DEV.1.1/CM2/CM2A/2.Separation/Makefile +++ b/DEV.1.1/CM2/CM2A/2.Separation/Makefile @@ -6,11 +6,3 @@ lightness.o : lightness.c lightness.h carre.o : carre.c lightness.h gcc -ansi -pedantic -c carre.c - -### REGLES ESSENTIELLES ### - -but : carre - -### REGLES OPTIONELLES ### -run : but - ./carre \ No newline at end of file diff --git a/DEV.1.1/CM2/CM2A/2.Separation/carre.c b/DEV.1.1/CM2/CM2A/2.Separation/carre.c index 557551b..f80787f 100644 --- a/DEV.1.1/CM2/CM2A/2.Separation/carre.c +++ b/DEV.1.1/CM2/CM2A/2.Separation/carre.c @@ -4,14 +4,15 @@ #include "lightness.h" -#define LIGHT 0 -#define DARK 1 #define RED 1 #define GREEN 2 #define BLUE 4 #define DARK_RED 124 #define DARK_GREEN 34 #define DARK_BLUE 19 +#define LIGHT_RED 217 +#define LIGHT_GREEN 157 +#define LIGHT_BLUE 147 int hue(void) { int choice = rand()%3; diff --git a/DEV.1.1/CM2/CM2A/2.Separation/lightness.c b/DEV.1.1/CM2/CM2A/2.Separation/lightness.c index e1ead60..b9d19bf 100644 --- a/DEV.1.1/CM2/CM2A/2.Separation/lightness.c +++ b/DEV.1.1/CM2/CM2A/2.Separation/lightness.c @@ -1,5 +1,4 @@ #include -#include #include "lightness.h" int lightness(void) { diff --git a/DEV.1.1/CM2/CM2A/2.Separation/lightness.h b/DEV.1.1/CM2/CM2A/2.Separation/lightness.h index f5bcd91..7a24c4a 100644 --- a/DEV.1.1/CM2/CM2A/2.Separation/lightness.h +++ b/DEV.1.1/CM2/CM2A/2.Separation/lightness.h @@ -3,9 +3,6 @@ #define LIGHT 0 #define DARK 1 -#define LIGHT_RED 217 -#define LIGHT_GREEN 157 -#define LIGHT_BLUE 147 int lightness(void); diff --git a/DEV.1.1/CM2/CM2A/Makefile b/DEV.1.1/CM2/CM2A/Makefile new file mode 100644 index 0000000..4352d00 --- /dev/null +++ b/DEV.1.1/CM2/CM2A/Makefile @@ -0,0 +1,8 @@ +carre : carre.o lightness.o + gcc -ansi -pedantic -o carre carre.o lightness.o + +lightness.o : lightness.c lightness.h + gcc -ansi -pedantic -c lightness.c + +carre.o : carre.c lightness.h + gcc -ansi -pedantic -c carre.c diff --git a/DEV.1.1/CM2/CM2A/reitne b/DEV.1.1/CM2/CM2A/reitne new file mode 100644 index 0000000000000000000000000000000000000000..6cf817081d6f3cb041f0255654beab36e441433f GIT binary patch literal 4 LcmZP&y4DT=0&M|s literal 0 HcmV?d00001 diff --git a/DEV.1.1/CM2/CM2A/reitne.txt b/DEV.1.1/CM2/CM2A/reitne.txt deleted file mode 100644 index 497f213..0000000 --- a/DEV.1.1/CM2/CM2A/reitne.txt +++ /dev/null @@ -1,2 +0,0 @@ -Adresse : 0x00 0x01 0x02 0x03 -Valeur : 0x12 0x34 0x56 0x78 diff --git a/DEV.1.1/CM2/CM2B/1.Décomposition.c b/DEV.1.1/CM2/CM2B/1.Décomposition.c new file mode 100644 index 0000000..631afd6 --- /dev/null +++ b/DEV.1.1/CM2/CM2B/1.Décomposition.c @@ -0,0 +1,17 @@ +#include +#include +#include + +int main(int argc, char *argv[]) { + long int x, y; + ldiv_t result; + + sscanf(argv[1], "%ld", &x); + sscanf(argv[2], "%ld", &y); + + result = ldiv(x, y); + printf("quotient : %ld\n", result.quot); + printf("reste : %ld\n", result.rem); + + return EXIT_SUCCESS; +} diff --git a/DEV.1.1/CM2/CM2B/2.Division/Makefile b/DEV.1.1/CM2/CM2B/2.Division/Makefile new file mode 100644 index 0000000..818de60 --- /dev/null +++ b/DEV.1.1/CM2/CM2B/2.Division/Makefile @@ -0,0 +1,8 @@ +carre : carre.o hue.o + gcc -ansi -pedantic -o carre carre.o hue.o + +hue.o : hue.c hue.h + gcc -ansi -pedantic -c hue.c + +carre.o : carre.c hue.h + gcc -ansi -pedantic -c carre.c \ No newline at end of file diff --git a/DEV.1.1/CM2/CM2B/2.Division/carre.c b/DEV.1.1/CM2/CM2B/2.Division/carre.c new file mode 100644 index 0000000..d8a8695 --- /dev/null +++ b/DEV.1.1/CM2/CM2B/2.Division/carre.c @@ -0,0 +1,47 @@ +#include +#include +#include + +#include "hue.h" + +#define LIGHT 0 +#define DARK 1 +#define LIGHT_RED 217 +#define DARK_RED 124 +#define LIGHT_GREEN 157 +#define DARK_GREEN 34 +#define LIGHT_BLUE 147 +#define DARK_BLUE 19 + +int lightness(void) { + if (time(NULL)%2) { + return LIGHT; + } else { + return DARK; + } +} + + + +int main(void) { + int l, c, v; + + srand(time(NULL)); + l = lightness(); + c = hue(); + + if (c == RED) { + v = (l == LIGHT) ? LIGHT_RED : DARK_RED; + } else if (c == GREEN) { + v = (l == LIGHT) ? LIGHT_GREEN : DARK_GREEN; + } else /* if (c == BLUE) */ { + v = (l == LIGHT) ? LIGHT_BLUE : DARK_BLUE; + } + + printf("┏━━━━┓\n"); + printf("┃\33[48;5;%dm \33[m┃\n", v); + printf("┃\33[48;5;%dm \33[m┃\n", v); + printf("┗━━━━┛\n"); + + return EXIT_SUCCESS; +} \ No newline at end of file diff --git a/DEV.1.1/CM2/CM2B/2.Division/hue.c b/DEV.1.1/CM2/CM2B/2.Division/hue.c new file mode 100644 index 0000000..b7de5e0 --- /dev/null +++ b/DEV.1.1/CM2/CM2B/2.Division/hue.c @@ -0,0 +1,12 @@ +#include "hue.h" + +int hue(void) { + int choice = rand()%3; + if (choice == 0) { + return RED; + } else if (choice == 1) { + return GREEN; + } else /* if (choice == 2) */ { + return BLUE; + } +} \ No newline at end of file diff --git a/DEV.1.1/CM2/CM2B/2.Division/hue.h b/DEV.1.1/CM2/CM2B/2.Division/hue.h new file mode 100644 index 0000000..2ddabb6 --- /dev/null +++ b/DEV.1.1/CM2/CM2B/2.Division/hue.h @@ -0,0 +1,10 @@ +#ifndef HUE_H +#define HUE_H + +#define RED 1 +#define GREEN 2 +#define BLUE 4 + +int hue(void); + +#endif /*HUE_H*/ \ No newline at end of file