favary/BE_graphes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ajout de tas.isValid et vérifications (sans junit)

Browse source
This commit is contained in:
Favary Pierre 2021-04-26 17:28:47 +02:00
parent 31de9cb5f5
commit ce16e03284
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
View file

@ -44,12 +44,15 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
tablabel[x].marque=true;
this.notifyNodeMarked(tablabel[x].sommet_courant);
//System.out.printf("%f\n",tablabel[x].cout);
//System.out.printf("%d\n",tablabel[x].sommet_courant.getNumberOfSuccessors());
nomark--;
int y;
for (Arc arcy: tablabel[x].sommet_courant.getSuccessors()) {
y=arcy.getDestination().getId();
//System.out.println(tas.isValid());
if (!tablabel[y].marque && data.isAllowed(arcy)) {//ligne 108 de l'excel d'avancement

17
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
View file

@ -208,5 +208,20 @@ public class BinaryHeap<E extends Comparable<E>> implements PriorityQueue<E> {
public String toString() {
return BinaryHeapFormatter.toStringTree(this, 8);
}
public boolean isValid() {//utilisé pour la vérification du Dijkstra
boolean reponse=true;
if (this.isEmpty()) {
BinaryHeap<E> copie=new BinaryHeap<E>(this);
E prec=null;
E nouv=null;
while (!copie.isEmpty() && reponse) {
nouv=this.deleteMin();
if (prec.compareTo(nouv)>0)
reponse=false;
prec=nouv;
}
}
return reponse;
}
}