|
|
|
@ -60,25 +60,6 @@ void gestionElementsRestants(ListeDevis *mergedList, ListeDevis *last, ListeDevi
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// cas en dehors de la taille logique
|
|
|
|
|
void gestionElementsHorsTailleLogique(ListeDevis *mergedList, ListeDevis *last, ListeDevis *source, int *k)
|
|
|
|
|
{
|
|
|
|
|
while (*source)
|
|
|
|
|
{
|
|
|
|
|
if (!*mergedList)
|
|
|
|
|
*mergedList = *last = (ListeDevis)malloc(sizeof(MaillonDevis));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
(*last)->suiv = (ListeDevis)malloc(sizeof(MaillonDevis));
|
|
|
|
|
*last = (*last)->suiv;
|
|
|
|
|
}
|
|
|
|
|
(*last)->dev = (*source)->dev;
|
|
|
|
|
*source = (*source)->suiv;
|
|
|
|
|
(*last)->suiv = NULL;
|
|
|
|
|
(*k)++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// fusion de maillons
|
|
|
|
|
void fusionMaillonDevis(ListeDevis R, int tlogR, ListeDevis S, int tlogS, ListeDevis *T)
|
|
|
|
|
{
|
|
|
|
@ -93,8 +74,6 @@ void fusionMaillonDevis(ListeDevis R, int tlogR, ListeDevis S, int tlogS, ListeD
|
|
|
|
|
fusionDevisElements (&R, &tlogR, &S, &tlogS, &mergedList, &last, &k);
|
|
|
|
|
gestionElementsRestants (&mergedList, &last, &R, &tlogR, &k);
|
|
|
|
|
gestionElementsRestants (&mergedList, &last, &S, &tlogS, &k);
|
|
|
|
|
gestionElementsHorsTailleLogique (&mergedList, &last, &R, &k);
|
|
|
|
|
gestionElementsHorsTailleLogique (&mergedList, &last, &S, &k);
|
|
|
|
|
|
|
|
|
|
*T = mergedList;
|
|
|
|
|
}
|
|
|
|
|