mp2i-vms.fr
Compare commits
3 Commits
761c9a7ea0
...
5e2824c2b9
| Author | SHA1 | Date |
|---|---|---|
 Alexandre
|
5e2824c2b9 | |
|
Alexandre
|
2167439864 | |
|
Alexandre
|
614a1bd31a |
4
Makefile
4
Makefile
|
|
@ -6,10 +6,10 @@ LFLAGS=
|
|||
all: bin/colloscope
|
||||
|
||||
test: bin/colloscope
|
||||
bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 2500 output-S3.csv 3 6
|
||||
bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 2500 output-S3.csv 3 6 S3-tds.txt
|
||||
|
||||
mem: bin/
|
||||
valgrind --leak-check=full ./bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 100 output-S3.csv 3 6
|
||||
valgrind --leak-check=full ./bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 100 output-S3.csv 3 6 "S3-tds.txt"
|
||||
|
||||
OBJECTS = obj/structure.o obj/algorithm.o obj/display.o obj/logger.o obj/main.o
|
||||
bin/colloscope: $(OBJECTS)
|
||||
|
|
|
|||
11
S3-tds.txt
11
S3-tds.txt
|
|
@ -22,4 +22,15 @@ A
|
|||
2
|
||||
3
|
||||
+
|
||||
16 26 4 2024
|
||||
T
|
||||
1
|
||||
3
|
||||
5
|
||||
7
|
||||
9
|
||||
11
|
||||
13
|
||||
15
|
||||
+
|
||||
$
|
||||
344
output-S3.csv
344
output-S3.csv
|
|
@ -1,218 +1,218 @@
|
|||
hour,day,month,year,length,group,colleur,matiere
|
||||
12,22,4,2024,1,8,Chevalier,Physique
|
||||
12,22,4,2024,2,6,Jospin,Info
|
||||
13,22,4,2024,2,12,Jospin,Info
|
||||
14,23,4,2024,1,5,Belagoune,Anglais
|
||||
14,23,4,2024,1,14,Mullaert,Maths
|
||||
14,23,4,2024,1,0,none,_
|
||||
17,23,4,2024,1,4,Chevalier,Physique
|
||||
17,23,4,2024,1,13,Belagoune,Anglais
|
||||
17,23,4,2024,1,2,Colin,Physique
|
||||
17,23,4,2024,1,9,Herbaut,Anglais
|
||||
18,23,4,2024,1,8,Rapin,Maths
|
||||
18,23,4,2024,1,11,Belagoune,Anglais
|
||||
12,22,4,2024,1,12,Chevalier,Physique
|
||||
12,22,4,2024,2,0,none,_
|
||||
13,22,4,2024,2,0,none,_
|
||||
14,23,4,2024,1,2,Chevalier,Physique
|
||||
14,23,4,2024,1,3,Belagoune,Anglais
|
||||
14,23,4,2024,1,11,Mullaert,Maths
|
||||
17,23,4,2024,1,4,Colin,Physique
|
||||
17,23,4,2024,1,5,Herbaut,Anglais
|
||||
17,23,4,2024,1,6,Chevalier,Physique
|
||||
17,23,4,2024,1,9,Belagoune,Anglais
|
||||
18,23,4,2024,1,7,Belagoune,Anglais
|
||||
18,23,4,2024,1,12,Rapin,Maths
|
||||
14,24,4,2024,2,12,Rouvroy,Info
|
||||
14,24,4,2024,2,6,Rouvroy,Info
|
||||
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,15,Le_Gouriellec,Anglais
|
||||
14,24,4,2024,1,6,Boully,Maths
|
||||
14,24,4,2024,1,15,Carpintero,Maths
|
||||
15,24,4,2024,1,12,Carpintero,Maths
|
||||
15,24,4,2024,1,7,Le_Gouriellec,Anglais
|
||||
15,24,4,2024,1,11,Boully,Maths
|
||||
16,24,4,2024,1,3,Mann,Anglais
|
||||
14,24,4,2024,1,1,Le_Gouriellec,Anglais
|
||||
14,24,4,2024,1,6,Carpintero,Maths
|
||||
14,24,4,2024,1,9,Boully,Maths
|
||||
15,24,4,2024,1,2,Carpintero,Maths
|
||||
15,24,4,2024,1,11,Le_Gouriellec,Anglais
|
||||
15,24,4,2024,1,15,Boully,Maths
|
||||
16,24,4,2024,1,13,Mann,Anglais
|
||||
17,24,4,2024,1,14,Poupy,Physique
|
||||
17,24,4,2024,1,1,Mann,Anglais
|
||||
18,24,4,2024,1,12,Poupy,Physique
|
||||
18,25,4,2024,1,5,Mullaert,Maths
|
||||
18,25,4,2024,1,3,Rapin,Maths
|
||||
18,25,4,2024,1,10,De_Roux,Physique
|
||||
16,26,4,2024,1,6,Chibani,Physique
|
||||
17,26,4,2024,1,2,Oubaha,Maths
|
||||
18,26,4,2024,1,9,Oubaha,Maths
|
||||
12,29,4,2024,1,15,Chevalier,Physique
|
||||
17,24,4,2024,1,15,Mann,Anglais
|
||||
18,24,4,2024,1,10,Poupy,Physique
|
||||
18,25,4,2024,1,3,Mullaert,Maths
|
||||
18,25,4,2024,1,14,Rapin,Maths
|
||||
18,25,4,2024,1,8,De_Roux,Physique
|
||||
16,26,4,2024,1,0,none,_
|
||||
17,26,4,2024,1,5,Oubaha,Maths
|
||||
18,26,4,2024,1,8,Oubaha,Maths
|
||||
12,29,4,2024,1,11,Chevalier,Physique
|
||||
12,29,4,2024,2,5,Jospin,Info
|
||||
13,29,4,2024,2,0,none,_
|
||||
14,30,4,2024,1,4,Mullaert,Maths
|
||||
14,30,4,2024,1,8,Belagoune,Anglais
|
||||
14,30,4,2024,1,7,Chevalier,Physique
|
||||
17,30,4,2024,1,4,Herbaut,Anglais
|
||||
17,30,4,2024,1,14,Belagoune,Anglais
|
||||
17,30,4,2024,1,1,Chevalier,Physique
|
||||
13,29,4,2024,2,11,Jospin,Info
|
||||
14,30,4,2024,1,1,Mullaert,Maths
|
||||
14,30,4,2024,1,6,Belagoune,Anglais
|
||||
14,30,4,2024,1,5,Chevalier,Physique
|
||||
17,30,4,2024,1,10,Herbaut,Anglais
|
||||
17,30,4,2024,1,3,Colin,Physique
|
||||
18,30,4,2024,1,1,Rapin,Maths
|
||||
18,30,4,2024,1,0,none,_
|
||||
14,1,5,2024,2,11,Rouvroy,Info
|
||||
17,30,4,2024,1,14,Belagoune,Anglais
|
||||
17,30,4,2024,1,15,Chevalier,Physique
|
||||
18,30,4,2024,1,13,Rapin,Maths
|
||||
18,30,4,2024,1,8,Belagoune,Anglais
|
||||
14,1,5,2024,2,0,none,_
|
||||
14,1,5,2024,2,0,none,_
|
||||
14,1,5,2024,1,13,Boully,Maths
|
||||
14,1,5,2024,1,6,Le_Gouriellec,Anglais
|
||||
14,1,5,2024,1,10,Carpintero,Maths
|
||||
15,1,5,2024,1,2,Le_Gouriellec,Anglais
|
||||
15,1,5,2024,1,12,Boully,Maths
|
||||
14,1,5,2024,2,0,none,_
|
||||
14,1,5,2024,1,3,Boully,Maths
|
||||
14,1,5,2024,1,2,Le_Gouriellec,Anglais
|
||||
14,1,5,2024,1,15,Carpintero,Maths
|
||||
15,1,5,2024,1,7,Carpintero,Maths
|
||||
16,1,5,2024,1,12,Mann,Anglais
|
||||
17,1,5,2024,1,9,Poupy,Physique
|
||||
17,1,5,2024,1,10,Mann,Anglais
|
||||
18,1,5,2024,1,11,Poupy,Physique
|
||||
18,2,5,2024,1,15,Mullaert,Maths
|
||||
18,2,5,2024,1,9,Rapin,Maths
|
||||
18,2,5,2024,1,13,De_Roux,Physique
|
||||
16,3,5,2024,1,5,Chibani,Physique
|
||||
17,3,5,2024,1,6,Oubaha,Maths
|
||||
18,3,5,2024,1,3,Oubaha,Maths
|
||||
12,6,5,2024,1,14,Chevalier,Physique
|
||||
15,1,5,2024,1,12,Le_Gouriellec,Anglais
|
||||
15,1,5,2024,1,12,Boully,Maths
|
||||
16,1,5,2024,1,0,none,_
|
||||
17,1,5,2024,1,1,Poupy,Physique
|
||||
17,1,5,2024,1,4,Mann,Anglais
|
||||
18,1,5,2024,1,13,Poupy,Physique
|
||||
18,2,5,2024,1,6,Rapin,Maths
|
||||
18,2,5,2024,1,7,De_Roux,Physique
|
||||
18,2,5,2024,1,9,Mullaert,Maths
|
||||
16,3,5,2024,1,9,Chibani,Physique
|
||||
17,3,5,2024,1,10,Oubaha,Maths
|
||||
18,3,5,2024,1,4,Oubaha,Maths
|
||||
12,6,5,2024,1,0,none,_
|
||||
12,6,5,2024,2,4,Jospin,Info
|
||||
13,6,5,2024,2,10,Jospin,Info
|
||||
14,7,5,2024,1,4,Chevalier,Physique
|
||||
13,6,5,2024,2,0,none,_
|
||||
14,7,5,2024,1,8,Mullaert,Maths
|
||||
14,7,5,2024,1,3,Belagoune,Anglais
|
||||
14,7,5,2024,1,13,Mullaert,Maths
|
||||
17,7,5,2024,1,5,Herbaut,Anglais
|
||||
17,7,5,2024,1,15,Belagoune,Anglais
|
||||
17,7,5,2024,1,12,Colin,Physique
|
||||
17,7,5,2024,1,0,none,_
|
||||
18,7,5,2024,1,9,Belagoune,Anglais
|
||||
18,7,5,2024,1,7,Rapin,Maths
|
||||
14,7,5,2024,1,4,Chevalier,Physique
|
||||
17,7,5,2024,1,13,Herbaut,Anglais
|
||||
17,7,5,2024,1,10,Colin,Physique
|
||||
17,7,5,2024,1,1,Belagoune,Anglais
|
||||
17,7,5,2024,1,2,Chevalier,Physique
|
||||
18,7,5,2024,1,4,Rapin,Maths
|
||||
18,7,5,2024,1,15,Belagoune,Anglais
|
||||
14,8,5,2024,2,0,none,_
|
||||
14,8,5,2024,2,10,Rouvroy,Info
|
||||
14,8,5,2024,2,0,none,_
|
||||
14,8,5,2024,2,0,none,_
|
||||
14,8,5,2024,1,1,Le_Gouriellec,Anglais
|
||||
14,8,5,2024,1,11,Carpintero,Maths
|
||||
14,8,5,2024,1,14,Boully,Maths
|
||||
15,8,5,2024,1,8,Carpintero,Maths
|
||||
15,8,5,2024,1,10,Boully,Maths
|
||||
15,8,5,2024,1,11,Le_Gouriellec,Anglais
|
||||
16,8,5,2024,1,13,Mann,Anglais
|
||||
17,8,5,2024,1,2,Poupy,Physique
|
||||
14,8,5,2024,1,1,Boully,Maths
|
||||
14,8,5,2024,1,10,Carpintero,Maths
|
||||
14,8,5,2024,1,11,Le_Gouriellec,Anglais
|
||||
15,8,5,2024,1,5,Le_Gouriellec,Anglais
|
||||
15,8,5,2024,1,14,Carpintero,Maths
|
||||
15,8,5,2024,1,13,Boully,Maths
|
||||
16,8,5,2024,1,9,Mann,Anglais
|
||||
17,8,5,2024,1,7,Mann,Anglais
|
||||
18,8,5,2024,1,6,Poupy,Physique
|
||||
17,8,5,2024,1,8,Poupy,Physique
|
||||
18,8,5,2024,1,12,Poupy,Physique
|
||||
18,9,5,2024,1,5,Mullaert,Maths
|
||||
18,9,5,2024,1,2,Rapin,Maths
|
||||
18,9,5,2024,1,8,De_Roux,Physique
|
||||
18,9,5,2024,1,1,Mullaert,Maths
|
||||
16,10,5,2024,1,10,Chibani,Physique
|
||||
17,10,5,2024,1,4,Oubaha,Maths
|
||||
18,10,5,2024,1,5,Oubaha,Maths
|
||||
12,13,5,2024,1,15,Chevalier,Physique
|
||||
12,13,5,2024,2,9,Jospin,Info
|
||||
13,13,5,2024,2,15,Jospin,Info
|
||||
14,14,5,2024,1,4,Belagoune,Anglais
|
||||
14,14,5,2024,1,2,Mullaert,Maths
|
||||
14,14,5,2024,1,9,Chevalier,Physique
|
||||
17,14,5,2024,1,6,Belagoune,Anglais
|
||||
17,14,5,2024,1,2,Herbaut,Anglais
|
||||
17,14,5,2024,1,13,Chevalier,Physique
|
||||
17,14,5,2024,1,7,Colin,Physique
|
||||
18,14,5,2024,1,6,Rapin,Maths
|
||||
18,9,5,2024,1,14,De_Roux,Physique
|
||||
16,10,5,2024,1,6,Chibani,Physique
|
||||
17,10,5,2024,1,7,Oubaha,Maths
|
||||
18,10,5,2024,1,11,Oubaha,Maths
|
||||
12,13,5,2024,1,1,Chevalier,Physique
|
||||
12,13,5,2024,2,15,Jospin,Info
|
||||
13,13,5,2024,2,0,none,_
|
||||
14,14,5,2024,1,6,Mullaert,Maths
|
||||
14,14,5,2024,1,7,Chevalier,Physique
|
||||
14,14,5,2024,1,10,Belagoune,Anglais
|
||||
17,14,5,2024,1,13,Colin,Physique
|
||||
17,14,5,2024,1,2,Belagoune,Anglais
|
||||
17,14,5,2024,1,6,Herbaut,Anglais
|
||||
17,14,5,2024,1,15,Chevalier,Physique
|
||||
18,14,5,2024,1,9,Rapin,Maths
|
||||
18,14,5,2024,1,12,Belagoune,Anglais
|
||||
14,15,5,2024,2,0,none,_
|
||||
14,15,5,2024,2,9,Rouvroy,Info
|
||||
14,15,5,2024,2,0,none,_
|
||||
14,15,5,2024,2,0,none,_
|
||||
14,15,5,2024,1,3,Carpintero,Maths
|
||||
14,15,5,2024,1,8,Le_Gouriellec,Anglais
|
||||
14,15,5,2024,1,4,Le_Gouriellec,Anglais
|
||||
14,15,5,2024,1,5,Boully,Maths
|
||||
15,15,5,2024,1,8,Boully,Maths
|
||||
15,15,5,2024,1,9,Carpintero,Maths
|
||||
15,15,5,2024,1,10,Le_Gouriellec,Anglais
|
||||
15,15,5,2024,1,11,Carpintero,Maths
|
||||
15,15,5,2024,1,8,Le_Gouriellec,Anglais
|
||||
15,15,5,2024,1,14,Boully,Maths
|
||||
16,15,5,2024,1,14,Mann,Anglais
|
||||
17,15,5,2024,1,1,Poupy,Physique
|
||||
17,15,5,2024,1,5,Poupy,Physique
|
||||
17,15,5,2024,1,0,none,_
|
||||
18,15,5,2024,1,3,Poupy,Physique
|
||||
18,16,5,2024,1,5,De_Roux,Physique
|
||||
18,16,5,2024,1,11,Mullaert,Maths
|
||||
18,16,5,2024,1,12,Rapin,Maths
|
||||
18,16,5,2024,1,9,De_Roux,Physique
|
||||
18,16,5,2024,1,8,Rapin,Maths
|
||||
18,16,5,2024,1,12,Mullaert,Maths
|
||||
16,17,5,2024,1,11,Chibani,Physique
|
||||
17,17,5,2024,1,14,Oubaha,Maths
|
||||
17,17,5,2024,1,2,Oubaha,Maths
|
||||
18,17,5,2024,1,15,Oubaha,Maths
|
||||
12,20,5,2024,1,10,Chevalier,Physique
|
||||
12,20,5,2024,1,8,Chevalier,Physique
|
||||
12,20,5,2024,2,8,Jospin,Info
|
||||
13,20,5,2024,2,14,Jospin,Info
|
||||
14,21,5,2024,1,1,Belagoune,Anglais
|
||||
14,21,5,2024,1,6,Mullaert,Maths
|
||||
14,21,5,2024,1,12,Chevalier,Physique
|
||||
17,21,5,2024,1,7,Belagoune,Anglais
|
||||
17,21,5,2024,1,15,Herbaut,Anglais
|
||||
17,21,5,2024,1,14,Chevalier,Physique
|
||||
14,21,5,2024,1,14,Chevalier,Physique
|
||||
14,21,5,2024,1,15,Mullaert,Maths
|
||||
17,21,5,2024,1,3,Herbaut,Anglais
|
||||
17,21,5,2024,1,0,none,_
|
||||
18,21,5,2024,1,4,Rapin,Maths
|
||||
18,21,5,2024,1,11,Belagoune,Anglais
|
||||
17,21,5,2024,1,5,Belagoune,Anglais
|
||||
17,21,5,2024,1,10,Chevalier,Physique
|
||||
18,21,5,2024,1,1,Rapin,Maths
|
||||
18,21,5,2024,1,13,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,1,Boully,Maths
|
||||
14,22,5,2024,1,7,Carpintero,Maths
|
||||
14,22,5,2024,1,13,Le_Gouriellec,Anglais
|
||||
15,22,5,2024,1,3,Boully,Maths
|
||||
15,22,5,2024,1,3,Le_Gouriellec,Anglais
|
||||
15,22,5,2024,1,9,Carpintero,Maths
|
||||
16,22,5,2024,1,5,Mann,Anglais
|
||||
17,22,5,2024,1,4,Poupy,Physique
|
||||
17,22,5,2024,1,9,Mann,Anglais
|
||||
18,22,5,2024,1,8,Poupy,Physique
|
||||
18,23,5,2024,1,2,De_Roux,Physique
|
||||
18,23,5,2024,1,15,Rapin,Maths
|
||||
14,22,5,2024,1,13,Carpintero,Maths
|
||||
14,22,5,2024,1,6,Boully,Maths
|
||||
14,22,5,2024,1,7,Le_Gouriellec,Anglais
|
||||
15,22,5,2024,1,7,Boully,Maths
|
||||
15,22,5,2024,1,9,Le_Gouriellec,Anglais
|
||||
15,22,5,2024,1,4,Carpintero,Maths
|
||||
16,22,5,2024,1,11,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,10,Rapin,Maths
|
||||
18,23,5,2024,1,12,Mullaert,Maths
|
||||
16,24,5,2024,1,6,Chibani,Physique
|
||||
17,24,5,2024,1,13,Oubaha,Maths
|
||||
18,24,5,2024,1,10,Oubaha,Maths
|
||||
18,23,5,2024,1,6,De_Roux,Physique
|
||||
16,24,5,2024,1,12,Chibani,Physique
|
||||
17,24,5,2024,1,3,Oubaha,Maths
|
||||
18,24,5,2024,1,9,Oubaha,Maths
|
||||
12,27,5,2024,1,1,Chevalier,Physique
|
||||
12,27,5,2024,2,7,Jospin,Info
|
||||
13,27,5,2024,2,13,Jospin,Info
|
||||
14,28,5,2024,1,10,Belagoune,Anglais
|
||||
14,28,5,2024,1,7,Mullaert,Maths
|
||||
14,28,5,2024,1,5,Chevalier,Physique
|
||||
17,28,5,2024,1,14,Herbaut,Anglais
|
||||
17,28,5,2024,1,2,Belagoune,Anglais
|
||||
17,28,5,2024,1,11,Colin,Physique
|
||||
17,28,5,2024,1,3,Chevalier,Physique
|
||||
18,28,5,2024,1,10,Rapin,Maths
|
||||
18,28,5,2024,1,0,none,_
|
||||
14,28,5,2024,1,2,Belagoune,Anglais
|
||||
14,28,5,2024,1,3,Chevalier,Physique
|
||||
14,28,5,2024,1,4,Mullaert,Maths
|
||||
17,28,5,2024,1,12,Herbaut,Anglais
|
||||
17,28,5,2024,1,9,Colin,Physique
|
||||
17,28,5,2024,1,13,Chevalier,Physique
|
||||
17,28,5,2024,1,4,Belagoune,Anglais
|
||||
18,28,5,2024,1,7,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,Boully,Maths
|
||||
14,29,5,2024,1,4,Le_Gouriellec,Anglais
|
||||
14,29,5,2024,1,5,Carpintero,Maths
|
||||
15,29,5,2024,1,1,Carpintero,Maths
|
||||
15,29,5,2024,1,12,Le_Gouriellec,Anglais
|
||||
15,29,5,2024,1,4,Boully,Maths
|
||||
16,29,5,2024,1,8,Mann,Anglais
|
||||
14,29,5,2024,1,1,Carpintero,Maths
|
||||
14,29,5,2024,1,6,Le_Gouriellec,Anglais
|
||||
15,29,5,2024,1,5,Boully,Maths
|
||||
15,29,5,2024,1,8,Carpintero,Maths
|
||||
15,29,5,2024,1,14,Le_Gouriellec,Anglais
|
||||
16,29,5,2024,1,0,none,_
|
||||
17,29,5,2024,1,7,Poupy,Physique
|
||||
17,29,5,2024,1,6,Mann,Anglais
|
||||
18,29,5,2024,1,13,Poupy,Physique
|
||||
18,30,5,2024,1,14,Rapin,Maths
|
||||
18,30,5,2024,1,8,Mullaert,Maths
|
||||
18,30,5,2024,1,15,De_Roux,Physique
|
||||
16,31,5,2024,1,9,Chibani,Physique
|
||||
17,31,5,2024,1,11,Oubaha,Maths
|
||||
18,31,5,2024,1,13,Oubaha,Maths
|
||||
12,3,6,2024,1,0,none,_
|
||||
12,3,6,2024,2,12,Jospin,Info
|
||||
13,3,6,2024,2,0,none,_
|
||||
17,29,5,2024,1,8,Mann,Anglais
|
||||
18,29,5,2024,1,11,Poupy,Physique
|
||||
18,30,5,2024,1,10,Mullaert,Maths
|
||||
18,30,5,2024,1,5,De_Roux,Physique
|
||||
18,30,5,2024,1,11,Rapin,Maths
|
||||
16,31,5,2024,1,15,Chibani,Physique
|
||||
17,31,5,2024,1,13,Oubaha,Maths
|
||||
18,31,5,2024,1,14,Oubaha,Maths
|
||||
12,3,6,2024,1,14,Chevalier,Physique
|
||||
12,3,6,2024,2,6,Jospin,Info
|
||||
13,3,6,2024,2,12,Jospin,Info
|
||||
14,4,6,2024,1,2,Mullaert,Maths
|
||||
14,4,6,2024,1,1,Belagoune,Anglais
|
||||
14,4,6,2024,1,6,Chevalier,Physique
|
||||
17,4,6,2024,1,3,Herbaut,Anglais
|
||||
14,4,6,2024,1,5,Belagoune,Anglais
|
||||
14,4,6,2024,1,8,Chevalier,Physique
|
||||
17,4,6,2024,1,9,Herbaut,Anglais
|
||||
17,4,6,2024,1,11,Belagoune,Anglais
|
||||
17,4,6,2024,1,2,Chevalier,Physique
|
||||
17,4,6,2024,1,4,Colin,Physique
|
||||
17,4,6,2024,1,0,none,_
|
||||
17,4,6,2024,1,6,Colin,Physique
|
||||
18,4,6,2024,1,5,Rapin,Maths
|
||||
18,4,6,2024,1,7,Belagoune,Anglais
|
||||
14,5,6,2024,2,0,none,_
|
||||
14,5,6,2024,2,6,Rouvroy,Info
|
||||
14,5,6,2024,2,0,none,_
|
||||
14,5,6,2024,1,5,Le_Gouriellec,Anglais
|
||||
14,5,6,2024,1,6,Carpintero,Maths
|
||||
14,5,6,2024,1,9,Boully,Maths
|
||||
15,5,6,2024,1,9,Le_Gouriellec,Anglais
|
||||
15,5,6,2024,1,14,Carpintero,Maths
|
||||
15,5,6,2024,1,15,Boully,Maths
|
||||
16,5,6,2024,1,13,Mann,Anglais
|
||||
17,5,6,2024,1,10,Poupy,Physique
|
||||
17,5,6,2024,1,15,Mann,Anglais
|
||||
18,5,6,2024,1,8,Poupy,Physique
|
||||
18,6,6,2024,1,12,De_Roux,Physique
|
||||
18,6,6,2024,1,3,Mullaert,Maths
|
||||
18,6,6,2024,1,11,Rapin,Maths
|
||||
16,7,6,2024,1,14,Chibani,Physique
|
||||
17,7,6,2024,1,8,Oubaha,Maths
|
||||
18,7,6,2024,1,12,Oubaha,Maths
|
||||
14,5,6,2024,2,0,none,_
|
||||
14,5,6,2024,1,12,Carpintero,Maths
|
||||
14,5,6,2024,1,15,Le_Gouriellec,Anglais
|
||||
14,5,6,2024,1,8,Boully,Maths
|
||||
15,5,6,2024,1,9,Carpintero,Maths
|
||||
15,5,6,2024,1,11,Boully,Maths
|
||||
15,5,6,2024,1,13,Le_Gouriellec,Anglais
|
||||
16,5,6,2024,1,3,Mann,Anglais
|
||||
17,5,6,2024,1,4,Poupy,Physique
|
||||
17,5,6,2024,1,1,Mann,Anglais
|
||||
18,5,6,2024,1,12,Poupy,Physique
|
||||
18,6,6,2024,1,3,Rapin,Maths
|
||||
18,6,6,2024,1,10,De_Roux,Physique
|
||||
18,6,6,2024,1,14,Mullaert,Maths
|
||||
16,7,6,2024,1,2,Chibani,Physique
|
||||
17,7,6,2024,1,6,Oubaha,Maths
|
||||
18,7,6,2024,1,15,Oubaha,Maths
|
||||
|
|
|
|||
|
|
|
@ -51,11 +51,11 @@ int main(int argc, char **argv) {
|
|||
print_help();
|
||||
exit(0);
|
||||
}
|
||||
else if (argc==11 && argv[1][0]!='-')
|
||||
else if (argc==12 && argv[1][0]!='-')
|
||||
{
|
||||
offset=0;
|
||||
}
|
||||
else if (argc==12 && argv[1][0]=='-')
|
||||
else if (argc==13 && argv[1][0]=='-')
|
||||
{
|
||||
offset=1;
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ int main(int argc, char **argv) {
|
|||
}
|
||||
}
|
||||
else {
|
||||
fprintf(stderr, "Usage: %s [-qvh] <creneaux> <n_creneaux> <colleurs> <n_colleurs> <n_weeks> <n_groups> <n_iters> <output> <math_rest> <info_occ>\n", argv[0]);
|
||||
fprintf(stderr, "Usage: %s [-qvh] <creneaux> <n_creneaux> <colleurs> <n_colleurs> <n_weeks> <n_groups> <n_iters> <output> <math_rest> <info_occ> <blacklist>\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -93,6 +93,7 @@ int main(int argc, char **argv) {
|
|||
char* path_output = argv[8+offset];
|
||||
int math_i = str_to_int(argv[9+offset]);
|
||||
int info_i = str_to_int(argv[10+offset]);
|
||||
char* blacklist_path = argv[11+offset];
|
||||
|
||||
if (quiet) {
|
||||
create_logger("colloscope.log", LOG_WARN);
|
||||
|
|
@ -114,7 +115,7 @@ int main(int argc, char **argv) {
|
|||
//colleur* dudes = import_colleurs("some_data.txt", 13, len_creneau);
|
||||
colleur* dudes = import_colleurs_oneweek(path_colleurs, n_colleurs, n_weeks, n_creneaux);
|
||||
|
||||
import_tds(edt, len_edt, n_creneaux, "S3-tds.txt");
|
||||
import_tds(edt, len_edt, n_creneaux, blacklist_path);
|
||||
|
||||
debug("Entries are : ");
|
||||
debug("Creneaux filename : %s", path_creneaux);
|
||||
|
|
|
|||
|
|
@ -519,6 +519,8 @@ void import_tds(creneau* edt, int len_edt, int len_oneweek, char* filename) {
|
|||
int current = 0;
|
||||
int place = 0;
|
||||
|
||||
char method = 'A';
|
||||
|
||||
int buffer = 0;
|
||||
|
||||
date d;
|
||||
|
|
@ -534,19 +536,49 @@ void import_tds(creneau* edt, int len_edt, int len_oneweek, char* filename) {
|
|||
if(current == 1) {
|
||||
edtptr = locate_date(edt, len_edt, d);
|
||||
} else {
|
||||
int k = 0;
|
||||
int os = 1;
|
||||
while(edtptr + k*len_oneweek >= 0 && edtptr + k*len_oneweek < len_edt) {
|
||||
//info("[%d, %d]", buffer, edtptr + k*len_oneweek);
|
||||
//usleep(1000000);
|
||||
if(method == 'A') {
|
||||
int k = 0;
|
||||
int os = 1;
|
||||
while(edtptr + k*len_oneweek >= 0 && edtptr + k*len_oneweek < len_edt) {
|
||||
//info("[%d, %d]", buffer, edtptr + k*len_oneweek);
|
||||
//usleep(1000000);
|
||||
edt[edtptr + k*len_oneweek].allow_grps[buffer-1] = false;
|
||||
while(equal_d(edt[edtptr + k*len_oneweek].date, edt[edtptr + k*len_oneweek + os].date)) {
|
||||
//info("[%d, %d]", buffer, edtptr + k*len_oneweek + os);
|
||||
edt[edtptr + k*len_oneweek + os].allow_grps[buffer-1] = false;
|
||||
os++;
|
||||
}
|
||||
k++;
|
||||
os = 1;
|
||||
}
|
||||
} else if(method == 'T') {
|
||||
int k = 0;
|
||||
int os = 1;
|
||||
|
||||
edt[edtptr + k*len_oneweek].allow_grps[buffer-1] = false;
|
||||
while(equal_d(edt[edtptr + k*len_oneweek].date, edt[edtptr + k*len_oneweek + os].date)) {
|
||||
//info("[%d, %d]", buffer, edtptr + k*len_oneweek + os);
|
||||
edt[edtptr + k*len_oneweek + os].allow_grps[buffer-1] = false;
|
||||
os++;
|
||||
}
|
||||
k++;
|
||||
|
||||
k = 1;
|
||||
os = 1;
|
||||
|
||||
while(edtptr + k*len_oneweek >= 0 && edtptr + k*len_oneweek < len_edt) {
|
||||
//info("[%d, %d]", buffer, edtptr + k*len_oneweek);
|
||||
//usleep(1000000);
|
||||
edt[edtptr + k*len_oneweek].allow_grps[buffer-1] = edt[edtptr + (k-1)*len_oneweek].allow_grps[buffer-1];
|
||||
while(equal_d(edt[edtptr + k*len_oneweek].date, edt[edtptr + k*len_oneweek + os].date)) {
|
||||
//info("[%d, %d]", buffer, edtptr + k*len_oneweek + os);
|
||||
edt[edtptr + k*len_oneweek + os].allow_grps[buffer-1] = edt[edtptr + (k-1)*len_oneweek + os].allow_grps[buffer-1];
|
||||
os++;
|
||||
}
|
||||
k++;
|
||||
os = 1;
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "Warning : unknown method (%c) detected in TD\n", method);
|
||||
}
|
||||
}
|
||||
current++;
|
||||
|
|
@ -561,6 +593,8 @@ void import_tds(creneau* edt, int len_edt, int len_oneweek, char* filename) {
|
|||
} else {
|
||||
d.year = buffer;
|
||||
current = 1;
|
||||
c = fgetc(ptr);
|
||||
method = c;
|
||||
}
|
||||
place++;
|
||||
buffer = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue