diff --git a/src/display.c b/src/display.c index 5127a09..fb28a71 100644 --- a/src/display.c +++ b/src/display.c @@ -106,13 +106,11 @@ void displayClientList(int clientID[], float cagnotte[], int suspended[], int is * @param volume: tableau du volume des articles * @param unitPrice: tableau du prix unitaire des articles * @param cagnotte: pointeur indiquant la valeur de la cagnotte - * @param weight_constraint: var float contenant la contrainte de la charge maximale du véicule - * @param volume_constraint: var float contenant la contrainte du volume maximal du véicule * @param tlog: taille logique du tableau `tab_reference` * @param tlog_basket: taille logique du panier * @return Rien */ -void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], float volume[], float unitPrice[], float *cagnotte,float weight_constraint, float volume_constraint, int tlog, int tlog_basket) +void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], float volume[], float unitPrice[], float *cagnotte, int tlog, int tlog_basket) { float total_weight_line[tlog_basket], total_volume_line[tlog_basket], total_price_line[tlog_basket], cagnotte_line[tlog_basket], total_weight, total_volume, total_price; int i; @@ -137,26 +135,27 @@ void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], floa printf("\t\t\t\t\tPrix total à payer: %f\t euros\n", total_price); printf("\t\t\t\t\tCagnotte totale: %f\t euros\n", *cagnotte); + //constraintExceeded( weightConstraint, volumeConstraint, *priceConstraint, *cagnotte, tabWeight[], tabVolume[], tabPrice[], tabItemRef[], tabBasketRef[], tabBasketQuantity[], tlogItem, int tlogBasket) - if (volume_constraint