geoffrey/s6-pa-tp
geoffrey/s6-pa-tp
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

TP5 Questions supplémentaires

Browse source
This commit is contained in:
Geoffrey Frogeye 2017-03-17 09:39:42 +01:00
parent 46b1ecc22c
commit 1e9f628d4c
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
TP5/supplementaires.c
View file

@ -87,7 +87,7 @@ void details(Cellule *l, char nom) {
printf("\nListe %c :\n", nom); printf("\nListe %c :\n", nom);
imprimer(l); imprimer(l);
if (est_trie(l)) { if (est_trie(l)) {
printf("→ Est trié\n"); printf("→ Est triée\n");
} else { } else {
printf("→ N'est pas triée\n"); printf("→ N'est pas triée\n");
} }
@ -101,9 +101,7 @@ Cellule* union_me(Cellule* j, Cellule* k) {
return NULL; return NULL;
} else { } else {
u = union_me(NULL, k->suiv); u = union_me(NULL, k->suiv);
for (i = 0; i < k->mult; i++) { ajout_tete(&u, k->val, k->mult);
inserer(&u, k->val);
}
return u; return u;
} }
} else { } else {
@ -129,7 +127,7 @@ Cellule* intersection_me(Cellule* j, Cellule* k) {
} else if (j->val == k->val) { } else if (j->val == k->val) {
Cellule* i; Cellule* i;
i = intersection_me(j->suiv, k->suiv); i = intersection_me(j->suiv, k->suiv);
inserer(&i, min(j->val, k->val)); ajout_tete(&i, j->val, min(j->mult, k->mult));
return i; return i;
} else if (j->val < k->val) { } else if (j->val < k->val) {
return intersection_me(j->suiv, k); return intersection_me(j->suiv, k);
@ -138,6 +136,29 @@ Cellule* intersection_me(Cellule* j, Cellule* k) {
} }
} }
Cellule* difference_me(Cellule* j, Cellule* k) {
Cellule* i;
if (k == NULL && j == NULL) {
i = NULL;
} else if (j == NULL) {
i = difference_me(NULL, k->suiv);
ajout_tete(&i, k->val, - k->mult);
} else if (k == NULL) {
i = difference_me(j->suiv, NULL);
ajout_tete(&i, j->val, j->mult);
} else if (j->val == k->val) {
i = difference_me(j->suiv, k->suiv);
ajout_tete(&i, j->val, j->mult - k->mult);
} else if (j->val < k->val) {
i = difference_me(j->suiv, k);
ajout_tete(&i, j->val, j->mult);
} else {
i = difference_me(j, k->suiv);
ajout_tete(&i, k->val, - k->mult);
}
return i;
}
int main() { int main() {
Cellule* j = NULL; Cellule* j = NULL;
@ -164,5 +185,7 @@ int main() {
Cellule* i = intersection_me(j, k); Cellule* i = intersection_me(j, k);
details(i, 'i'); details(i, 'i');
Cellule* d = difference_me(j, k);
details(d, 'd');
} }