modification de la fonction du dépassement des contraintes pour correspondre au fctment du panier

src/main.h

@@ -40,7 +40,7 @@ int recherche(int val, int tab[], int tlog);
 
 //! PANIER
 void clientConstraint(float *weight, float *volume, float *price);
-int constraintExceeded(float weightConstraint, float volumeConstraint, float *priceConstraint, float tabWeight[], float tabVolume[], float tabUnitPrice[], int tabQuantity[], int tlog, float *cagnotte);
+int constraintExceeded(float weightConstraint, float volumeConstraint, float *priceConstraint, float *cagnotte, float tabWeight[], float tabVolume[], float tabPrice[], int tabItemRef[], int tabBasketRef[], int tabBasketQuantity[], int tlogItem, int tlogBasket)
 int basket_add (int tab_reference[], float weight[], float volume[], float unitPrice[], float *cagnotte, int  basket_tab_ref[], int basket_tab_qte[],int tlog, int tlog_basket);
 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);
 int reinit_basket(int tlog_basket);

src/panier.c

@@ -51,17 +51,19 @@ void clientConstraint(float *weight, float *volume, float *price)
  * @return an integer value.
  */
 // TODO réécrire cette documentation
-int constraintExceeded(float weightConstraint, float volumeConstraint, float *priceConstraint, float tabWeight[], float tabVolume[], float tabUnitPrice[], int tabQuantity[], int tlog, float *cagnotte)
+int constraintExceeded(float weightConstraint, float volumeConstraint, float *priceConstraint, float *cagnotte, float tabWeight[], float tabVolume[], float tabPrice[], int tabItemRef[], int tabBasketRef[], int tabBasketQuantity[], int tlogItem, int tlogBasket)
 {
+	int index, found, i;
 	float totalWeight = 0, totalVolume = 0, totalPrice = 0, cagnotteUse;
-	int i;
+	for (i=0; i<tlogBasket; i++)
-	for (i=0; i<tlog; i++)
 	{
-		totalWeight += tabWeight[i] * tabQuantity[i];
+		index = searchTab(tabItemRef, tabBasketRef[i], tlogItem, &found);
-		totalVolume += tabVolume[i] * tabQuantity[i];
+		if (found == 1)
+		{
+			totalWeight += tabWeight[index] * tabBasketQuantity[i];
+			totalVolume += tabVolume[index] * tabBasketQuantity[i];
 			if (*priceConstraint != -1)
-			totalPrice += tabUnitPrice[i] * tabQuantity[i];
+				totalPrice += tabPrice[index] * tabBasketQuantity[i];
-		
 			if (totalWeight > weightConstraint)
 			{
 				printf("Attention, la contrainte de charge maximale du véhicule a été dépassée de %.2f, veuillez retirer un article\n", totalWeight - weightConstraint);
@@ -101,6 +103,7 @@ int constraintExceeded(float weightConstraint, float volumeConstraint, float *pr
 				}
 			}
 		}
+	}
 	return 0;
 }