mp2i-vms
/
colloscope
47
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mp2i-vms:5e2824c2b9560e1c6b9bf3db9efaa6b7f86d7709
Branches Tags
mp2i-vms:main
mp2i-vms:v2-mpi
..
compare: mp2i-vms:761c9a7ea05060ff91f57aa5db0e3272cb386c39
Branches Tags
mp2i-vms:v2-mpi
mp2i-vms:main

No commits in common. "5e2824c2b9560e1c6b9bf3db9efaa6b7f86d7709" and "761c9a7ea05060ff91f57aa5db0e3272cb386c39" have entirely different histories.
5e2824c2b9 ... 761c9a7ea0

5 changed files with 184 additions and 230 deletions
Show Stats Expand all files Collapse all files

4
Makefile
View File

@ -6,10 +6,10 @@ LFLAGS=
all: bin/colloscope all: bin/colloscope
test: bin/colloscope test: bin/colloscope
bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 2500 output-S3.csv 3 6 S3-tds.txt bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 2500 output-S3.csv 3 6
mem: bin/ 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 "S3-tds.txt" valgrind --leak-check=full ./bin/colloscope -v S3-creneaux.txt 31 S3-colleurs.txt 16 7 15 100 output-S3.csv 3 6
OBJECTS = obj/structure.o obj/algorithm.o obj/display.o obj/logger.o obj/main.o OBJECTS = obj/structure.o obj/algorithm.o obj/display.o obj/logger.o obj/main.o
bin/colloscope: $(OBJECTS) bin/colloscope: $(OBJECTS)

11
S3-tds.txt
View File

@ -22,15 +22,4 @@ A
2 2
3 3
+ +
16 26 4 2024
T
1
3
5
7
9
11
13
15
+
$ $

344
output-S3.csv
View File

@ -1,218 +1,218 @@
hour,day,month,year,length,group,colleur,matiere hour,day,month,year,length,group,colleur,matiere
12,22,4,2024,1,12,Chevalier,Physique 12,22,4,2024,1,8,Chevalier,Physique
12,22,4,2024,2,0,none,_ 12,22,4,2024,2,6,Jospin,Info
13,22,4,2024,2,0,none,_ 13,22,4,2024,2,12,Jospin,Info
14,23,4,2024,1,2,Chevalier,Physique 14,23,4,2024,1,5,Belagoune,Anglais
14,23,4,2024,1,3,Belagoune,Anglais 14,23,4,2024,1,14,Mullaert,Maths
14,23,4,2024,1,11,Mullaert,Maths 14,23,4,2024,1,0,none,_
17,23,4,2024,1,4,Colin,Physique 17,23,4,2024,1,4,Chevalier,Physique
17,23,4,2024,1,5,Herbaut,Anglais 17,23,4,2024,1,13,Belagoune,Anglais
17,23,4,2024,1,6,Chevalier,Physique 17,23,4,2024,1,2,Colin,Physique
17,23,4,2024,1,9,Belagoune,Anglais 17,23,4,2024,1,9,Herbaut,Anglais
18,23,4,2024,1,7,Belagoune,Anglais 18,23,4,2024,1,8,Rapin,Maths
18,23,4,2024,1,12,Rapin,Maths 18,23,4,2024,1,11,Belagoune,Anglais
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,1,1,Le_Gouriellec,Anglais 14,24,4,2024,2,0,none,_
14,24,4,2024,1,6,Carpintero,Maths 14,24,4,2024,2,0,none,_
14,24,4,2024,1,9,Boully,Maths 14,24,4,2024,1,15,Le_Gouriellec,Anglais
15,24,4,2024,1,2,Carpintero,Maths 14,24,4,2024,1,6,Boully,Maths
15,24,4,2024,1,11,Le_Gouriellec,Anglais 14,24,4,2024,1,15,Carpintero,Maths
15,24,4,2024,1,15,Boully,Maths 15,24,4,2024,1,12,Carpintero,Maths
16,24,4,2024,1,13,Mann,Anglais 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
17,24,4,2024,1,14,Poupy,Physique 17,24,4,2024,1,14,Poupy,Physique
17,24,4,2024,1,15,Mann,Anglais 17,24,4,2024,1,1,Mann,Anglais
18,24,4,2024,1,10,Poupy,Physique 18,24,4,2024,1,12,Poupy,Physique
18,25,4,2024,1,3,Mullaert,Maths 18,25,4,2024,1,5,Mullaert,Maths
18,25,4,2024,1,14,Rapin,Maths 18,25,4,2024,1,3,Rapin,Maths
18,25,4,2024,1,8,De_Roux,Physique 18,25,4,2024,1,10,De_Roux,Physique
16,26,4,2024,1,0,none,_ 16,26,4,2024,1,6,Chibani,Physique
17,26,4,2024,1,5,Oubaha,Maths 17,26,4,2024,1,2,Oubaha,Maths
18,26,4,2024,1,8,Oubaha,Maths 18,26,4,2024,1,9,Oubaha,Maths
12,29,4,2024,1,11,Chevalier,Physique 12,29,4,2024,1,15,Chevalier,Physique
12,29,4,2024,2,5,Jospin,Info 12,29,4,2024,2,5,Jospin,Info
13,29,4,2024,2,11,Jospin,Info 13,29,4,2024,2,0,none,_
14,30,4,2024,1,1,Mullaert,Maths 14,30,4,2024,1,4,Mullaert,Maths
14,30,4,2024,1,6,Belagoune,Anglais 14,30,4,2024,1,8,Belagoune,Anglais
14,30,4,2024,1,5,Chevalier,Physique 14,30,4,2024,1,7,Chevalier,Physique
17,30,4,2024,1,10,Herbaut,Anglais 17,30,4,2024,1,4,Herbaut,Anglais
17,30,4,2024,1,3,Colin,Physique
17,30,4,2024,1,14,Belagoune,Anglais 17,30,4,2024,1,14,Belagoune,Anglais
17,30,4,2024,1,15,Chevalier,Physique 17,30,4,2024,1,1,Chevalier,Physique
18,30,4,2024,1,13,Rapin,Maths 17,30,4,2024,1,3,Colin,Physique
18,30,4,2024,1,8,Belagoune,Anglais 18,30,4,2024,1,1,Rapin,Maths
18,30,4,2024,1,0,none,_
14,1,5,2024,2,11,Rouvroy,Info
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,2,0,none,_
14,1,5,2024,2,0,none,_ 14,1,5,2024,1,13,Boully,Maths
14,1,5,2024,1,3,Boully,Maths 14,1,5,2024,1,6,Le_Gouriellec,Anglais
14,1,5,2024,1,2,Le_Gouriellec,Anglais 14,1,5,2024,1,10,Carpintero,Maths
14,1,5,2024,1,15,Carpintero,Maths 15,1,5,2024,1,2,Le_Gouriellec,Anglais
15,1,5,2024,1,7,Carpintero,Maths
15,1,5,2024,1,12,Le_Gouriellec,Anglais
15,1,5,2024,1,12,Boully,Maths 15,1,5,2024,1,12,Boully,Maths
16,1,5,2024,1,0,none,_ 15,1,5,2024,1,7,Carpintero,Maths
17,1,5,2024,1,1,Poupy,Physique 16,1,5,2024,1,12,Mann,Anglais
17,1,5,2024,1,4,Mann,Anglais 17,1,5,2024,1,9,Poupy,Physique
18,1,5,2024,1,13,Poupy,Physique 17,1,5,2024,1,10,Mann,Anglais
18,2,5,2024,1,6,Rapin,Maths 18,1,5,2024,1,11,Poupy,Physique
18,2,5,2024,1,7,De_Roux,Physique 18,2,5,2024,1,15,Mullaert,Maths
18,2,5,2024,1,9,Mullaert,Maths 18,2,5,2024,1,9,Rapin,Maths
16,3,5,2024,1,9,Chibani,Physique 18,2,5,2024,1,13,De_Roux,Physique
17,3,5,2024,1,10,Oubaha,Maths 16,3,5,2024,1,5,Chibani,Physique
18,3,5,2024,1,4,Oubaha,Maths 17,3,5,2024,1,6,Oubaha,Maths
12,6,5,2024,1,0,none,_ 18,3,5,2024,1,3,Oubaha,Maths
12,6,5,2024,1,14,Chevalier,Physique
12,6,5,2024,2,4,Jospin,Info 12,6,5,2024,2,4,Jospin,Info
13,6,5,2024,2,0,none,_ 13,6,5,2024,2,10,Jospin,Info
14,7,5,2024,1,8,Mullaert,Maths
14,7,5,2024,1,3,Belagoune,Anglais
14,7,5,2024,1,4,Chevalier,Physique 14,7,5,2024,1,4,Chevalier,Physique
17,7,5,2024,1,13,Herbaut,Anglais 14,7,5,2024,1,3,Belagoune,Anglais
17,7,5,2024,1,10,Colin,Physique 14,7,5,2024,1,13,Mullaert,Maths
17,7,5,2024,1,1,Belagoune,Anglais 17,7,5,2024,1,5,Herbaut,Anglais
17,7,5,2024,1,2,Chevalier,Physique 17,7,5,2024,1,15,Belagoune,Anglais
18,7,5,2024,1,4,Rapin,Maths 17,7,5,2024,1,12,Colin,Physique
18,7,5,2024,1,15,Belagoune,Anglais 17,7,5,2024,1,0,none,_
18,7,5,2024,1,9,Belagoune,Anglais
18,7,5,2024,1,7,Rapin,Maths
14,8,5,2024,2,0,none,_ 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,Boully,Maths 14,8,5,2024,2,0,none,_
14,8,5,2024,1,10,Carpintero,Maths 14,8,5,2024,1,1,Le_Gouriellec,Anglais
14,8,5,2024,1,11,Le_Gouriellec,Anglais 14,8,5,2024,1,11,Carpintero,Maths
15,8,5,2024,1,5,Le_Gouriellec,Anglais 14,8,5,2024,1,14,Boully,Maths
15,8,5,2024,1,14,Carpintero,Maths 15,8,5,2024,1,8,Carpintero,Maths
15,8,5,2024,1,13,Boully,Maths 15,8,5,2024,1,10,Boully,Maths
16,8,5,2024,1,9,Mann,Anglais 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
17,8,5,2024,1,7,Mann,Anglais 17,8,5,2024,1,7,Mann,Anglais
17,8,5,2024,1,8,Poupy,Physique 18,8,5,2024,1,6,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,2,Rapin,Maths
18,9,5,2024,1,14,De_Roux,Physique 18,9,5,2024,1,8,De_Roux,Physique
16,10,5,2024,1,6,Chibani,Physique 18,9,5,2024,1,1,Mullaert,Maths
17,10,5,2024,1,7,Oubaha,Maths 16,10,5,2024,1,10,Chibani,Physique
18,10,5,2024,1,11,Oubaha,Maths 17,10,5,2024,1,4,Oubaha,Maths
12,13,5,2024,1,1,Chevalier,Physique 18,10,5,2024,1,5,Oubaha,Maths
12,13,5,2024,2,15,Jospin,Info 12,13,5,2024,1,15,Chevalier,Physique
13,13,5,2024,2,0,none,_ 12,13,5,2024,2,9,Jospin,Info
14,14,5,2024,1,6,Mullaert,Maths 13,13,5,2024,2,15,Jospin,Info
14,14,5,2024,1,7,Chevalier,Physique 14,14,5,2024,1,4,Belagoune,Anglais
14,14,5,2024,1,10,Belagoune,Anglais 14,14,5,2024,1,2,Mullaert,Maths
17,14,5,2024,1,13,Colin,Physique 14,14,5,2024,1,9,Chevalier,Physique
17,14,5,2024,1,2,Belagoune,Anglais 17,14,5,2024,1,6,Belagoune,Anglais
17,14,5,2024,1,6,Herbaut,Anglais 17,14,5,2024,1,2,Herbaut,Anglais
17,14,5,2024,1,15,Chevalier,Physique 17,14,5,2024,1,13,Chevalier,Physique
18,14,5,2024,1,9,Rapin,Maths 17,14,5,2024,1,7,Colin,Physique
18,14,5,2024,1,6,Rapin,Maths
18,14,5,2024,1,12,Belagoune,Anglais 18,14,5,2024,1,12,Belagoune,Anglais
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,2,0,none,_
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,3,Carpintero,Maths
14,15,5,2024,1,4,Le_Gouriellec,Anglais 14,15,5,2024,1,8,Le_Gouriellec,Anglais
14,15,5,2024,1,5,Boully,Maths 14,15,5,2024,1,5,Boully,Maths
15,15,5,2024,1,11,Carpintero,Maths 15,15,5,2024,1,8,Boully,Maths
15,15,5,2024,1,8,Le_Gouriellec,Anglais 15,15,5,2024,1,9,Carpintero,Maths
15,15,5,2024,1,14,Boully,Maths 15,15,5,2024,1,10,Le_Gouriellec,Anglais
16,15,5,2024,1,14,Mann,Anglais 16,15,5,2024,1,14,Mann,Anglais
17,15,5,2024,1,5,Poupy,Physique 17,15,5,2024,1,1,Poupy,Physique
17,15,5,2024,1,0,none,_ 17,15,5,2024,1,0,none,_
18,15,5,2024,1,3,Poupy,Physique 18,15,5,2024,1,3,Poupy,Physique
18,16,5,2024,1,9,De_Roux,Physique 18,16,5,2024,1,5,De_Roux,Physique
18,16,5,2024,1,8,Rapin,Maths 18,16,5,2024,1,11,Mullaert,Maths
18,16,5,2024,1,12,Mullaert,Maths 18,16,5,2024,1,12,Rapin,Maths
16,17,5,2024,1,11,Chibani,Physique 16,17,5,2024,1,11,Chibani,Physique
17,17,5,2024,1,2,Oubaha,Maths 17,17,5,2024,1,14,Oubaha,Maths
18,17,5,2024,1,15,Oubaha,Maths 18,17,5,2024,1,15,Oubaha,Maths
12,20,5,2024,1,8,Chevalier,Physique 12,20,5,2024,1,10,Chevalier,Physique
12,20,5,2024,2,8,Jospin,Info 12,20,5,2024,2,8,Jospin,Info
13,20,5,2024,2,14,Jospin,Info 13,20,5,2024,2,14,Jospin,Info
14,21,5,2024,1,1,Belagoune,Anglais 14,21,5,2024,1,1,Belagoune,Anglais
14,21,5,2024,1,14,Chevalier,Physique 14,21,5,2024,1,6,Mullaert,Maths
14,21,5,2024,1,15,Mullaert,Maths 14,21,5,2024,1,12,Chevalier,Physique
17,21,5,2024,1,3,Herbaut,Anglais 17,21,5,2024,1,7,Belagoune,Anglais
17,21,5,2024,1,15,Herbaut,Anglais
17,21,5,2024,1,14,Chevalier,Physique
17,21,5,2024,1,0,none,_ 17,21,5,2024,1,0,none,_
17,21,5,2024,1,5,Belagoune,Anglais 18,21,5,2024,1,4,Rapin,Maths
17,21,5,2024,1,10,Chevalier,Physique 18,21,5,2024,1,11,Belagoune,Anglais
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,2,0,none,_
14,22,5,2024,2,0,none,_ 14,22,5,2024,2,0,none,_
14,22,5,2024,1,13,Carpintero,Maths 14,22,5,2024,1,1,Boully,Maths
14,22,5,2024,1,6,Boully,Maths 14,22,5,2024,1,7,Carpintero,Maths
14,22,5,2024,1,7,Le_Gouriellec,Anglais 14,22,5,2024,1,13,Le_Gouriellec,Anglais
15,22,5,2024,1,7,Boully,Maths 15,22,5,2024,1,3,Boully,Maths
15,22,5,2024,1,9,Le_Gouriellec,Anglais 15,22,5,2024,1,3,Le_Gouriellec,Anglais
15,22,5,2024,1,4,Carpintero,Maths 15,22,5,2024,1,9,Carpintero,Maths
16,22,5,2024,1,11,Mann,Anglais 16,22,5,2024,1,5,Mann,Anglais
17,22,5,2024,1,2,Poupy,Physique 17,22,5,2024,1,4,Poupy,Physique
17,22,5,2024,1,15,Mann,Anglais 17,22,5,2024,1,9,Mann,Anglais
18,22,5,2024,1,4,Poupy,Physique 18,22,5,2024,1,8,Poupy,Physique
18,23,5,2024,1,10,Rapin,Maths 18,23,5,2024,1,2,De_Roux,Physique
18,23,5,2024,1,15,Rapin,Maths
18,23,5,2024,1,12,Mullaert,Maths 18,23,5,2024,1,12,Mullaert,Maths
18,23,5,2024,1,6,De_Roux,Physique 16,24,5,2024,1,6,Chibani,Physique
16,24,5,2024,1,12,Chibani,Physique 17,24,5,2024,1,13,Oubaha,Maths
17,24,5,2024,1,3,Oubaha,Maths 18,24,5,2024,1,10,Oubaha,Maths
18,24,5,2024,1,9,Oubaha,Maths
12,27,5,2024,1,1,Chevalier,Physique 12,27,5,2024,1,1,Chevalier,Physique
12,27,5,2024,2,7,Jospin,Info 12,27,5,2024,2,7,Jospin,Info
13,27,5,2024,2,13,Jospin,Info 13,27,5,2024,2,13,Jospin,Info
14,28,5,2024,1,2,Belagoune,Anglais 14,28,5,2024,1,10,Belagoune,Anglais
14,28,5,2024,1,3,Chevalier,Physique 14,28,5,2024,1,7,Mullaert,Maths
14,28,5,2024,1,4,Mullaert,Maths 14,28,5,2024,1,5,Chevalier,Physique
17,28,5,2024,1,12,Herbaut,Anglais 17,28,5,2024,1,14,Herbaut,Anglais
17,28,5,2024,1,9,Colin,Physique 17,28,5,2024,1,2,Belagoune,Anglais
17,28,5,2024,1,13,Chevalier,Physique 17,28,5,2024,1,11,Colin,Physique
17,28,5,2024,1,4,Belagoune,Anglais 17,28,5,2024,1,3,Chevalier,Physique
18,28,5,2024,1,7,Rapin,Maths 18,28,5,2024,1,10,Rapin,Maths
18,28,5,2024,1,10,Belagoune,Anglais 18,28,5,2024,1,0,none,_
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,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,2,Boully,Maths
14,29,5,2024,1,1,Carpintero,Maths 14,29,5,2024,1,4,Le_Gouriellec,Anglais
14,29,5,2024,1,6,Le_Gouriellec,Anglais 14,29,5,2024,1,5,Carpintero,Maths
15,29,5,2024,1,5,Boully,Maths 15,29,5,2024,1,1,Carpintero,Maths
15,29,5,2024,1,8,Carpintero,Maths 15,29,5,2024,1,12,Le_Gouriellec,Anglais
15,29,5,2024,1,14,Le_Gouriellec,Anglais 15,29,5,2024,1,4,Boully,Maths
16,29,5,2024,1,0,none,_ 16,29,5,2024,1,8,Mann,Anglais
17,29,5,2024,1,7,Poupy,Physique 17,29,5,2024,1,7,Poupy,Physique
17,29,5,2024,1,8,Mann,Anglais 17,29,5,2024,1,6,Mann,Anglais
18,29,5,2024,1,11,Poupy,Physique 18,29,5,2024,1,13,Poupy,Physique
18,30,5,2024,1,10,Mullaert,Maths 18,30,5,2024,1,14,Rapin,Maths
18,30,5,2024,1,5,De_Roux,Physique 18,30,5,2024,1,8,Mullaert,Maths
18,30,5,2024,1,11,Rapin,Maths 18,30,5,2024,1,15,De_Roux,Physique
16,31,5,2024,1,15,Chibani,Physique 16,31,5,2024,1,9,Chibani,Physique
17,31,5,2024,1,13,Oubaha,Maths 17,31,5,2024,1,11,Oubaha,Maths
18,31,5,2024,1,14,Oubaha,Maths 18,31,5,2024,1,13,Oubaha,Maths
12,3,6,2024,1,14,Chevalier,Physique 12,3,6,2024,1,0,none,_
12,3,6,2024,2,6,Jospin,Info 12,3,6,2024,2,12,Jospin,Info
13,3,6,2024,2,12,Jospin,Info 13,3,6,2024,2,0,none,_
14,4,6,2024,1,2,Mullaert,Maths 14,4,6,2024,1,2,Mullaert,Maths
14,4,6,2024,1,5,Belagoune,Anglais 14,4,6,2024,1,1,Belagoune,Anglais
14,4,6,2024,1,8,Chevalier,Physique 14,4,6,2024,1,6,Chevalier,Physique
17,4,6,2024,1,9,Herbaut,Anglais 17,4,6,2024,1,3,Herbaut,Anglais
17,4,6,2024,1,11,Belagoune,Anglais 17,4,6,2024,1,11,Belagoune,Anglais
17,4,6,2024,1,0,none,_ 17,4,6,2024,1,2,Chevalier,Physique
17,4,6,2024,1,6,Colin,Physique 17,4,6,2024,1,4,Colin,Physique
18,4,6,2024,1,5,Rapin,Maths 18,4,6,2024,1,5,Rapin,Maths
18,4,6,2024,1,7,Belagoune,Anglais 18,4,6,2024,1,7,Belagoune,Anglais
14,5,6,2024,2,0,none,_ 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,2,0,none,_
14,5,6,2024,2,0,none,_ 14,5,6,2024,1,5,Le_Gouriellec,Anglais
14,5,6,2024,1,12,Carpintero,Maths 14,5,6,2024,1,6,Carpintero,Maths
14,5,6,2024,1,15,Le_Gouriellec,Anglais 14,5,6,2024,1,9,Boully,Maths
14,5,6,2024,1,8,Boully,Maths 15,5,6,2024,1,9,Le_Gouriellec,Anglais
15,5,6,2024,1,9,Carpintero,Maths 15,5,6,2024,1,14,Carpintero,Maths
15,5,6,2024,1,11,Boully,Maths 15,5,6,2024,1,15,Boully,Maths
15,5,6,2024,1,13,Le_Gouriellec,Anglais 16,5,6,2024,1,13,Mann,Anglais
16,5,6,2024,1,3,Mann,Anglais 17,5,6,2024,1,10,Poupy,Physique
17,5,6,2024,1,4,Poupy,Physique 17,5,6,2024,1,15,Mann,Anglais
17,5,6,2024,1,1,Mann,Anglais 18,5,6,2024,1,8,Poupy,Physique
18,5,6,2024,1,12,Poupy,Physique 18,6,6,2024,1,12,De_Roux,Physique
18,6,6,2024,1,3,Rapin,Maths 18,6,6,2024,1,3,Mullaert,Maths
18,6,6,2024,1,10,De_Roux,Physique 18,6,6,2024,1,11,Rapin,Maths
18,6,6,2024,1,14,Mullaert,Maths 16,7,6,2024,1,14,Chibani,Physique
16,7,6,2024,1,2,Chibani,Physique 17,7,6,2024,1,8,Oubaha,Maths
17,7,6,2024,1,6,Oubaha,Maths 18,7,6,2024,1,12,Oubaha,Maths
18,7,6,2024,1,15,Oubaha,Maths

1 hour day month year length group colleur matiere
2 12 22 4 2024 1 12 8 Chevalier Physique
3 12 22 4 2024 2 0 6 none Jospin _ Info
4 13 22 4 2024 2 0 12 none Jospin _ Info
5 14 23 4 2024 1 2 5 Chevalier Belagoune Physique Anglais
6 14 23 4 2024 1 3 14 Belagoune Mullaert Anglais Maths
7 14 23 4 2024 1 11 0 Mullaert none Maths _
8 17 23 4 2024 1 4 Colin Chevalier Physique
9 17 23 4 2024 1 5 13 Herbaut Belagoune Anglais
10 17 23 4 2024 1 6 2 Chevalier Colin Physique
11 17 23 4 2024 1 9 Belagoune Herbaut Anglais
12 18 23 4 2024 1 7 8 Belagoune Rapin Anglais Maths
13 18 23 4 2024 1 12 11 Rapin Belagoune Maths Anglais
14 24 4 2024 2 12 Rouvroy Info
14 24 4 2024 2 6 Rouvroy Info
14 14 24 4 2024 2 0 none _
15 14 24 4 2024 1 2 1 0 Le_Gouriellec none Anglais _
16 14 24 4 2024 1 2 6 0 Carpintero none Maths _
17 14 24 4 2024 1 9 15 Boully Le_Gouriellec Maths Anglais
18 15 14 24 4 2024 1 2 6 Carpintero Boully Maths
19 15 14 24 4 2024 1 11 15 Le_Gouriellec Carpintero Anglais Maths
20 15 24 4 2024 1 15 12 Boully Carpintero Maths
21 16 15 24 4 2024 1 13 7 Mann Le_Gouriellec Anglais
22 15 24 4 2024 1 11 Boully Maths
23 16 24 4 2024 1 3 Mann Anglais
24 17 24 4 2024 1 14 Poupy Physique
25 17 24 4 2024 1 15 1 Mann Anglais
26 18 24 4 2024 1 10 12 Poupy Physique
27 18 25 4 2024 1 3 5 Mullaert Maths
28 18 25 4 2024 1 14 3 Rapin Maths
29 18 25 4 2024 1 8 10 De_Roux Physique
30 16 26 4 2024 1 0 6 none Chibani _ Physique
31 17 26 4 2024 1 5 2 Oubaha Maths
32 18 26 4 2024 1 8 9 Oubaha Maths
33 12 29 4 2024 1 11 15 Chevalier Physique
34 12 29 4 2024 2 5 Jospin Info
35 13 29 4 2024 2 11 0 Jospin none Info _
36 14 30 4 2024 1 1 4 Mullaert Maths
37 14 30 4 2024 1 6 8 Belagoune Anglais
38 14 30 4 2024 1 5 7 Chevalier Physique
39 17 30 4 2024 1 10 4 Herbaut Anglais
17 30 4 2024 1 3 Colin Physique
40 17 30 4 2024 1 14 Belagoune Anglais
41 17 30 4 2024 1 15 1 Chevalier Physique
42 18 17 30 4 2024 1 13 3 Rapin Colin Maths Physique
43 18 30 4 2024 1 8 1 Belagoune Rapin Anglais Maths
44 18 30 4 2024 1 0 none _
45 14 1 5 2024 2 11 Rouvroy Info
46 14 1 5 2024 2 0 none _
47 14 1 5 2024 2 0 none _
48 14 1 5 2024 2 1 0 13 none Boully _ Maths
49 14 1 5 2024 1 3 6 Boully Le_Gouriellec Maths Anglais
50 14 1 5 2024 1 2 10 Le_Gouriellec Carpintero Anglais Maths
51 14 15 1 5 2024 1 15 2 Carpintero Le_Gouriellec Maths Anglais
15 1 5 2024 1 7 Carpintero Maths
15 1 5 2024 1 12 Le_Gouriellec Anglais
52 15 1 5 2024 1 12 Boully Maths
53 16 15 1 5 2024 1 0 7 none Carpintero _ Maths
54 17 16 1 5 2024 1 1 12 Poupy Mann Physique Anglais
55 17 1 5 2024 1 4 9 Mann Poupy Anglais Physique
56 18 17 1 5 2024 1 13 10 Poupy Mann Physique Anglais
57 18 2 1 5 2024 1 6 11 Rapin Poupy Maths Physique
58 18 2 5 2024 1 7 15 De_Roux Mullaert Physique Maths
59 18 2 5 2024 1 9 Mullaert Rapin Maths
60 16 18 3 2 5 2024 1 9 13 Chibani De_Roux Physique
61 17 16 3 5 2024 1 10 5 Oubaha Chibani Maths Physique
62 18 17 3 5 2024 1 4 6 Oubaha Maths
63 12 18 6 3 5 2024 1 0 3 none Oubaha _ Maths
64 12 6 5 2024 1 14 Chevalier Physique
65 12 6 5 2024 2 4 Jospin Info
66 13 6 5 2024 2 0 10 none Jospin _ Info
14 7 5 2024 1 8 Mullaert Maths
14 7 5 2024 1 3 Belagoune Anglais
67 14 7 5 2024 1 4 Chevalier Physique
68 17 14 7 5 2024 1 13 3 Herbaut Belagoune Anglais
69 17 14 7 5 2024 1 10 13 Colin Mullaert Physique Maths
70 17 7 5 2024 1 1 5 Belagoune Herbaut Anglais
71 17 7 5 2024 1 2 15 Chevalier Belagoune Physique Anglais
72 18 17 7 5 2024 1 4 12 Rapin Colin Maths Physique
73 18 17 7 5 2024 1 15 0 Belagoune none Anglais _
74 18 7 5 2024 1 9 Belagoune Anglais
75 18 7 5 2024 1 7 Rapin Maths
76 14 8 5 2024 2 0 none _
14 8 5 2024 2 10 Rouvroy Info
77 14 8 5 2024 2 0 none _
78 14 8 5 2024 1 2 1 0 Boully none Maths _
79 14 8 5 2024 1 10 1 Carpintero Le_Gouriellec Maths Anglais
80 14 8 5 2024 1 11 Le_Gouriellec Carpintero Anglais Maths
81 15 14 8 5 2024 1 5 14 Le_Gouriellec Boully Anglais Maths
82 15 8 5 2024 1 14 8 Carpintero Maths
83 15 8 5 2024 1 13 10 Boully Maths
84 16 15 8 5 2024 1 9 11 Mann Le_Gouriellec Anglais
85 16 8 5 2024 1 13 Mann Anglais
86 17 8 5 2024 1 2 Poupy Physique
87 17 8 5 2024 1 7 Mann Anglais
88 17 18 8 5 2024 1 8 6 Poupy Physique
18 8 5 2024 1 12 Poupy Physique
18 9 5 2024 1 5 Mullaert Maths
89 18 9 5 2024 1 2 Rapin Maths
90 18 9 5 2024 1 14 8 De_Roux Physique
91 16 18 10 9 5 2024 1 6 1 Chibani Mullaert Physique Maths
92 17 16 10 5 2024 1 7 10 Oubaha Chibani Maths Physique
93 18 17 10 5 2024 1 11 4 Oubaha Maths
94 12 18 13 10 5 2024 1 1 5 Chevalier Oubaha Physique Maths
95 12 13 5 2024 2 1 15 Jospin Chevalier Info Physique
96 13 12 13 5 2024 2 0 9 none Jospin _ Info
97 14 13 14 13 5 2024 1 2 6 15 Mullaert Jospin Maths Info
98 14 14 5 2024 1 7 4 Chevalier Belagoune Physique Anglais
99 14 14 5 2024 1 10 2 Belagoune Mullaert Anglais Maths
100 17 14 14 5 2024 1 13 9 Colin Chevalier Physique
101 17 14 5 2024 1 2 6 Belagoune Anglais
102 17 14 5 2024 1 6 2 Herbaut Anglais
103 17 14 5 2024 1 15 13 Chevalier Physique
104 18 17 14 5 2024 1 9 7 Rapin Colin Maths Physique
105 18 14 5 2024 1 6 Rapin Maths
106 18 14 5 2024 1 12 Belagoune Anglais
107 14 15 5 2024 2 9 0 Rouvroy none Info _
108 14 15 5 2024 2 0 none _
109 14 15 5 2024 2 0 none _
110 14 15 5 2024 1 3 Carpintero Maths
111 14 15 5 2024 1 4 8 Le_Gouriellec Anglais
112 14 15 5 2024 1 5 Boully Maths
113 15 15 5 2024 1 11 8 Carpintero Boully Maths
114 15 15 5 2024 1 8 9 Le_Gouriellec Carpintero Anglais Maths
115 15 15 5 2024 1 14 10 Boully Le_Gouriellec Maths Anglais
116 16 15 5 2024 1 14 Mann Anglais
117 17 15 5 2024 1 5 1 Poupy Physique
118 17 15 5 2024 1 0 none _
119 18 15 5 2024 1 3 Poupy Physique
120 18 16 5 2024 1 9 5 De_Roux Physique
121 18 16 5 2024 1 8 11 Rapin Mullaert Maths
122 18 16 5 2024 1 12 Mullaert Rapin Maths
123 16 17 5 2024 1 11 Chibani Physique
124 17 17 5 2024 1 2 14 Oubaha Maths
125 18 17 5 2024 1 15 Oubaha Maths
126 12 20 5 2024 1 8 10 Chevalier Physique
127 12 20 5 2024 2 8 Jospin Info
128 13 20 5 2024 2 14 Jospin Info
129 14 21 5 2024 1 1 Belagoune Anglais
130 14 21 5 2024 1 14 6 Chevalier Mullaert Physique Maths
131 14 21 5 2024 1 15 12 Mullaert Chevalier Maths Physique
132 17 21 5 2024 1 3 7 Herbaut Belagoune Anglais
133 17 21 5 2024 1 15 Herbaut Anglais
134 17 21 5 2024 1 14 Chevalier Physique
135 17 21 5 2024 1 0 none _
136 17 18 21 5 2024 1 5 4 Belagoune Rapin Anglais Maths
137 17 18 21 5 2024 1 10 11 Chevalier Belagoune Physique Anglais
18 21 5 2024 1 1 Rapin Maths
18 21 5 2024 1 13 Belagoune Anglais
138 14 22 5 2024 2 0 none _
139 14 22 5 2024 2 0 none _
140 14 22 5 2024 2 0 none _
141 14 22 5 2024 1 13 1 Carpintero Boully Maths
142 14 22 5 2024 1 6 7 Boully Carpintero Maths
143 14 22 5 2024 1 7 13 Le_Gouriellec Anglais
144 15 22 5 2024 1 7 3 Boully Maths
145 15 22 5 2024 1 9 3 Le_Gouriellec Anglais
146 15 22 5 2024 1 4 9 Carpintero Maths
147 16 22 5 2024 1 11 5 Mann Anglais
148 17 22 5 2024 1 2 4 Poupy Physique
149 17 22 5 2024 1 15 9 Mann Anglais
150 18 22 5 2024 1 4 8 Poupy Physique
151 18 23 5 2024 1 10 2 Rapin De_Roux Maths Physique
152 18 23 5 2024 1 15 Rapin Maths
153 18 23 5 2024 1 12 Mullaert Maths
154 18 16 23 24 5 2024 1 6 De_Roux Chibani Physique
155 16 17 24 5 2024 1 12 13 Chibani Oubaha Physique Maths
156 17 18 24 5 2024 1 3 10 Oubaha Maths
18 24 5 2024 1 9 Oubaha Maths
157 12 27 5 2024 1 1 Chevalier Physique
158 12 27 5 2024 2 7 Jospin Info
159 13 27 5 2024 2 13 Jospin Info
160 14 28 5 2024 1 2 10 Belagoune Anglais
161 14 28 5 2024 1 3 7 Chevalier Mullaert Physique Maths
162 14 28 5 2024 1 4 5 Mullaert Chevalier Maths Physique
163 17 28 5 2024 1 12 14 Herbaut Anglais
164 17 28 5 2024 1 9 2 Colin Belagoune Physique Anglais
165 17 28 5 2024 1 13 11 Chevalier Colin Physique
166 17 28 5 2024 1 4 3 Belagoune Chevalier Anglais Physique
167 18 28 5 2024 1 7 10 Rapin Maths
168 18 28 5 2024 1 10 0 Belagoune none Anglais _
169 14 29 5 2024 2 0 none _
170 14 29 5 2024 2 0 none _
171 14 29 5 2024 2 0 none _
172 14 29 5 2024 1 2 Boully Maths
173 14 29 5 2024 1 1 4 Carpintero Le_Gouriellec Maths Anglais
174 14 29 5 2024 1 6 5 Le_Gouriellec Carpintero Anglais Maths
175 15 29 5 2024 1 5 1 Boully Carpintero Maths
176 15 29 5 2024 1 8 12 Carpintero Le_Gouriellec Maths Anglais
177 15 29 5 2024 1 14 4 Le_Gouriellec Boully Anglais Maths
178 16 29 5 2024 1 0 8 none Mann _ Anglais
179 17 29 5 2024 1 7 Poupy Physique
180 17 29 5 2024 1 8 6 Mann Anglais
181 18 29 5 2024 1 11 13 Poupy Physique
182 18 30 5 2024 1 10 14 Mullaert Rapin Maths
183 18 30 5 2024 1 5 8 De_Roux Mullaert Physique Maths
184 18 30 5 2024 1 11 15 Rapin De_Roux Maths Physique
185 16 31 5 2024 1 15 9 Chibani Physique
186 17 31 5 2024 1 13 11 Oubaha Maths
187 18 31 5 2024 1 14 13 Oubaha Maths
188 12 3 6 2024 1 14 0 Chevalier none Physique _
189 12 3 6 2024 2 6 12 Jospin Info
190 13 3 6 2024 2 12 0 Jospin none Info _
191 14 4 6 2024 1 2 Mullaert Maths
192 14 4 6 2024 1 5 1 Belagoune Anglais
193 14 4 6 2024 1 8 6 Chevalier Physique
194 17 4 6 2024 1 9 3 Herbaut Anglais
195 17 4 6 2024 1 11 Belagoune Anglais
196 17 4 6 2024 1 0 2 none Chevalier _ Physique
197 17 4 6 2024 1 6 4 Colin Physique
198 18 4 6 2024 1 5 Rapin Maths
199 18 4 6 2024 1 7 Belagoune Anglais
200 14 5 6 2024 2 0 none _
201 14 5 6 2024 2 6 Rouvroy Info
202 14 5 6 2024 2 0 none _
203 14 5 6 2024 2 1 0 5 none Le_Gouriellec _ Anglais
204 14 5 6 2024 1 12 6 Carpintero Maths
205 14 5 6 2024 1 15 9 Le_Gouriellec Boully Anglais Maths
206 14 15 5 6 2024 1 8 9 Boully Le_Gouriellec Maths Anglais
207 15 5 6 2024 1 9 14 Carpintero Maths
208 15 5 6 2024 1 11 15 Boully Maths
209 15 16 5 6 2024 1 13 Le_Gouriellec Mann Anglais
210 16 17 5 6 2024 1 3 10 Mann Poupy Anglais Physique
211 17 5 6 2024 1 4 15 Poupy Mann Physique Anglais
212 17 18 5 6 2024 1 1 8 Mann Poupy Anglais Physique
213 18 5 6 6 2024 1 12 Poupy De_Roux Physique
214 18 6 6 2024 1 3 Rapin Mullaert Maths
215 18 6 6 2024 1 10 11 De_Roux Rapin Physique Maths
216 18 16 6 7 6 2024 1 14 Mullaert Chibani Maths Physique
217 16 17 7 6 2024 1 2 8 Chibani Oubaha Physique Maths
218 17 18 7 6 2024 1 6 12 Oubaha Maths
18 7 6 2024 1 15 Oubaha Maths

9
src/main.c
View File

@ -51,11 +51,11 @@ int main(int argc, char **argv) {
print_help(); print_help();
exit(0); exit(0);
} }
else if (argc==12 && argv[1][0]!='-') else if (argc==11 && argv[1][0]!='-')
{ {
offset=0; offset=0;
} }
else if (argc==13 && argv[1][0]=='-') else if (argc==12 && argv[1][0]=='-')
{ {
offset=1; offset=1;
@ -78,7 +78,7 @@ int main(int argc, char **argv) {
} }
} }
else { else {
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]); 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]);
exit(1); exit(1);
} }
@ -93,7 +93,6 @@ int main(int argc, char **argv) {
char* path_output = argv[8+offset]; char* path_output = argv[8+offset];
int math_i = str_to_int(argv[9+offset]); int math_i = str_to_int(argv[9+offset]);
int info_i = str_to_int(argv[10+offset]); int info_i = str_to_int(argv[10+offset]);
char* blacklist_path = argv[11+offset];
if (quiet) { if (quiet) {
create_logger("colloscope.log", LOG_WARN); create_logger("colloscope.log", LOG_WARN);
@ -115,7 +114,7 @@ int main(int argc, char **argv) {
//colleur* dudes = import_colleurs("some_data.txt", 13, len_creneau); //colleur* dudes = import_colleurs("some_data.txt", 13, len_creneau);
colleur* dudes = import_colleurs_oneweek(path_colleurs, n_colleurs, n_weeks, n_creneaux); colleur* dudes = import_colleurs_oneweek(path_colleurs, n_colleurs, n_weeks, n_creneaux);
import_tds(edt, len_edt, n_creneaux, blacklist_path); import_tds(edt, len_edt, n_creneaux, "S3-tds.txt");
debug("Entries are : "); debug("Entries are : ");
debug("Creneaux filename : %s", path_creneaux); debug("Creneaux filename : %s", path_creneaux);

46
src/structure.c
View File

@ -519,8 +519,6 @@ void import_tds(creneau* edt, int len_edt, int len_oneweek, char* filename) {
int current = 0; int current = 0;
int place = 0; int place = 0;
char method = 'A';
int buffer = 0; int buffer = 0;
date d; date d;
@ -536,49 +534,19 @@ void import_tds(creneau* edt, int len_edt, int len_oneweek, char* filename) {
if(current == 1) { if(current == 1) {
edtptr = locate_date(edt, len_edt, d); edtptr = locate_date(edt, len_edt, d);
} else { } else {
if(method == 'A') { int k = 0;
int k = 0; int os = 1;
int os = 1; while(edtptr + k*len_oneweek >= 0 && edtptr + k*len_oneweek < len_edt) {
while(edtptr + k*len_oneweek >= 0 && edtptr + k*len_oneweek < len_edt) { //info("[%d, %d]", buffer, edtptr + k*len_oneweek);
//info("[%d, %d]", buffer, edtptr + k*len_oneweek); //usleep(1000000);
//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; 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)) { 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); //info("[%d, %d]", buffer, edtptr + k*len_oneweek + os);
edt[edtptr + k*len_oneweek + os].allow_grps[buffer-1] = false; edt[edtptr + k*len_oneweek + os].allow_grps[buffer-1] = false;
os++; os++;
} }
k++;
k = 1;
os = 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++; current++;
@ -593,8 +561,6 @@ void import_tds(creneau* edt, int len_edt, int len_oneweek, char* filename) {
} else { } else {
d.year = buffer; d.year = buffer;
current = 1; current = 1;
c = fgetc(ptr);
method = c;
} }
place++; place++;
buffer = 0; buffer = 0;