alejeune/BE_Graphe_alejeune_rlacroix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

aded comments

Browse source
This commit is contained in:
Lacroix Raphael 2022-05-28 14:21:59 +02:00
parent 60a9d2e296
commit d2a9172b7b
3 changed files with 9 additions and 3 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/utils/Label.java
View file

@ -48,12 +48,13 @@ public class Label implements Comparable<Label> {
} }
public int compareTo(Label other) { public int compareTo(Label other) {
// compares the total cost
if (this.getTotalCost() < other.getTotalCost()) { if (this.getTotalCost() < other.getTotalCost()) {
return -1; return -1;
} else { } else {
if (this.getTotalCost() > other.getTotalCost()) { if (this.getTotalCost() > other.getTotalCost()) {
return 1; return 1;
} else { // same total cost } else { // same total cost ==> tie breaker : Crowcost
double thisCrowCost = this.getTotalCost()-this.getCost(); double thisCrowCost = this.getTotalCost()-this.getCost();
double otherCrowCost = other.getTotalCost()-other.getCost(); double otherCrowCost = other.getTotalCost()-other.getCost();

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

@ -7,11 +7,13 @@ import org.insa.graphs.model.Node;
public class LabelStar extends Label{ public class LabelStar extends Label{
private double crowCost; private double crowCost; // used for the approximate crow distance
// we can either run the A* with respect to time or to distance hence the 2 separate constructors
public LabelStar(Node currNode, boolean marked, Arc father, Node dest, double maxSpeed){ public LabelStar(Node currNode, boolean marked, Arc father, Node dest, double maxSpeed){
super(currNode,marked,father); super(currNode,marked,father);
this.crowCost = currNode.getPoint().distanceTo(dest.getPoint())/(maxSpeed*3.6); this.crowCost = currNode.getPoint().distanceTo(dest.getPoint())/(maxSpeed*3.6);
} }
public LabelStar(Node currNode, boolean marked, Arc father, Node dest){ public LabelStar(Node currNode, boolean marked, Arc father, Node dest){

3
be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java
View file

@ -201,6 +201,9 @@ public class Launch {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// === these file are local the paths need to be adapted ===
// Due to the size of the files we chose not to include these in the git repository
// Visit these directory to see the list of available files on Commetud. // Visit these directory to see the list of available files on Commetud.
//final String mapName = "/home/rlacroix/Bureau/3MIC/Be Graphe/mapinsa/insa.mapgr"; //final String mapName = "/home/rlacroix/Bureau/3MIC/Be Graphe/mapinsa/insa.mapgr";
//final String mapName = "/home/rlacroix/Bureau/3MIC/Be Graphe/mapinsa/carre-dense.mapgr"; //final String mapName = "/home/rlacroix/Bureau/3MIC/Be Graphe/mapinsa/carre-dense.mapgr";