lacau/BE_Graphes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor(marathon): remove unused imports & variables

Browse source
This commit is contained in:
Paul Alnet 2024-05-25 14:57:01 +02:00
parent d0e970b2ab
commit 26a662bb1b
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/marathon/MarathonAlgorithm.java
View file

@ -1,24 +1,17 @@
package org.insa.graphs.algorithm.marathon; package org.insa.graphs.algorithm.marathon;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.insa.graphs.algorithm.AbstractAlgorithm;
import org.insa.graphs.algorithm.ArcInspector; import org.insa.graphs.algorithm.ArcInspector;
import org.insa.graphs.algorithm.ArcInspectorFactory; import org.insa.graphs.algorithm.ArcInspectorFactory;
import org.insa.graphs.algorithm.AbstractSolution.Status;
import org.insa.graphs.algorithm.shortestpath.DijkstraAlgorithm; import org.insa.graphs.algorithm.shortestpath.DijkstraAlgorithm;
import org.insa.graphs.algorithm.shortestpath.Label; import org.insa.graphs.algorithm.shortestpath.Label;
import org.insa.graphs.algorithm.shortestpath.ShortestPathAlgorithm; import org.insa.graphs.algorithm.shortestpath.ShortestPathAlgorithm;
import org.insa.graphs.algorithm.shortestpath.ShortestPathData; import org.insa.graphs.algorithm.shortestpath.ShortestPathData;
import org.insa.graphs.algorithm.shortestpath.ShortestPathObserver;
import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution; import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution;
import org.insa.graphs.algorithm.utils.BinaryHeap;
import org.insa.graphs.model.Arc; import org.insa.graphs.model.Arc;
import org.insa.graphs.model.Graph; import org.insa.graphs.model.Graph;
import org.insa.graphs.model.Node; import org.insa.graphs.model.Node;
import org.insa.graphs.model.Path;
import java.util.Random; import java.util.Random;
@ -44,9 +37,7 @@ public class MarathonAlgorithm extends ShortestPathAlgorithm {
@Override @Override
protected ShortestPathSolution doRun() { protected ShortestPathSolution doRun() {
final ShortestPathData data = getInputData(); final ShortestPathData data = getInputData();
ShortestPathSolution solution = null;
final Graph graph = data.getGraph(); final Graph graph = data.getGraph();
final int nbNodes = graph.size();
DijkstraAlgorithm dijkstra = new DijkstraAlgorithm(data); DijkstraAlgorithm dijkstra = new DijkstraAlgorithm(data);
ShortestPathSolution path = dijkstra.run(); ShortestPathSolution path = dijkstra.run();
@ -54,7 +45,6 @@ public class MarathonAlgorithm extends ShortestPathAlgorithm {
while (path.getPath().getLength() < getDistance()) { while (path.getPath().getLength() < getDistance()) {
// Recuperation indices // Recuperation indices
// TODO : A MODIFIER POUR AMELIORER LA COHERENCE DU CHEMIN // TODO : A MODIFIER POUR AMELIORER LA COHERENCE DU CHEMIN
int longueurPath = path.getPath().size();
List<Arc> pathMax = path.getPath().getArcs(); List<Arc> pathMax = path.getPath().getArcs();
float max = 0; float max = 0;
int indiceArcToRemove = 0; //Math.abs(rand.nextInt() % (longueurPath - 1)); int indiceArcToRemove = 0; //Math.abs(rand.nextInt() % (longueurPath - 1));