modif calcul des poids
merge conflicts resolved