implementation de l'algo de marathon et amélioration de la classe de tests launch
This commit is contained in:
parent
9c9fb02a9b
commit
f12e52c93d
6 changed files with 246 additions and 118 deletions
|
|
@ -17,7 +17,8 @@ public class Marathon extends ShortestPathAlgorithm {
|
|||
}
|
||||
|
||||
public Label newLabelMarathon(Node s, ShortestPathData dataPath) {
|
||||
return new LabelMarathon(s, false, Integer.MAX_VALUE, null, s.getPoint().distanceTo(dataPath.getDestination().getPoint()));
|
||||
return new LabelMarathon(s, false, Integer.MAX_VALUE, null,
|
||||
s.getPoint().distanceTo(dataPath.getDestination().getPoint()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -46,7 +47,7 @@ public class Marathon extends ShortestPathAlgorithm {
|
|||
|
||||
Node dest = dataInput.getOrigin().getSuccessors().get(0).getDestination();
|
||||
|
||||
Label xl = tas.findMin();
|
||||
Label xl;
|
||||
boolean possible = true;
|
||||
boolean fini = false;
|
||||
|
||||
|
|
@ -57,6 +58,7 @@ public class Marathon extends ShortestPathAlgorithm {
|
|||
notifyNodeMarked(x);
|
||||
xl.marque = true;
|
||||
possible = false;
|
||||
tas.remove(xl);
|
||||
for (Arc a : x.getSuccessors()) {
|
||||
if (dataInput.isAllowed(a)) {
|
||||
Node n = a.getDestination();
|
||||
|
|
@ -65,22 +67,30 @@ public class Marathon extends ShortestPathAlgorithm {
|
|||
}
|
||||
if (!listLabel[n.getId()].getMarque()) {
|
||||
possible = true;
|
||||
listLabel[n.getId()].update(a, listLabel[x.getId()].getCost() + dataInput.getCost(a));
|
||||
listLabel[n.getId()].update(a,
|
||||
listLabel[x.getId()].getCost() + dataInput.getCost(a));
|
||||
|
||||
if ((!n.equals(dest)) && (listLabel[n.getId()].getCost()) < 43){
|
||||
if ((!n.equals(dest))
|
||||
&& (listLabel[n.getId()].getCost()) < 43) {
|
||||
tas.insert(listLabel[n.getId()]);
|
||||
}
|
||||
if ((n.equals(dest)) && (42<listLabel[n.getId()].getCost()) && (listLabel[n.getId()].getCost()< 43)){
|
||||
if ((n.equals(dest)) && (42 < listLabel[n.getId()].getCost())
|
||||
&& (listLabel[n.getId()].getCost() < 43)) {
|
||||
fini = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
tas.remove(xl);
|
||||
}
|
||||
|
||||
if (!possible) {
|
||||
System.out.println("erreur : parcours non réalisable\n");
|
||||
return null;
|
||||
}
|
||||
else {
|
||||
// when the algorithm terminates, return the solution that has been found
|
||||
if (listLabel[dataInput.getDestination().getId()].getCost() == Double.MAX_VALUE) {
|
||||
if (listLabel[dataInput.getDestination().getId()]
|
||||
.getCost() == Double.MAX_VALUE) {
|
||||
solution = new ShortestPathSolution(dataInput, Status.INFEASIBLE);
|
||||
}
|
||||
else {
|
||||
|
|
@ -104,3 +114,4 @@ public class Marathon extends ShortestPathAlgorithm {
|
|||
return solution;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,11 +5,11 @@ import java.awt.Dimension;
|
|||
import java.io.BufferedInputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.FileInputStream;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
import org.insa.graphs.algorithm.ArcInspector;
|
||||
import org.insa.graphs.algorithm.ArcInspectorFactory;
|
||||
import org.insa.graphs.algorithm.shortestpath.AStarAlgorithm;
|
||||
import org.insa.graphs.algorithm.shortestpath.BellmanFordAlgorithm;
|
||||
|
|
@ -19,11 +19,12 @@ import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution;
|
|||
import org.insa.graphs.gui.drawing.Drawing;
|
||||
import org.insa.graphs.gui.drawing.components.BasicDrawing;
|
||||
import org.insa.graphs.model.Graph;
|
||||
import org.insa.graphs.model.Node;
|
||||
import org.insa.graphs.model.Path;
|
||||
import org.insa.graphs.model.io.BinaryGraphReader;
|
||||
import org.insa.graphs.model.io.BinaryPathReader;
|
||||
import org.insa.graphs.model.io.GraphReader;
|
||||
import org.insa.graphs.model.io.PathReader;
|
||||
|
||||
import org.insa.graphs.gui.simple.ExceptionCheminImpossible;
|
||||
|
||||
public class Launch {
|
||||
|
||||
|
|
@ -32,6 +33,7 @@ public class Launch {
|
|||
*
|
||||
* @return The created drawing.
|
||||
* @throws Exception if something wrong happens when creating the graph.
|
||||
* @throws ExceptionCheminImpossible
|
||||
*/
|
||||
public static Drawing createDrawing() throws Exception {
|
||||
BasicDrawing basicDrawing = new BasicDrawing();
|
||||
|
|
@ -57,103 +59,218 @@ public class Launch {
|
|||
private static BellmanFordAlgorithm bellman;
|
||||
private static AStarAlgorithm AEtoile;
|
||||
private static ShortestPathData data;
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
// visit these directory to see the list of available files on commetud.
|
||||
public static void main(String[] args) throws Exception, ExceptionCheminImpossible {
|
||||
|
||||
// Chemins vers les cartes (les fichiers .path ne sont plus nécessaires ici)
|
||||
final String[] mapName = {
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/france.mapgr"
|
||||
};
|
||||
final String[] pathName = {
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.path",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31_insa_bikini_motorcar.path",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31_insa_bikini_canal.path",
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr_insa_tour.path"
|
||||
};
|
||||
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/france.mapgr" };
|
||||
|
||||
final Graph[] graph = new Graph[4];
|
||||
final Path[] path = new Path[4];
|
||||
Random rand = new Random();
|
||||
|
||||
for (int i = 0 ; i<4 ; i++) {
|
||||
// create a graph reader
|
||||
// for (int i = 0; i < 4; i++) {
|
||||
// Lecture du graphe
|
||||
try (final GraphReader reader = new BinaryGraphReader(new DataInputStream(
|
||||
new BufferedInputStream(new FileInputStream(mapName[i]))))) {
|
||||
new BufferedInputStream(new FileInputStream(mapName[0]))))) {
|
||||
|
||||
// TODO: read the graph
|
||||
graph[i] = reader.read();
|
||||
System.out.println("pas d'erreur au niveau du reader");
|
||||
graph[0] = reader.read();
|
||||
System.out.println("Carte chargée avec succès : " + mapName[0]);
|
||||
}
|
||||
|
||||
// create the drawing
|
||||
// Création de l'affichage graphique
|
||||
final Drawing drawing = createDrawing();
|
||||
drawing.drawGraph(graph[0]);
|
||||
|
||||
// TODO: draw the graph on the drawing
|
||||
drawing.drawGraph(graph[i]);
|
||||
// Nombre de nœuds maximum disponibles sur cette carte
|
||||
int numNodes = graph[0].getNodes().size()-1;
|
||||
|
||||
// TODO: create a path reader
|
||||
try (final PathReader pathReader = new BinaryPathReader(new DataInputStream(
|
||||
new BufferedInputStream(new FileInputStream(pathName[i]))))) {
|
||||
// --- DEBUT DES TESTS ALEATOIRES ---
|
||||
// On crée 10 paires de points aléatoires pour chaque carte
|
||||
int nbTests = 2;
|
||||
for (int t = 1; t <= nbTests; t++) {
|
||||
|
||||
// TODO: read the path
|
||||
path[i] = pathReader.readPath(graph[i]);
|
||||
System.out.println("pas d'erreur au niveau du pathreader");
|
||||
}
|
||||
// Choix de l'origine et de la destination
|
||||
Node origin = graph[0].getNodes().get(rand.nextInt(numNodes));
|
||||
Node destination = graph[0].getNodes().get(rand.nextInt(numNodes));
|
||||
|
||||
// TODO: draw the path on the drawing
|
||||
drawing.drawPath(path[i]);
|
||||
System.out.println(
|
||||
String.format("\n[Test %d/%d] Origine ID: %d | Destination ID: %d",
|
||||
t, nbTests, origin.getId(), destination.getId()));
|
||||
|
||||
|
||||
data = new ShortestPathData(graph[0], origin, destination,
|
||||
ArcInspectorFactory.getAllFilters().get(1));
|
||||
|
||||
data = new ShortestPathData(graph[i], path[i].getOrigin(),path[i].getDestination(), ArcInspectorFactory.getAllFilters().get(i)) ;
|
||||
dijkstra = new DijkstraAlgorithm(data);
|
||||
bellman = new BellmanFordAlgorithm(data);
|
||||
AEtoile = new AStarAlgorithm(data);
|
||||
|
||||
paths = dijkstra.doRun();
|
||||
paths2 = bellman.doRun();
|
||||
paths3 = AEtoile.doRun();
|
||||
|
||||
if (!paths.getPath().isValid()){
|
||||
System.out.println("Pour la carte " + i + ", c'est pas valide");
|
||||
// --- VERIFICATION ET COMPARAISON DES RESULTATS ---
|
||||
|
||||
if (!paths.isFeasible()) {
|
||||
System.out.println("Chemin impossible");
|
||||
// Cas 1 : Aucun chemin trouvé par Dijkstra
|
||||
if (!paths.isFeasible() || paths.getPath() == null) {
|
||||
System.out.println("\n Dijkstra : Aucun chemin trouvé (Infeasible).");
|
||||
|
||||
// Alerte de sécurité si un autre algo prétend en trouver un
|
||||
if (paths2.isFeasible() || paths3.isFeasible()) {
|
||||
System.out.println(
|
||||
"\n Bellman ou A* ont trouvé un chemin alors que Dijkstra dit que c'est impossible !");
|
||||
}
|
||||
throw new ExceptionCheminImpossible("pas de chemin possible");
|
||||
}
|
||||
// Cas 2 : Un chemin a été trouvé
|
||||
else {
|
||||
System.out.println("\n Dijkstra : Chemin trouvé !");
|
||||
|
||||
// Cas particulier : Origine égale à la destination
|
||||
if (origin.equals(destination)) {
|
||||
System.out.println("\n L'origine est égale à la destination.");
|
||||
}
|
||||
|
||||
Path pDijkstra = paths.getPath();
|
||||
Path pBellman = paths2.getPath();
|
||||
Path pAStar = paths3.getPath();
|
||||
|
||||
// Affichage du chemin de Dijkstra sur l'interface
|
||||
drawing.drawPath(pDijkstra);
|
||||
|
||||
// Comparaison des algos Dijkstra et Bellman-Ford
|
||||
if (pBellman != null) {
|
||||
// test sur les distances (on laisse 1 cm de marge)
|
||||
if (Math.abs(pDijkstra.getLength() - pBellman.getLength()) < 1e-2) {
|
||||
System.out
|
||||
.println("\n Même distance entre Dijkstra et Bellman");
|
||||
}
|
||||
else {
|
||||
float diff =
|
||||
Math.abs(pDijkstra.getLength() - pBellman.getLength());
|
||||
System.out.println(
|
||||
"\n Distance différente entre Dijkstra et Bellman --> différence de"
|
||||
+ diff);
|
||||
}
|
||||
// test sur le temps de parcours (on laisse 1 seconde de marge)
|
||||
if (Math.abs(pDijkstra.getMinimumTravelTime()
|
||||
- pBellman.getMinimumTravelTime()) < 1.0) {
|
||||
System.out.println(
|
||||
"\n Même temps de parcours entre Dijkstra et Bellman");
|
||||
}
|
||||
else {
|
||||
double diff = Math.abs(pDijkstra.getMinimumTravelTime()
|
||||
- pBellman.getMinimumTravelTime());
|
||||
System.out.println(
|
||||
"\n Temps différents entre Dijkstra et Bellman --> différence de"
|
||||
+ diff);
|
||||
}
|
||||
}
|
||||
else {
|
||||
System.out.println("Pour la carte " + i + ", c'est valide");
|
||||
if (paths.isFeasible()) {
|
||||
System.out.println("Chemin possible");
|
||||
}
|
||||
//tester si l'origine = destination
|
||||
if (paths.getInputData().getOrigin() == paths.getInputData().getDestination()) {
|
||||
System.out.println("Origine = destination");
|
||||
System.out.println(
|
||||
"\n Probleme : Bellman n'a trouvé aucun chemin alors que Dijkstra oui.");
|
||||
}
|
||||
|
||||
if (Math.abs(paths.getPath().getLength()- paths2.getPath().getLength()) < 1e-6) {
|
||||
System.out.println("Même résultat entre dijkstra et bellman");
|
||||
// Comparaison des algos Dijkstra et A*
|
||||
if (pAStar != null) {
|
||||
// test sur les distances
|
||||
if (Math.abs(pDijkstra.getLength() - pAStar.getLength()) < 1e-2) {
|
||||
System.out.println("\n Même distance entre Dijkstra et A* ");
|
||||
}
|
||||
else {
|
||||
System.out.println("Résultat différent entre dijkstra et A*");
|
||||
float diff2 =
|
||||
Math.abs(pDijkstra.getLength() - pAStar.getLength());
|
||||
System.out.println(
|
||||
" Distance différente entre Dijkstra et A* --> différence de "
|
||||
+ diff2);
|
||||
}
|
||||
|
||||
if (Math.abs(paths.getPath().getLength()- paths3.getPath().getLength()) < 1e-6) {
|
||||
System.out.println("Même résultat entre dijkstra et A*");
|
||||
}else {
|
||||
System.out.println("Résultat différent entre dijkstra et A*");
|
||||
// test sur le temps de parcours
|
||||
if (Math.abs(pDijkstra.getMinimumTravelTime()
|
||||
- pAStar.getMinimumTravelTime()) < 1.0) {
|
||||
System.out.println(
|
||||
"\n Même temps de parcours entre Dijkstra et A*");
|
||||
}
|
||||
|
||||
|
||||
if (i==2) { //on teste au niveau du temps --> demande un ArcInspectorFactory spécial
|
||||
if (Math.abs(paths.getPath().getMinimumTravelTime()- paths2.getPath().getMinimumTravelTime()) < 1e-6) {
|
||||
System.out.println("Même résultat");
|
||||
else {
|
||||
double diff2 = Math.abs(pDijkstra.getMinimumTravelTime()
|
||||
- pAStar.getMinimumTravelTime());
|
||||
System.out.println(
|
||||
"\n Temps différents entre Dijkstra et A* --> différence de"
|
||||
+ diff2);
|
||||
}
|
||||
if (paths.getPath().getMinimumTravelTime()==paths2.getPath().getMinimumTravelTime()) {
|
||||
System.out.println("Dijkstra donne le même résultat que Bellman");
|
||||
}
|
||||
else {
|
||||
System.out.println(
|
||||
"\n Probleme : A* n'a trouvé aucun chemin alors que Dijkstra oui.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- CAS : CHEMIN IMPOSSIBLE ---
|
||||
// PAS FINI (points à récup sur carte)
|
||||
|
||||
Node origin = graph[0].getNodes().get(27869);
|
||||
Node destination = graph[0].getNodes().get(14534);
|
||||
|
||||
System.out.println(String.format(
|
||||
"\n[Test chemin impossible] Origine ID: %d | Destination ID: %d",
|
||||
origin.getId(), destination.getId()));
|
||||
|
||||
data = new ShortestPathData(graph[0], origin, destination,
|
||||
ArcInspectorFactory.getAllFilters().get(0));
|
||||
|
||||
dijkstra = new DijkstraAlgorithm(data);
|
||||
bellman = new BellmanFordAlgorithm(data);
|
||||
AEtoile = new AStarAlgorithm(data);
|
||||
|
||||
paths = dijkstra.doRun();
|
||||
paths2 = bellman.doRun();
|
||||
paths3 = AEtoile.doRun();
|
||||
|
||||
// --- VERIFICATION ---
|
||||
|
||||
if (!paths.isFeasible() || paths.getPath() == null) {
|
||||
System.out.println("\n Dijkstra : Aucun chemin trouvé (Infeasible).");
|
||||
// Alerte de sécurité si un autre algo prétend en trouver un
|
||||
if (paths2.isFeasible() || paths3.isFeasible()) {
|
||||
System.out.println(
|
||||
"\n Bellman ou A* ont trouvé un chemin alors que Dijkstra dit que c'est impossible !");
|
||||
}
|
||||
throw new ExceptionCheminImpossible("pas de chemin possible");
|
||||
}
|
||||
|
||||
// CAS : DEPART = ARRIVEE
|
||||
Node origine = graph[0].getNodes().get(rand.nextInt(numNodes));
|
||||
Node destinations = origine;
|
||||
|
||||
System.out.println(String.format(
|
||||
"\n[Test origine = dest] Origine ID: %d | Destination ID: %d",
|
||||
origine.getId(), destinations.getId()));
|
||||
|
||||
data = new ShortestPathData(graph[0], origine, destinations,
|
||||
ArcInspectorFactory.getAllFilters().get(0));
|
||||
|
||||
dijkstra = new DijkstraAlgorithm(data);
|
||||
bellman = new BellmanFordAlgorithm(data);
|
||||
AEtoile = new AStarAlgorithm(data);
|
||||
|
||||
paths = dijkstra.doRun();
|
||||
paths2 = bellman.doRun();
|
||||
paths3 = AEtoile.doRun();
|
||||
|
||||
// --- VERIFICATION ---
|
||||
|
||||
System.out.println("\n Dijkstra : Chemin trouvé !");
|
||||
|
||||
// Cas particulier : Origine égale à la destination
|
||||
if (origine.equals(destinations)) {
|
||||
System.out.println("\n L'origine est égale à la destination.");
|
||||
}
|
||||
|
||||
// --- FIN DES TESTS ALEATOIRES POUR CETTE CARTE ---
|
||||
// }
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue