From 25d2f1cf6f9952456f27a9ad9e4f48e948c56ffd Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20161>
Date: Tue, 4 Apr 2023 16:16:37 +0200
Subject: [PATCH] remove

---
 .../graphs/algorithm/utils/BinaryHeap.java    |  19 +++++++++---------
 .../graphs/algorithm/utils/BinaryHeap.class   | Bin 4833 -> 4652 bytes
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
index f99502b..31e7190 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
@@ -136,18 +136,17 @@ public class BinaryHeap<E extends Comparable<E>> implements PriorityQueue<E> {
     }
 
     @Override
-    // on est là 
+    // on est là : tout faux utilise paircolletdown
     public void remove(E x) throws ElementNotFoundException {
-        ArrayList<E> temp = new ArrayList<E>();
-        for (E e : array){
-            if (e != x){
-                temp.add(e);
-            }
+        int id = array.indexOf(x);
+        if (this.isEmpty() || this.size()==0 || id >= currentSize || id == -1){
+            throw new ElementNotFoundException(x);
+        }else {
+            this.array.set(array.indexOf(x), this.array.get(currentSize-1));
+            currentSize--;
+            percolateUp(id);
+            percolateDown(id);
         }
-        for (int i=array.indexOf(x);i<array.size()-1;i++){
-            array.set(i, temp.get(i-1));
-        }
-
     }
 
     @Override
diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/utils/BinaryHeap.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/utils/BinaryHeap.class
index 54860baa79d780060e3b398a580d12d2830ec367..f815d5f563bf01b959cb35aa32a7add2fc1661f9 100644
GIT binary patch
delta 865
zcmZuvOK%cU6#nj%GSH$9lPJMKtp)_9nl`CXW8<SWaU)Ib!Z!Gb8DO*^rGi)ytyJ;-
zjJ?LBwF|AfGsZ@Rrj3uJI~Q(TyKv#se_+&eN9sb^oO{lh?|$ER&YiD;=YHkm&$)L1
zHsO{Gi9zRXNuSyF-PX02K~828W})|J6Bv>%9Kb=5g_{sZ+Jz+;VptxEq>K@xEp23u
zwe`kQW<1{+?q`sa3BJ%6wB;B&iL!++wFkUexEY)YGi~P0o@7RlopxauCwRYor*jk~
z8Rr=~gaviaaBj%R=gpi8MT{|Yg}A{saJ$^=7{wJA${2ffSniWc_=ZL_&<HX8H9V~q
znA`OV1}EX6BQ*iVM}2h~4xjW0u6e|xtyLU<FTjfzYPo7lRIuX%x+`cO(4%zAmUshI
z_f>I3guWS4vB67m9UK&I!->)z_;D8-aSuHh#{f7E;XVvJz)FI&{ILcNKB~whBG^oG
zI}t^ONF=PH?g~1^Hw~)=$U<!))K<#rS$@FJ98}V#h%QD=8&z2}Q?^FJNi3sekT@8f
znwWk9&GX1ctH^Ur@i`}n<sqS__%5YAe5wx3BFhv}i)Dt0WrR;C9qz}p-f4371Z(jW
z>+y_#Q9R8BYYL5if;0S=qIDJ^{8}|-!buTlDGF!ZHD`8Rn#H-7)M>DmXt(^n;QQUd
za1j@3=m??3Htf1q2R+C4sUCKbzjb@{@?VABH3eB$FU{iezY+`MYA{@`ukauElcjLg
cQn*$}L2=Yk_&lx#+!C&nZwWW7hmmmeH+XTC!~g&Q

delta 1064
zcmaJ<OHUI~6#njXrqh-YT0$XM>mz{Bp#&083`8`T7?lDsE{Ni$(9sr4fifWCqbd(k
z<e{Sy6%$|R#zcvxq9p3Vl^Ztx0F7=<bmz)?W;(DCVkUFv-gCe2JLi07o)vyAa(?>r
z_8ovK%!uF^WX;9N^EE&CM3})AQI&X5?TRzxmiPi4!Tw-*pBjml?>FPM8R$S%#0iG%
z)wdEl5o6$E%7Ds{v#bye#*UXaw{<A(s=@D;(1TV6F&yk|BB%p7=#{)s(LljSETjxH
zA0ru6>Fj1;3cV36EEKcT+O)8*fZ?2kBWQJC5H1FLNQo+{(in+3z;IE*08VMYgkAPA
zToG}Zp;GTKb8lC?GpJG<5=Jnt^;i?OF<g@{iSd`etp~*f+XjIiAhd{_!>^IsD8E8p
z5=ssK6#4o58$=jBpuVZBbPjfZSrYyhJ=(=^C-qIomL?IeBdosn`n`N8i8>-AQPDDN
zVcxV{2_Jfp`Z7;>c;wT%6?R%Dkg!oHn=pk!Ohcx96*TO|4IH9xJ7%z+U{&b?;lTzv
zQK<-EJ9TZtQS`w9jubM`PcaL2lJrTsvA|16nbPTa4>syVgIT@8l)xoSYBdpd5WojM
zMRO5EFcI}4ZABVA+$p%huLK!INQEpXS{u=LIt@|{pjyr#i@ssn5eyzViL<wnv4}x(
zH}PJ#!;*IB1zo$-c4U$caF>$J68oMuo>k#H{~z^P%BV9+Nd1ELJ*%?vA$jzO`h1Kn
zm?ICK7|v}@qfF-n6ky13&VzLr)($v5wL{STFwV5oYaYQUt$GjjW)D`GTfil~T#GS0
ztI^qW?Y^_vH-f7sIzVWSFjm>K26|EZ>C9sjTFRd1XEf*K9DB?hqMSXofa!meeAF6T
r#lFe4ldM878A-0|Nd!he(5SZLa%ZoCeJ0T&7e{}YKCheR+;05^4Hm*6