From 3f0cce69adfef9ba66d54b3cbb5747277b09f317 Mon Sep 17 00:00:00 2001 From: alexandre Date: Fri, 19 Apr 2024 12:05:47 +0200 Subject: [PATCH] added data for S3 --- Makefile | 2 +- S3-colleurs.txt | 69 +++++++++++++++ S3-creneaux.txt | 32 +++++++ output-S3.csv | 218 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 S3-colleurs.txt create mode 100644 S3-creneaux.txt create mode 100644 output-S3.csv diff --git a/Makefile b/Makefile index b4381b1..134d0eb 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ LFLAGS= all: bin/colloscope test: bin/colloscope - bin/colloscope -v MP2I-creneaux.txt 33 MP2I-colleurs.txt 16 9 15 output.csv + bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 output-S3.csv OBJECTS = obj/structure.o obj/algorithm.o obj/display.o obj/logger.o obj/main.o bin/colloscope: $(OBJECTS) diff --git a/S3-colleurs.txt b/S3-colleurs.txt new file mode 100644 index 0000000..f9329ff --- /dev/null +++ b/S3-colleurs.txt @@ -0,0 +1,69 @@ +Carpintero +MATH +14 24 4 2024 +15 24 4 2024 ++ +Boully +MATH +14 24 4 2024 +15 24 4 2024 ++ +Mullaert +MATH +14 23 4 2024 +18 25 4 2024 ++ +Rapin +MATH +18 23 4 2024 +18 25 4 2024 ++ +Oubaha +MATH +17 26 4 2024 +18 26 4 2024 ++ +Le_Gouriellec +ENGLISH +14 24 4 2024 +15 24 4 2024 ++ +Mann +ENGLISH +16 24 4 2024 +17 24 4 2024 ++ +Belagoune +ENGLISH +14 23 4 2024 +17 23 4 2024 +18 23 4 2024 ++ +Herbaut +ENGLISH +17 23 4 2024 ++ +De_Roux +PHYSICS +18 25 4 2024 ++ +Chibani +PHYSICS +16 26 4 2024 ++ +Chevalier +PHYSICS +12 22 4 2024 +14 23 4 2024 +17 23 4 2024 ++ +Poupy +PHYSICS +17 24 4 2024 +18 24 4 2024 ++ +Colin +PHYSICS +17 23 4 2024 ++ +$ \ No newline at end of file diff --git a/S3-creneaux.txt b/S3-creneaux.txt new file mode 100644 index 0000000..21d7899 --- /dev/null +++ b/S3-creneaux.txt @@ -0,0 +1,32 @@ +12 22 4 2024 +12 22 4 2024+ +13 22 4 2024+ +14 23 4 2024 +14 23 4 2024 +14 23 4 2024 +17 23 4 2024 +17 23 4 2024 +17 23 4 2024 +17 23 4 2024 +18 23 4 2024 +18 23 4 2024 +14 24 4 2024+ +14 24 4 2024+ +14 24 4 2024+ +14 24 4 2024 +14 24 4 2024 +14 24 4 2024 +15 24 4 2024 +15 24 4 2024 +15 24 4 2024 +16 24 4 2024 +17 24 4 2024 +17 24 4 2024 +18 24 4 2024 +18 25 4 2024 +18 25 4 2024 +18 25 4 2024 +16 26 4 2024 +17 26 4 2024 +18 26 4 2024 +$ \ No newline at end of file diff --git a/output-S3.csv b/output-S3.csv new file mode 100644 index 0000000..300dca0 --- /dev/null +++ b/output-S3.csv @@ -0,0 +1,218 @@ +hour,day,month,year,length,group,colleur,matiere +12,22,4,2024,1,14,Chevalier,Physique +12,22,4,2024,2,0,none,_ +13,22,4,2024,2,0,none,_ +14,23,4,2024,1,1,Belagoune,Anglais +14,23,4,2024,1,0,none,_ +14,23,4,2024,1,2,Mullaert,Maths +17,23,4,2024,1,3,Herbaut,Anglais +17,23,4,2024,1,2,Chevalier,Physique +17,23,4,2024,1,5,Belagoune,Anglais +17,23,4,2024,1,10,Colin,Physique +18,23,4,2024,1,9,Belagoune,Anglais +18,23,4,2024,1,11,Rapin,Maths +14,24,4,2024,2,0,none,_ +14,24,4,2024,2,0,none,_ +14,24,4,2024,2,0,none,_ +14,24,4,2024,1,5,Boully,Maths +14,24,4,2024,1,8,Carpintero,Maths +14,24,4,2024,1,11,Le_Gouriellec,Anglais +15,24,4,2024,1,12,Boully,Maths +15,24,4,2024,1,13,Le_Gouriellec,Anglais +15,24,4,2024,1,15,Carpintero,Maths +16,24,4,2024,1,15,Mann,Anglais +17,24,4,2024,1,7,Mann,Anglais +17,24,4,2024,1,6,Poupy,Physique +18,24,4,2024,1,8,Poupy,Physique +18,25,4,2024,1,3,Rapin,Maths +18,25,4,2024,1,6,Mullaert,Maths +18,25,4,2024,1,4,De_Roux,Physique +16,26,4,2024,1,12,Chibani,Physique +17,26,4,2024,1,9,Oubaha,Maths +18,26,4,2024,1,14,Oubaha,Maths +12,29,4,2024,1,3,Chevalier,Physique +12,29,4,2024,2,0,none,_ +13,29,4,2024,2,0,none,_ +14,30,4,2024,1,4,Belagoune,Anglais +14,30,4,2024,1,7,Mullaert,Maths +14,30,4,2024,1,13,Chevalier,Physique +17,30,4,2024,1,8,Herbaut,Anglais +17,30,4,2024,1,9,Chevalier,Physique +17,30,4,2024,1,10,Belagoune,Anglais +17,30,4,2024,1,15,Colin,Physique +18,30,4,2024,1,6,Rapin,Maths +18,30,4,2024,1,12,Belagoune,Anglais +14,1,5,2024,2,0,none,_ +14,1,5,2024,2,0,none,_ +14,1,5,2024,2,0,none,_ +14,1,5,2024,1,6,Le_Gouriellec,Anglais +14,1,5,2024,1,9,Boully,Maths +14,1,5,2024,1,10,Carpintero,Maths +15,1,5,2024,1,12,Carpintero,Maths +15,1,5,2024,1,2,Le_Gouriellec,Anglais +15,1,5,2024,1,3,Boully,Maths +16,1,5,2024,1,14,Mann,Anglais +17,1,5,2024,1,1,Poupy,Physique +17,1,5,2024,1,0,none,_ +18,1,5,2024,1,5,Poupy,Physique +18,2,5,2024,1,1,Mullaert,Maths +18,2,5,2024,1,7,De_Roux,Physique +18,2,5,2024,1,13,Rapin,Maths +16,3,5,2024,1,11,Chibani,Physique +17,3,5,2024,1,4,Oubaha,Maths +18,3,5,2024,1,15,Oubaha,Maths +12,6,5,2024,1,14,Chevalier,Physique +12,6,5,2024,2,0,none,_ +13,6,5,2024,2,0,none,_ +14,7,5,2024,1,10,Chevalier,Physique +14,7,5,2024,1,1,Mullaert,Maths +14,7,5,2024,1,1,Belagoune,Anglais +17,7,5,2024,1,3,Herbaut,Anglais +17,7,5,2024,1,5,Belagoune,Anglais +17,7,5,2024,1,8,Chevalier,Physique +17,7,5,2024,1,0,none,_ +18,7,5,2024,1,2,Rapin,Maths +18,7,5,2024,1,9,Belagoune,Anglais +14,8,5,2024,2,0,none,_ +14,8,5,2024,2,0,none,_ +14,8,5,2024,2,0,none,_ +14,8,5,2024,1,4,Carpintero,Maths +14,8,5,2024,1,5,Boully,Maths +14,8,5,2024,1,13,Le_Gouriellec,Anglais +15,8,5,2024,1,7,Carpintero,Maths +15,8,5,2024,1,7,Le_Gouriellec,Anglais +15,8,5,2024,1,8,Boully,Maths +16,8,5,2024,1,11,Mann,Anglais +17,8,5,2024,1,2,Poupy,Physique +17,8,5,2024,1,15,Mann,Anglais +18,8,5,2024,1,4,Poupy,Physique +18,9,5,2024,1,10,Rapin,Maths +18,9,5,2024,1,11,Mullaert,Maths +18,9,5,2024,1,6,De_Roux,Physique +16,10,5,2024,1,12,Chibani,Physique +17,10,5,2024,1,13,Oubaha,Maths +18,10,5,2024,1,14,Oubaha,Maths +12,13,5,2024,1,9,Chevalier,Physique +12,13,5,2024,2,0,none,_ +13,13,5,2024,2,0,none,_ +14,14,5,2024,1,2,Belagoune,Anglais +14,14,5,2024,1,5,Mullaert,Maths +14,14,5,2024,1,11,Chevalier,Physique +17,14,5,2024,1,6,Herbaut,Anglais +17,14,5,2024,1,13,Chevalier,Physique +17,14,5,2024,1,8,Belagoune,Anglais +17,14,5,2024,1,15,Colin,Physique +18,14,5,2024,1,10,Belagoune,Anglais +18,14,5,2024,1,11,Rapin,Maths +14,15,5,2024,2,0,none,_ +14,15,5,2024,2,0,none,_ +14,15,5,2024,2,0,none,_ +14,15,5,2024,1,14,Carpintero,Maths +14,15,5,2024,1,15,Boully,Maths +14,15,5,2024,1,0,none,_ +15,15,5,2024,1,4,Le_Gouriellec,Anglais +15,15,5,2024,1,6,Carpintero,Maths +15,15,5,2024,1,2,Boully,Maths +16,15,5,2024,1,12,Mann,Anglais +17,15,5,2024,1,1,Poupy,Physique +17,15,5,2024,1,14,Mann,Anglais +18,15,5,2024,1,3,Poupy,Physique +18,16,5,2024,1,5,De_Roux,Physique +18,16,5,2024,1,9,Mullaert,Maths +18,16,5,2024,1,8,Rapin,Maths +16,17,5,2024,1,7,Chibani,Physique +17,17,5,2024,1,3,Oubaha,Maths +18,17,5,2024,1,12,Oubaha,Maths +12,20,5,2024,1,0,none,_ +12,20,5,2024,2,0,none,_ +13,20,5,2024,2,0,none,_ +14,21,5,2024,1,1,Belagoune,Anglais +14,21,5,2024,1,8,Chevalier,Physique +14,21,5,2024,1,13,Mullaert,Maths +17,21,5,2024,1,3,Belagoune,Anglais +17,21,5,2024,1,7,Herbaut,Anglais +17,21,5,2024,1,10,Colin,Physique +17,21,5,2024,1,12,Chevalier,Physique +18,21,5,2024,1,3,Rapin,Maths +18,21,5,2024,1,5,Belagoune,Anglais +14,22,5,2024,2,0,none,_ +14,22,5,2024,2,0,none,_ +14,22,5,2024,2,0,none,_ +14,22,5,2024,1,9,Carpintero,Maths +14,22,5,2024,1,11,Le_Gouriellec,Anglais +14,22,5,2024,1,6,Boully,Maths +15,22,5,2024,1,9,Le_Gouriellec,Anglais +15,22,5,2024,1,1,Boully,Maths +15,22,5,2024,1,15,Carpintero,Maths +16,22,5,2024,1,13,Mann,Anglais +17,22,5,2024,1,2,Poupy,Physique +17,22,5,2024,1,15,Mann,Anglais +18,22,5,2024,1,4,Poupy,Physique +18,23,5,2024,1,6,De_Roux,Physique +18,23,5,2024,1,10,Rapin,Maths +18,23,5,2024,1,12,Mullaert,Maths +16,24,5,2024,1,14,Chibani,Physique +17,24,5,2024,1,4,Oubaha,Maths +18,24,5,2024,1,7,Oubaha,Maths +12,27,5,2024,1,11,Chevalier,Physique +12,27,5,2024,2,0,none,_ +13,27,5,2024,2,0,none,_ +14,28,5,2024,1,4,Belagoune,Anglais +14,28,5,2024,1,1,Mullaert,Maths +14,28,5,2024,1,5,Chevalier,Physique +17,28,5,2024,1,6,Herbaut,Anglais +17,28,5,2024,1,8,Belagoune,Anglais +17,28,5,2024,1,13,Chevalier,Physique +17,28,5,2024,1,15,Colin,Physique +18,28,5,2024,1,2,Rapin,Maths +18,28,5,2024,1,10,Belagoune,Anglais +14,29,5,2024,2,0,none,_ +14,29,5,2024,2,0,none,_ +14,29,5,2024,2,0,none,_ +14,29,5,2024,1,2,Le_Gouriellec,Anglais +14,29,5,2024,1,8,Carpintero,Maths +14,29,5,2024,1,4,Boully,Maths +15,29,5,2024,1,10,Boully,Maths +15,29,5,2024,1,5,Carpintero,Maths +15,29,5,2024,1,12,Le_Gouriellec,Anglais +16,29,5,2024,1,14,Mann,Anglais +17,29,5,2024,1,1,Poupy,Physique +17,29,5,2024,1,0,none,_ +18,29,5,2024,1,3,Poupy,Physique +18,30,5,2024,1,7,De_Roux,Physique +18,30,5,2024,1,11,Rapin,Maths +18,30,5,2024,1,13,Mullaert,Maths +16,31,5,2024,1,9,Chibani,Physique +17,31,5,2024,1,14,Oubaha,Maths +18,31,5,2024,1,7,Oubaha,Maths +12,3,6,2024,1,14,Chevalier,Physique +12,3,6,2024,2,0,none,_ +13,3,6,2024,2,0,none,_ +14,4,6,2024,1,7,Belagoune,Anglais +14,4,6,2024,1,2,Chevalier,Physique +14,4,6,2024,1,6,Mullaert,Maths +17,4,6,2024,1,9,Belagoune,Anglais +17,4,6,2024,1,0,none,_ +17,4,6,2024,1,12,Chevalier,Physique +17,4,6,2024,1,1,Herbaut,Anglais +18,4,6,2024,1,8,Rapin,Maths +18,4,6,2024,1,13,Belagoune,Anglais +14,5,6,2024,2,0,none,_ +14,5,6,2024,2,0,none,_ +14,5,6,2024,2,0,none,_ +14,5,6,2024,1,2,Carpintero,Maths +14,5,6,2024,1,3,Le_Gouriellec,Anglais +14,5,6,2024,1,3,Boully,Maths +15,5,6,2024,1,5,Le_Gouriellec,Anglais +15,5,6,2024,1,9,Carpintero,Maths +15,5,6,2024,1,12,Boully,Maths +16,5,6,2024,1,11,Mann,Anglais +17,5,6,2024,1,4,Poupy,Physique +17,5,6,2024,1,15,Mann,Anglais +18,5,6,2024,1,6,Poupy,Physique +18,6,6,2024,1,5,Mullaert,Maths +18,6,6,2024,1,8,De_Roux,Physique +18,6,6,2024,1,14,Rapin,Maths +16,7,6,2024,1,10,Chibani,Physique +17,7,6,2024,1,15,Oubaha,Maths +18,7,6,2024,1,11,Oubaha,Maths