mp2i-vms.fr
bug fix
This commit is contained in:
parent
50f1940d6b
commit
cca121b09c
|
|
@ -12,11 +12,15 @@
|
|||
14 7 2 2024
|
||||
14 7 2 2024
|
||||
14 7 2 2024+
|
||||
14 7 2 2024+
|
||||
14 7 2 2024+
|
||||
15 7 2 2024
|
||||
15 7 2 2024
|
||||
15 7 2 2024
|
||||
16 7 2 2024
|
||||
16 7 2 2024+
|
||||
16 7 2 2024+
|
||||
16 7 2 2024+
|
||||
17 7 2 2024
|
||||
17 7 2 2024
|
||||
18 7 2 2024
|
||||
|
|
|
|||
27
algorithm.c
27
algorithm.c
|
|
@ -709,6 +709,7 @@ void add_colle(creneau* edt, colleur* chads, int grp, int id_edt, int id_chad) {
|
|||
edt[id_edt].namelen = chads[id_chad].namelen;
|
||||
str_copy(chads[id_chad].name, chads[id_chad].namelen, edt[id_edt].name);
|
||||
edt[id_edt].mat = chads[id_chad].mat;
|
||||
//printf("{%d %s %d %d %d}\n", edt[id_edt].group, edt[id_edt].name, edt[id_edt].namelen, (int)(edt[id_edt].mat), id_edt);
|
||||
}
|
||||
|
||||
void remove_colle(creneau* edt, int id_edt) {
|
||||
|
|
@ -771,6 +772,7 @@ void add_colles_for_group_MP2I(int* weeks_len, creneau* edt, int len_edt, colleu
|
|||
|
||||
bool has_math_dude = false; // length of colleur*
|
||||
|
||||
//printf("\n");
|
||||
for(int week = 0; week < n_weeks; week++) {
|
||||
|
||||
int weeklen = weeks_len[week];
|
||||
|
|
@ -788,6 +790,7 @@ void add_colles_for_group_MP2I(int* weeks_len, creneau* edt, int len_edt, colleu
|
|||
}
|
||||
|
||||
remaining_to_add++; // physics/english
|
||||
//printf("%d -> (%d %d)\n", grp, week, remaining_to_add);
|
||||
|
||||
// initialize/reset variables
|
||||
r = rand()%weeklen;
|
||||
|
|
@ -796,7 +799,7 @@ void add_colles_for_group_MP2I(int* weeks_len, creneau* edt, int len_edt, colleu
|
|||
|
||||
info++;
|
||||
// info colle
|
||||
while(info >= 8) {
|
||||
while(info >= 6) {
|
||||
if(edt[k+r%weeklen].group == 0 && edt[k+r%weeklen].length == 2) {
|
||||
// if creneau is empty
|
||||
// import all colleurs available
|
||||
|
|
@ -831,14 +834,14 @@ void add_colles_for_group_MP2I(int* weeks_len, creneau* edt, int len_edt, colleu
|
|||
halt++;
|
||||
}
|
||||
// reset the variables
|
||||
r = rand()%16;
|
||||
r = rand()%weeklen;
|
||||
found = false;
|
||||
halt = 0;
|
||||
|
||||
// if there is a math colle to add, enter this loop
|
||||
while(remaining_to_add == 2) {
|
||||
|
||||
if(edt[k+r%weeklen].group == 0 && edt[k+r%weeklen].length == 1) {
|
||||
if(edt[k+r%weeklen].mat == NOTHING && edt[k+r%weeklen].length == 1) {
|
||||
// if creneau is empty
|
||||
// import all colleurs available
|
||||
free(dudes);
|
||||
|
|
@ -863,6 +866,7 @@ void add_colles_for_group_MP2I(int* weeks_len, creneau* edt, int len_edt, colleu
|
|||
} else {
|
||||
found = true;
|
||||
remaining_to_add--;
|
||||
//printf("+math for week %d and group %d (index %d)\n", week, grp, k+r%weeklen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -877,29 +881,30 @@ void add_colles_for_group_MP2I(int* weeks_len, creneau* edt, int len_edt, colleu
|
|||
halt++;
|
||||
}
|
||||
// reset the variables
|
||||
r = rand()%16;
|
||||
r = rand()%weeklen;
|
||||
found = false;
|
||||
halt = 0;
|
||||
|
||||
// do it again for physics/english colles
|
||||
while(remaining_to_add == 1) {
|
||||
if(edt[k+r%weeklen].group == 0 && edt[k+r%weeklen].length == 1) {
|
||||
if(edt[k+r%weeklen].mat == NOTHING && edt[k+r%weeklen].length == 1) {
|
||||
dudes = get_colleurs(chads, len_chads, edt[k+r%16].date, &len_dudes);
|
||||
len_perm = len_dudes;
|
||||
if(len_dudes != 0) {
|
||||
generate_random_perm(perm, len_perm);
|
||||
has_math_dude = false;
|
||||
for(int dude = 0; dude < len_perm*(1-has_math_dude); dude++) {
|
||||
if(dudes[perm[dude]].mat == MATH) {
|
||||
/*for(int dude = 0; dude < len_perm*(1-has_math_dude); dude++) {
|
||||
if(dudes[dude].mat == MATH) {
|
||||
has_math_dude = true;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
for(int dude = 0; dude < len_perm*(1-found)*(1-has_math_dude); dude++) {
|
||||
//printf("%d\n", chads[perm[dude]]);
|
||||
if(dudes[perm[dude]].mat == rotation) {
|
||||
add_colle(edt, dudes, grp, k+r%16, perm[dude]);
|
||||
add_colle(edt, dudes, grp, k+r%weeklen, perm[dude]);
|
||||
found = true;
|
||||
remaining_to_add--;
|
||||
//printf("+secondary for week %d and group %d (index %d)\n", week, grp, k+r%weeklen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1037,7 +1042,7 @@ void aux_2(creneau* edt, int len_edt, colleur* chads, int len_chads, int n_group
|
|||
for(int i = 0; i < n_groups; i++) {
|
||||
//for(int i = 0; i < 1; i++) {
|
||||
//rintf("Adding colles for group %d...\n", i+1);
|
||||
add_colles_for_group_MP2I(weeks_len, edt, len_edt, chads, len_chads, n_weeks, i+1, (topic)(2+i%2), i%4, i%8, &skipped);
|
||||
add_colles_for_group_MP2I(weeks_len, edt, len_edt, chads, len_chads, n_weeks, i+1, (topic)(2+i%2), i%4, i%6, &skipped);
|
||||
}
|
||||
for(int i = 0; i < n_groups; i++) {
|
||||
//printf("Score for group %d : %d\n", i+1, score(edt, len_edt, i+1));
|
||||
|
|
@ -1048,7 +1053,7 @@ void aux_2(creneau* edt, int len_edt, colleur* chads, int len_chads, int n_group
|
|||
local_group = i+1;
|
||||
}
|
||||
}
|
||||
local_score -= skipped*35;
|
||||
local_score -= skipped*30;
|
||||
if(local_score > max_score) {
|
||||
max_score = local_score;
|
||||
screwed_group = local_group;
|
||||
|
|
|
|||
8
main.c
8
main.c
|
|
@ -7,11 +7,11 @@ int main() {
|
|||
srand(time(NULL));
|
||||
|
||||
//creneau* edt = import_creneaux("file.txt", 76);
|
||||
creneau* edt = import_creneaux_oneweek("MP2I-creneaux.txt", 29, 6);
|
||||
int len_edt = 29*6;
|
||||
creneau* edt = import_creneaux_oneweek("MP2I-creneaux.txt", 33, 6);
|
||||
int len_edt = 33*6;
|
||||
|
||||
//colleur* dudes = import_colleurs("some_data.txt", 13, len_creneau);
|
||||
colleur* dudes = import_colleurs_oneweek("MP2I-colleurs.txt", 16, 6, 29);
|
||||
colleur* dudes = import_colleurs_oneweek("MP2I-colleurs.txt", 16, 6, 33);
|
||||
int n_colleurs = 16;
|
||||
|
||||
//print_all_edt(edt, len_edt, 6, 31);
|
||||
|
|
@ -24,7 +24,7 @@ int main() {
|
|||
/*int* a = malloc(sizeof(int)*10);
|
||||
generate_random_perm(a, 10);
|
||||
print_arr(a, 10);*/
|
||||
aux_2(edt, len_edt, dudes, n_colleurs, 15, 6, 1500);
|
||||
aux_2(edt, len_edt, dudes, n_colleurs, 15, 6, 1000);
|
||||
//generate_colles_v1(edt, len_creneau, dudes, n_colleurs, 9, 4);
|
||||
//generate_colles_v1(edt, len_creneau, dudes, n_colleurs, 15, 4);
|
||||
|
||||
|
|
|
|||
344
output.csv
344
output.csv
|
|
@ -1,175 +1,199 @@
|
|||
hour,day,month,year,length,group,colleur,matiere
|
||||
12,5,2,2024,1,14,Chevalier,Physique
|
||||
13,5,2,2024,1,15,Herbaut,Anglais
|
||||
14,6,2,2024,1,3,Mullaert,Maths
|
||||
14,6,2,2024,1,0,none,none
|
||||
14,6,2,2024,1,0,none,none
|
||||
17,6,2,2024,1,2,Chevalier,Physique
|
||||
17,6,2,2024,1,6,Colin,Physique
|
||||
18,6,2,2024,1,8,Rapin,Maths
|
||||
13,7,2,2024,1,4,Carpintero,Maths
|
||||
14,7,2,2024,1,7,Boully,Maths
|
||||
14,7,2,2024,1,6,Bouverot,Maths
|
||||
14,7,2,2024,1,0,none,none
|
||||
14,7,2,2024,1,2,Carpintero,Maths
|
||||
14,7,2,2024,2,8,Colleur_Dinfo,Info
|
||||
15,7,2,2024,1,10,Bouverot,Maths
|
||||
15,7,2,2024,1,11,Boully,Maths
|
||||
15,7,2,2024,1,0,none,none
|
||||
16,7,2,2024,1,0,none,none
|
||||
12,5,2,2024,1,3,Herbaut,Anglais
|
||||
13,5,2,2024,1,5,Belaggoune,Anglais
|
||||
14,6,2,2024,1,6,Chevalier,Physique
|
||||
14,6,2,2024,1,10,Chevalier,Physique
|
||||
14,6,2,2024,1,2,Mullaert,Maths
|
||||
17,6,2,2024,1,12,Colin,Physique
|
||||
17,6,2,2024,1,2,Colin,Physique
|
||||
18,6,2,2024,1,4,Rapin,Maths
|
||||
13,7,2,2024,1,6,Carpintero,Maths
|
||||
14,7,2,2024,1,1,Le_Gouriellec,Anglais
|
||||
14,7,2,2024,1,10,Bouverot,Maths
|
||||
14,7,2,2024,1,11,Carpintero,Maths
|
||||
14,7,2,2024,1,12,Boully,Maths
|
||||
14,7,2,2024,2,12,Colleur_Dinfo,Info
|
||||
14,7,2,2024,2,0,none,none
|
||||
14,7,2,2024,2,6,Colleur_Dinfo,Info
|
||||
15,7,2,2024,1,8,Chevalier,Physique
|
||||
15,7,2,2024,1,13,Herbaut,Anglais
|
||||
15,7,2,2024,1,14,Boully,Maths
|
||||
16,7,2,2024,1,14,Chevalier,Physique
|
||||
16,7,2,2024,2,0,none,none
|
||||
16,7,2,2024,2,0,none,none
|
||||
16,7,2,2024,2,0,none,none
|
||||
17,7,2,2024,1,4,De_Roux,Physique
|
||||
17,7,2,2024,1,0,none,none
|
||||
17,7,2,2024,1,0,none,none
|
||||
18,7,2,2024,1,0,none,none
|
||||
14,8,2,2024,1,0,none,none
|
||||
15,8,2,2024,1,0,none,none
|
||||
18,8,2,2024,1,12,Rapin,Maths
|
||||
18,8,2,2024,1,0,none,none
|
||||
18,7,2,2024,1,7,Le_Gouriellec,Anglais
|
||||
14,8,2,2024,1,9,Le_Gouriellec,Anglais
|
||||
15,8,2,2024,1,11,Le_Gouriellec,Anglais
|
||||
18,8,2,2024,1,3,Rapin,Maths
|
||||
18,8,2,2024,1,15,Le_Gouriellec,Anglais
|
||||
16,9,2,2024,1,0,none,none
|
||||
17,9,2,2024,1,14,Oubaha,Maths
|
||||
18,9,2,2024,1,15,Oubaha,Maths
|
||||
12,12,2,2024,1,15,Chevalier,Physique
|
||||
13,12,2,2024,1,14,Herbaut,Anglais
|
||||
14,13,2,2024,1,0,none,none
|
||||
14,13,2,2024,1,5,Mullaert,Maths
|
||||
14,13,2,2024,1,0,none,none
|
||||
17,13,2,2024,1,1,Chevalier,Physique
|
||||
17,13,2,2024,1,7,Chevalier,Physique
|
||||
18,13,2,2024,1,7,Rapin,Maths
|
||||
13,14,2,2024,1,8,Carpintero,Maths
|
||||
14,14,2,2024,1,3,Bouverot,Maths
|
||||
14,14,2,2024,1,0,none,none
|
||||
14,14,2,2024,1,1,Boully,Maths
|
||||
14,14,2,2024,1,12,Carpintero,Maths
|
||||
14,14,2,2024,2,15,Colleur_Dinfo,Info
|
||||
15,14,2,2024,1,4,Boully,Maths
|
||||
15,14,2,2024,1,9,Bouverot,Maths
|
||||
15,14,2,2024,1,0,none,none
|
||||
16,14,2,2024,1,0,none,none
|
||||
16,14,2,2024,2,7,Colleur_Dinfo,Info
|
||||
17,9,2,2024,1,7,Oubaha,Maths
|
||||
18,9,2,2024,1,8,Oubaha,Maths
|
||||
12,12,2,2024,1,7,Chevalier,Physique
|
||||
13,12,2,2024,1,9,Chevalier,Physique
|
||||
14,13,2,2024,1,11,Chevalier,Physique
|
||||
14,13,2,2024,1,4,Mullaert,Maths
|
||||
14,13,2,2024,1,6,Belaggoune,Anglais
|
||||
17,13,2,2024,1,15,Chevalier,Physique
|
||||
17,13,2,2024,1,0,none,none
|
||||
18,13,2,2024,1,1,Rapin,Maths
|
||||
13,14,2,2024,1,7,Carpintero,Maths
|
||||
14,14,2,2024,1,2,Le_Gouriellec,Anglais
|
||||
14,14,2,2024,1,11,Carpintero,Maths
|
||||
14,14,2,2024,1,5,Bouverot,Maths
|
||||
14,14,2,2024,1,12,Boully,Maths
|
||||
14,14,2,2024,2,11,Colleur_Dinfo,Info
|
||||
14,14,2,2024,2,0,none,none
|
||||
14,14,2,2024,2,0,none,none
|
||||
15,14,2,2024,1,3,Bouverot,Maths
|
||||
15,14,2,2024,1,4,Herbaut,Anglais
|
||||
15,14,2,2024,1,3,Chevalier,Physique
|
||||
16,14,2,2024,1,5,Chevalier,Physique
|
||||
16,14,2,2024,2,5,Colleur_Dinfo,Info
|
||||
16,14,2,2024,2,0,none,none
|
||||
16,14,2,2024,2,0,none,none
|
||||
17,14,2,2024,1,13,De_Roux,Physique
|
||||
17,14,2,2024,1,0,none,none
|
||||
17,14,2,2024,1,0,none,none
|
||||
18,14,2,2024,1,0,none,none
|
||||
14,15,2,2024,1,0,none,none
|
||||
15,15,2,2024,1,0,none,none
|
||||
18,15,2,2024,1,11,Rapin,Maths
|
||||
18,15,2,2024,1,0,none,none
|
||||
18,14,2,2024,1,8,Le_Gouriellec,Anglais
|
||||
14,15,2,2024,1,10,Le_Gouriellec,Anglais
|
||||
15,15,2,2024,1,12,Le_Gouriellec,Anglais
|
||||
18,15,2,2024,1,8,Rapin,Maths
|
||||
18,15,2,2024,1,14,Le_Gouriellec,Anglais
|
||||
16,16,2,2024,1,0,none,none
|
||||
17,16,2,2024,1,13,Oubaha,Maths
|
||||
18,16,2,2024,1,15,Oubaha,Maths
|
||||
12,19,2,2024,1,14,Chevalier,Physique
|
||||
13,19,2,2024,1,15,Herbaut,Anglais
|
||||
14,20,2,2024,1,1,Mullaert,Maths
|
||||
14,20,2,2024,1,0,none,none
|
||||
14,20,2,2024,1,0,none,none
|
||||
17,20,2,2024,1,4,Colin,Physique
|
||||
17,20,2,2024,1,8,Chevalier,Physique
|
||||
18,20,2,2024,1,2,Rapin,Maths
|
||||
13,21,2,2024,1,4,Carpintero,Maths
|
||||
14,21,2,2024,1,5,Boully,Maths
|
||||
14,21,2,2024,1,8,Bouverot,Maths
|
||||
14,21,2,2024,1,9,Carpintero,Maths
|
||||
14,21,2,2024,1,0,none,none
|
||||
14,21,2,2024,2,6,Colleur_Dinfo,Info
|
||||
15,21,2,2024,1,6,Boully,Maths
|
||||
15,21,2,2024,1,10,Bouverot,Maths
|
||||
15,21,2,2024,1,0,none,none
|
||||
16,21,2,2024,1,0,none,none
|
||||
16,21,2,2024,2,14,Colleur_Dinfo,Info
|
||||
17,16,2,2024,1,9,Oubaha,Maths
|
||||
18,16,2,2024,1,1,Chevalier,Physique
|
||||
12,19,2,2024,1,3,Herbaut,Anglais
|
||||
13,19,2,2024,1,6,Chevalier,Physique
|
||||
14,20,2,2024,1,8,Mullaert,Maths
|
||||
14,20,2,2024,1,10,Chevalier,Physique
|
||||
14,20,2,2024,1,12,Chevalier,Physique
|
||||
17,20,2,2024,1,14,Colin,Physique
|
||||
17,20,2,2024,1,0,none,none
|
||||
18,20,2,2024,1,5,Rapin,Maths
|
||||
13,21,2,2024,1,9,Carpintero,Maths
|
||||
14,21,2,2024,1,10,Carpintero,Maths
|
||||
14,21,2,2024,1,12,Boully,Maths
|
||||
14,21,2,2024,1,13,Bouverot,Maths
|
||||
14,21,2,2024,1,15,Le_Gouriellec,Anglais
|
||||
14,21,2,2024,2,0,none,none
|
||||
14,21,2,2024,2,0,none,none
|
||||
14,21,2,2024,2,0,none,none
|
||||
15,21,2,2024,1,2,Boully,Maths
|
||||
15,21,2,2024,1,7,Herbaut,Anglais
|
||||
15,21,2,2024,1,4,Chevalier,Physique
|
||||
16,21,2,2024,1,2,Chevalier,Physique
|
||||
16,21,2,2024,2,4,Colleur_Dinfo,Info
|
||||
16,21,2,2024,2,10,Colleur_Dinfo,Info
|
||||
16,21,2,2024,2,0,none,none
|
||||
17,21,2,2024,1,8,De_Roux,Physique
|
||||
17,21,2,2024,1,0,none,none
|
||||
17,21,2,2024,1,0,none,none
|
||||
18,21,2,2024,1,0,none,none
|
||||
14,22,2,2024,1,0,none,none
|
||||
15,22,2,2024,1,0,none,none
|
||||
18,22,2,2024,1,12,Rapin,Maths
|
||||
18,22,2,2024,1,0,none,none
|
||||
16,23,2,2024,1,0,none,none
|
||||
17,23,2,2024,1,13,Oubaha,Maths
|
||||
18,23,2,2024,1,14,Oubaha,Maths
|
||||
12,26,2,2024,1,15,Chevalier,Physique
|
||||
13,26,2,2024,1,14,Herbaut,Anglais
|
||||
14,27,2,2024,1,14,Mullaert,Maths
|
||||
14,27,2,2024,1,0,none,none
|
||||
14,27,2,2024,1,0,none,none
|
||||
17,27,2,2024,1,13,Colin,Physique
|
||||
17,27,2,2024,1,0,none,none
|
||||
18,21,2,2024,1,1,Le_Gouriellec,Anglais
|
||||
14,22,2,2024,1,5,Le_Gouriellec,Anglais
|
||||
15,22,2,2024,1,11,Le_Gouriellec,Anglais
|
||||
18,22,2,2024,1,1,Rapin,Maths
|
||||
18,22,2,2024,1,13,Le_Gouriellec,Anglais
|
||||
16,23,2,2024,1,9,Le_Gouriellec,Anglais
|
||||
17,23,2,2024,1,4,Oubaha,Maths
|
||||
18,23,2,2024,1,6,Oubaha,Maths
|
||||
12,26,2,2024,1,13,Chevalier,Physique
|
||||
13,26,2,2024,1,9,Chevalier,Physique
|
||||
14,27,2,2024,1,10,Mullaert,Maths
|
||||
14,27,2,2024,1,3,Chevalier,Physique
|
||||
14,27,2,2024,1,1,Chevalier,Physique
|
||||
17,27,2,2024,1,11,Chevalier,Physique
|
||||
17,27,2,2024,1,5,Colin,Physique
|
||||
18,27,2,2024,1,5,Rapin,Maths
|
||||
13,28,2,2024,1,2,Carpintero,Maths
|
||||
14,28,2,2024,1,7,Bouverot,Maths
|
||||
14,28,2,2024,1,3,Boully,Maths
|
||||
14,28,2,2024,1,1,Carpintero,Maths
|
||||
14,28,2,2024,1,0,none,none
|
||||
14,28,2,2024,2,5,Colleur_Dinfo,Info
|
||||
15,28,2,2024,1,6,Boully,Maths
|
||||
15,28,2,2024,1,9,Bouverot,Maths
|
||||
15,28,2,2024,1,0,none,none
|
||||
16,28,2,2024,1,0,none,none
|
||||
16,28,2,2024,2,13,Colleur_Dinfo,Info
|
||||
13,28,2,2024,1,11,Carpintero,Maths
|
||||
14,28,2,2024,1,13,Bouverot,Maths
|
||||
14,28,2,2024,1,14,Boully,Maths
|
||||
14,28,2,2024,1,6,Le_Gouriellec,Anglais
|
||||
14,28,2,2024,1,7,Carpintero,Maths
|
||||
14,28,2,2024,2,9,Colleur_Dinfo,Info
|
||||
14,28,2,2024,2,15,Colleur_Dinfo,Info
|
||||
14,28,2,2024,2,0,none,none
|
||||
15,28,2,2024,1,2,Boully,Maths
|
||||
15,28,2,2024,1,2,Herbaut,Anglais
|
||||
15,28,2,2024,1,1,Bouverot,Maths
|
||||
16,28,2,2024,1,7,Chevalier,Physique
|
||||
16,28,2,2024,2,0,none,none
|
||||
16,28,2,2024,2,3,Colleur_Dinfo,Info
|
||||
16,28,2,2024,2,0,none,none
|
||||
17,28,2,2024,1,15,De_Roux,Physique
|
||||
17,28,2,2024,1,0,none,none
|
||||
17,28,2,2024,1,0,none,none
|
||||
18,28,2,2024,1,0,none,none
|
||||
14,29,2,2024,1,0,none,none
|
||||
15,29,2,2024,1,0,none,none
|
||||
18,29,2,2024,1,10,Rapin,Maths
|
||||
18,29,2,2024,1,0,none,none
|
||||
16,1,3,2024,1,0,none,none
|
||||
17,1,3,2024,1,11,Oubaha,Maths
|
||||
18,1,3,2024,1,13,Oubaha,Maths
|
||||
12,4,3,2024,1,12,Chevalier,Physique
|
||||
13,4,3,2024,1,15,Herbaut,Anglais
|
||||
14,5,3,2024,1,0,none,none
|
||||
14,5,3,2024,1,0,none,none
|
||||
14,5,3,2024,1,3,Mullaert,Maths
|
||||
17,5,3,2024,1,2,Chevalier,Physique
|
||||
17,5,3,2024,1,14,Chevalier,Physique
|
||||
18,5,3,2024,1,4,Rapin,Maths
|
||||
13,6,3,2024,1,6,Carpintero,Maths
|
||||
14,6,3,2024,1,8,Carpintero,Maths
|
||||
14,6,3,2024,1,2,Bouverot,Maths
|
||||
14,6,3,2024,1,11,Boully,Maths
|
||||
14,6,3,2024,1,0,none,none
|
||||
14,6,3,2024,2,4,Colleur_Dinfo,Info
|
||||
15,6,3,2024,1,7,Boully,Maths
|
||||
18,28,2,2024,1,8,Le_Gouriellec,Anglais
|
||||
14,29,2,2024,1,12,Le_Gouriellec,Anglais
|
||||
15,29,2,2024,1,14,Le_Gouriellec,Anglais
|
||||
18,29,2,2024,1,4,Le_Gouriellec,Anglais
|
||||
18,29,2,2024,1,6,Rapin,Maths
|
||||
16,1,3,2024,1,10,Le_Gouriellec,Anglais
|
||||
17,1,3,2024,1,3,Oubaha,Maths
|
||||
18,1,3,2024,1,9,Oubaha,Maths
|
||||
12,4,3,2024,1,2,Chevalier,Physique
|
||||
13,4,3,2024,1,5,Belaggoune,Anglais
|
||||
14,5,3,2024,1,8,Mullaert,Maths
|
||||
14,5,3,2024,1,1,Belaggoune,Anglais
|
||||
14,5,3,2024,1,8,Chevalier,Physique
|
||||
17,5,3,2024,1,10,Colin,Physique
|
||||
17,5,3,2024,1,12,Chevalier,Physique
|
||||
18,5,3,2024,1,2,Rapin,Maths
|
||||
13,6,3,2024,1,4,Carpintero,Maths
|
||||
14,6,3,2024,1,12,Boully,Maths
|
||||
14,6,3,2024,1,13,Le_Gouriellec,Anglais
|
||||
14,6,3,2024,1,14,Carpintero,Maths
|
||||
14,6,3,2024,1,11,Bouverot,Maths
|
||||
14,6,3,2024,2,2,Colleur_Dinfo,Info
|
||||
14,6,3,2024,2,8,Colleur_Dinfo,Info
|
||||
14,6,3,2024,2,14,Colleur_Dinfo,Info
|
||||
15,6,3,2024,1,6,Boully,Maths
|
||||
15,6,3,2024,1,10,Bouverot,Maths
|
||||
15,6,3,2024,1,0,none,none
|
||||
16,6,3,2024,1,0,none,none
|
||||
16,6,3,2024,2,12,Colleur_Dinfo,Info
|
||||
15,6,3,2024,1,3,Belaggoune,Anglais
|
||||
16,6,3,2024,1,14,Chevalier,Physique
|
||||
16,6,3,2024,2,0,none,none
|
||||
16,6,3,2024,2,0,none,none
|
||||
16,6,3,2024,2,0,none,none
|
||||
17,6,3,2024,1,6,De_Roux,Physique
|
||||
17,6,3,2024,1,0,none,none
|
||||
17,6,3,2024,1,0,none,none
|
||||
18,6,3,2024,1,0,none,none
|
||||
14,7,3,2024,1,0,none,none
|
||||
18,6,3,2024,1,11,Le_Gouriellec,Anglais
|
||||
14,7,3,2024,1,15,Le_Gouriellec,Anglais
|
||||
15,7,3,2024,1,0,none,none
|
||||
18,7,3,2024,1,12,Rapin,Maths
|
||||
18,7,3,2024,1,0,none,none
|
||||
16,8,3,2024,1,0,none,none
|
||||
17,8,3,2024,1,14,Oubaha,Maths
|
||||
18,8,3,2024,1,15,Oubaha,Maths
|
||||
12,11,3,2024,1,13,Chevalier,Physique
|
||||
13,11,3,2024,1,14,Herbaut,Anglais
|
||||
14,12,3,2024,1,5,Mullaert,Maths
|
||||
14,12,3,2024,1,0,none,none
|
||||
14,12,3,2024,1,0,none,none
|
||||
17,12,3,2024,1,15,Chevalier,Physique
|
||||
18,7,3,2024,1,3,Rapin,Maths
|
||||
18,7,3,2024,1,7,Le_Gouriellec,Anglais
|
||||
16,8,3,2024,1,9,Le_Gouriellec,Anglais
|
||||
17,8,3,2024,1,7,Oubaha,Maths
|
||||
18,8,3,2024,1,4,Chevalier,Physique
|
||||
12,11,3,2024,1,8,Herbaut,Anglais
|
||||
13,11,3,2024,1,7,Chevalier,Physique
|
||||
14,12,3,2024,1,9,Mullaert,Maths
|
||||
14,12,3,2024,1,11,Chevalier,Physique
|
||||
14,12,3,2024,1,13,Colin,Physique
|
||||
17,12,3,2024,1,0,none,none
|
||||
18,12,3,2024,1,7,Rapin,Maths
|
||||
13,13,3,2024,1,8,Carpintero,Maths
|
||||
14,13,3,2024,1,9,Carpintero,Maths
|
||||
14,13,3,2024,1,11,Boully,Maths
|
||||
14,13,3,2024,1,1,Bouverot,Maths
|
||||
14,13,3,2024,1,0,none,none
|
||||
14,13,3,2024,2,3,Colleur_Dinfo,Info
|
||||
15,13,3,2024,1,3,Bouverot,Maths
|
||||
15,13,3,2024,1,4,Boully,Maths
|
||||
15,13,3,2024,1,0,none,none
|
||||
16,13,3,2024,1,0,none,none
|
||||
16,13,3,2024,2,11,Colleur_Dinfo,Info
|
||||
17,12,3,2024,1,15,Colin,Physique
|
||||
18,12,3,2024,1,1,Rapin,Maths
|
||||
13,13,3,2024,1,11,Carpintero,Maths
|
||||
14,13,3,2024,1,6,Le_Gouriellec,Anglais
|
||||
14,13,3,2024,1,2,Le_Gouriellec,Anglais
|
||||
14,13,3,2024,1,4,Boully,Maths
|
||||
14,13,3,2024,1,12,Carpintero,Maths
|
||||
14,13,3,2024,2,1,Colleur_Dinfo,Info
|
||||
14,13,3,2024,2,7,Colleur_Dinfo,Info
|
||||
14,13,3,2024,2,13,Colleur_Dinfo,Info
|
||||
15,13,3,2024,1,1,Chevalier,Physique
|
||||
15,13,3,2024,1,8,Bouverot,Maths
|
||||
15,13,3,2024,1,5,Chevalier,Physique
|
||||
16,13,3,2024,1,9,Chevalier,Physique
|
||||
16,13,3,2024,2,0,none,none
|
||||
16,13,3,2024,2,0,none,none
|
||||
16,13,3,2024,2,0,none,none
|
||||
17,13,3,2024,1,3,De_Roux,Physique
|
||||
17,13,3,2024,1,0,none,none
|
||||
17,13,3,2024,1,0,none,none
|
||||
18,13,3,2024,1,0,none,none
|
||||
14,14,3,2024,1,0,none,none
|
||||
15,14,3,2024,1,0,none,none
|
||||
18,14,3,2024,1,12,Rapin,Maths
|
||||
18,14,3,2024,1,0,none,none
|
||||
18,13,3,2024,1,4,Le_Gouriellec,Anglais
|
||||
14,14,3,2024,1,10,Le_Gouriellec,Anglais
|
||||
15,14,3,2024,1,12,Le_Gouriellec,Anglais
|
||||
18,14,3,2024,1,5,Rapin,Maths
|
||||
18,14,3,2024,1,14,Le_Gouriellec,Anglais
|
||||
16,15,3,2024,1,0,none,none
|
||||
17,15,3,2024,1,13,Oubaha,Maths
|
||||
18,15,3,2024,1,15,Oubaha,Maths
|
||||
17,15,3,2024,1,7,Oubaha,Maths
|
||||
18,15,3,2024,1,3,Oubaha,Maths
|
||||
|
|
|
|||
|
|
|
@ -350,7 +350,7 @@ creneau* import_creneaux_oneweek(char* filename, int len_file, int n_weeks) {
|
|||
}
|
||||
|
||||
/*for(int k = 0; k < len_file*n_weeks; k++) {
|
||||
printf("%d %d %d %d\n", edt[k].date.hour, edt[k].date.day, edt[k].date.month, edt[k].date.year);
|
||||
printf("%d %d %d %d %d %d\n", edt[k].date.hour, edt[k].date.day, edt[k].date.month, edt[k].date.year, edt[k].group, (int)(edt[k].mat));
|
||||
}*/
|
||||
|
||||
if(!is_sorted(edt, n_weeks*len_file)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue