pfaure/BE-Graphes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remise Du BE - Version fonctionnelle : Correction de l'erreur sur l'estimation dans A*, finalisation des tests d'optimalité, ajout des tests de performances

Browse source
This commit is contained in:
Paul Faure 2020-06-02 17:35:15 +02:00
parent c912cac967
commit 1eef4d2656
7 changed files with 107 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,26 +19,14 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
} }
if (data.getMode() == Mode.LENGTH) { if (data.getMode() == Mode.LENGTH) {
MaxSpeed = 1; MaxSpeed = 1.01;
} else { } else {
MaxSpeed = MaxSpeed / 3.6; MaxSpeed = MaxSpeed / 3.6;
} }
//double longueurArc = 0.0;
for (Node node: data.getGraph().getNodes()) { for (Node node: data.getGraph().getNodes()) {
double estimation = Point.distance(node.getPoint(), data.getDestination().getPoint())/MaxSpeed; double estimation = Point.distance(node.getPoint(), data.getDestination().getPoint())/MaxSpeed;
labels[node.getId()] = new LabelStar(node, estimation); labels[node.getId()] = new LabelStar(node, estimation);
/*if (node.getId() == 6800) {
for (Arc arc: node.getSuccessors()) {
if (arc.getDestination().getId() == 6299) {
longueurArc = arc.getLength();
}
}
}*/
} }
//System.out.println("La distance entre les nodes " + data.getGraph().getNodes().get(6800).getId() + " et " + data.getGraph().getNodes().get(6299).getId() + " est : " + Point.distance(data.getGraph().getNodes().get(6800).getPoint(), data.getGraph().getNodes().get(6299).getPoint()) + " et la longeur de l'arc est : " + longueurArc);
} }
} }

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

@ -55,10 +55,9 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
notifyNodeMarked(current.getSommetCourant()); notifyNodeMarked(current.getSommetCourant());
// POUR LE TEST SUR LES COUTS CROISSANTS // POUR LE TEST SUR LES COUTS CROISSANTS
//System.out.println("Test sur le coût : " + labels[currentID].getTotalCost());
if (labels[currentID].compareTo(labels[ancienID]) == -1) { if (labels[currentID].compareTo(labels[ancienID]) == -1) {
System.out.println("Erreur : Couts non croissants : noeud" + ancienID + " contre " + currentID); System.out.println("Erreur : Couts non croissants : noeud " + ancienID + " (" + labels[ancienID].getTotalCost() + "; " + labels[ancienID].getEstimation() + ") contre " + currentID + " (" + labels[currentID].getTotalCost() + "; " + labels[currentID].getEstimation() + ") ");
} }
ancienID = currentID; ancienID = currentID;
//nbNonMarque--; //nbNonMarque--;
@ -93,8 +92,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
if (compteur_successeurs != labels[currentID].getSommetCourant().getNumberOfSuccessors()) { if (compteur_successeurs != labels[currentID].getSommetCourant().getNumberOfSuccessors()) {
System.out.println("ERREUR Nombre de successeurs visités : " + compteur_successeurs + "/" + labels[currentID].getSommetCourant().getNumberOfSuccessors()); System.out.println("ERREUR Nombre de successeurs visités : " + compteur_successeurs + "/" + labels[currentID].getSommetCourant().getNumberOfSuccessors());
} }
//System.out.println("Nombre de successeurs visités : " + compteur_successeurs + "/" + labels[currentID].getSommetCourant().getNumberOfSuccessors()); }
}
catch (EmptyPriorityQueueException e) { catch (EmptyPriorityQueueException e) {
encore = false; encore = false;
} }

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

@ -51,16 +51,17 @@ public class Label implements Comparable<Label>{
} }
public int compareTo(Label o) { public int compareTo(Label o) {
double epsilon = 0.0;
double diff = this.getTotalCost() - o.getTotalCost(); double diff = this.getTotalCost() - o.getTotalCost();
if (diff < 0.0) { if (diff < -epsilon) {
return -1; return -1;
} else if (diff > 0.0) { } else if (diff > epsilon) {
return 1; return 1;
} else { } else {
diff = this.getEstimation() - o.getEstimation(); diff = this.getEstimation() - o.getEstimation();
if (diff < 0.0) { if (diff < -epsilon) {
return -1; return -1;
} else if (diff > 0.0) { } else if (diff > epsilon) {
return 1; return 1;
} else { } else {
return 0; return 0;

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

@ -17,6 +17,6 @@ public class LabelStar extends Label implements Comparable<Label>{
} }
public double getTotalCost() { public double getTotalCost() {
return this.estimation + this.getCost(); return this.estimation + super.getCost();
} }
} }

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

@ -175,14 +175,18 @@ public class BinaryHeap<E extends Comparable<E>> implements PriorityQueue<E> {
public boolean IsValid() { public boolean IsValid() {
boolean valid = true; boolean valid = true;
int last_element_a_check = (int)(Math.pow(2.0, Math.floor(Math.log(this.currentSize))) - 1); if (!this.isEmpty()) {
int i = 0; int last_element_a_check = (int)(Math.pow(2.0, Math.floor(Math.log(this.currentSize))) - 1);
while (i < last_element_a_check && valid) { int i = 0;
if ((this.array.get(i).compareTo(this.array.get(this.indexLeft(i))) == 1) || (this.array.get(i).compareTo(this.array.get(this.indexLeft(i) + 1))) == 1) { while (i < last_element_a_check && valid) {
valid = false; if (this.indexLeft(i) < this.currentSize && (this.array.get(this.indexLeft(i)).compareTo(this.array.get(i)) == -1)) {
} else { valid = false;
i++; }
} if (this.indexLeft(i)+1 < this.currentSize &&(this.array.get(this.indexLeft(i) + 1).compareTo(this.array.get(i)) == -1)) {
valid = false;
}
i++;
}
} }
return valid; return valid;
} }

22
be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/OptimaliteTest.java
View file

@ -157,26 +157,4 @@ public class OptimaliteTest {
assertEquals(solutionBellmanFord.getPath().getLength(),solutionDijkstra.getPath().getLength(), OptimaliteTest.delta); assertEquals(solutionBellmanFord.getPath().getLength(),solutionDijkstra.getPath().getLength(), OptimaliteTest.delta);
assertEquals(solutionBellmanFord.getPath().getLength(),solutionAStar.getPath().getLength(), OptimaliteTest.delta); assertEquals(solutionBellmanFord.getPath().getLength(),solutionAStar.getPath().getLength(), OptimaliteTest.delta);
} }
@Test
public void testDijkstraPlusRapide() {
// On ne fait le test qu'avec un filtre sur les chemins autorisés
ShortestPathData data = new ShortestPathData(graph, graph.get(75870), graph.get(103867), ArcInspectorFactory.getAllFilters().get(0));
ShortestPathAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathAlgorithm aStar = new AStarAlgorithm(data);
ShortestPathSolution solutionAStar = aStar.run();
ShortestPathSolution solutionDijkstra = dijkstra.run();
assertTrue(solutionDijkstra.getSolvingTime().compareTo(solutionAStar.getSolvingTime()) < 0);
}
@Test
public void testAStarPlusRapide() {
// On ne fait le test qu'avec un filtre sur les chemins autorisés
ShortestPathData data = new ShortestPathData(graph, graph.get(12305), graph.get(103867), ArcInspectorFactory.getAllFilters().get(0));
ShortestPathAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathAlgorithm aStar = new AStarAlgorithm(data);
ShortestPathSolution solutionAStar = aStar.run();
ShortestPathSolution solutionDijkstra = dijkstra.run();
assertTrue(solutionDijkstra.getSolvingTime().compareTo(solutionAStar.getSolvingTime()) > 0);
}
} }

85
be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/PerformancesTest.java Normal file
View file

@ -0,0 +1,85 @@
package org.insa.graphs.algorithm.shortestpath;
import static org.junit.Assert.assertTrue;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.FileInputStream;
import org.insa.graphs.model.io.BinaryGraphReader;
import org.insa.graphs.model.io.GraphReader;
import org.insa.graphs.model.Graph;
import org.insa.graphs.algorithm.shortestpath.DijkstraAlgorithm;
import org.insa.graphs.algorithm.shortestpath.AStarAlgorithm;
import org.insa.graphs.algorithm.ArcInspectorFactory;
import org.insa.graphs.algorithm.shortestpath.ShortestPathData;
public class PerformancesTest {
// Graph utilisé pour les tests
static Graph graph;
//Lecture du graphe
@BeforeClass
public static void initAll() throws Exception {
final String mapName = "/home/paulfaure/Documents/3A/JAVA/Cartes BE/haute-garonne/europe/france/haute-garonne.mapgr";
// Create a graph reader.
final GraphReader reader = new BinaryGraphReader(
new DataInputStream(new BufferedInputStream(new FileInputStream(mapName))));
// Read the graph.
PerformancesTest.graph = reader.read();
reader.close();
}
@Test
public void testDijkstraPlusRapidePetitTrajet() {
// On ne fait le test qu'avec un filtre sur les chemins autorisés
ShortestPathData data = new ShortestPathData(graph, graph.get(87500), graph.get(103867), ArcInspectorFactory.getAllFilters().get(0));
ShortestPathAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathAlgorithm aStar = new AStarAlgorithm(data);
ShortestPathSolution solutionAStar = aStar.run();
ShortestPathSolution solutionDijkstra = dijkstra.run();
assertTrue(solutionDijkstra.getSolvingTime().compareTo(solutionAStar.getSolvingTime()) < 0);
}
@Test
public void testDijkstraPlusRapideCheminNul() {
// On ne fait le test qu'avec un filtre sur les chemins autorisés
ShortestPathData data = new ShortestPathData(graph, graph.get(103867), graph.get(103867), ArcInspectorFactory.getAllFilters().get(0));
ShortestPathAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathAlgorithm aStar = new AStarAlgorithm(data);
ShortestPathSolution solutionAStar = aStar.run();
ShortestPathSolution solutionDijkstra = dijkstra.run();
assertTrue(solutionDijkstra.getSolvingTime().compareTo(solutionAStar.getSolvingTime()) < 0);
}
@Test
public void testDijkstraPlusRapideCheminInexistant() {
// On ne fait le test qu'avec un filtre sur les chemins autorisés
ShortestPathData data = new ShortestPathData(graph, graph.get(135847), graph.get(103867), ArcInspectorFactory.getAllFilters().get(0));
ShortestPathAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathAlgorithm aStar = new AStarAlgorithm(data);
ShortestPathSolution solutionAStar = aStar.run();
ShortestPathSolution solutionDijkstra = dijkstra.run();
assertTrue(solutionDijkstra.getSolvingTime().compareTo(solutionAStar.getSolvingTime()) < 0);
}
@Test
public void testAStarPlusRapideLongTrajet() {
// On ne fait le test qu'avec un filtre sur les chemins autorisés
ShortestPathData data = new ShortestPathData(graph, graph.get(12305), graph.get(103867), ArcInspectorFactory.getAllFilters().get(0));
ShortestPathAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathAlgorithm aStar = new AStarAlgorithm(data);
ShortestPathSolution solutionAStar = aStar.run();
ShortestPathSolution solutionDijkstra = dijkstra.run();
assertTrue(solutionDijkstra.getSolvingTime().compareTo(solutionAStar.getSolvingTime()) > 0);
}
}