From f51d3a26b5ee7f413ab0a1b4895850fa99ed9ce8 Mon Sep 17 00:00:00 2001
From: Clement LACAU <lacau@insa-toulouse.fr>
Date: Thu, 18 Apr 2024 01:05:14 +0200
Subject: [PATCH] few fixes: dijkstra

---
 .../shortestpath/DijkstraAlgorithm.java       | 60 +++++++++++++------
 .../graphs/algorithm/utils/BinaryHeap.java    |  2 +-
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
index c89baa9..b8bcec8 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
@@ -21,7 +21,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         // TODO:
 
         // Heap of "sommets"
-        BinaryHeap<Label> queue = new BinaryHeap<Label>(); // change to a comparable type
+        BinaryHeap<Label> labels = new BinaryHeap<Label>(); // change to a comparable type
 
         Graph graph = data.getGraph();
         final int nbNodes = graph.size();
@@ -35,41 +35,65 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         notifyOriginProcessed(data.getOrigin());
 
         // Init Dijkstra
-        ArrayList<Label> labels = new ArrayList<Label>();
+        //ArrayList<Label> labels = new ArrayList<Label>();
         for (Node node : graph.getNodes()) {
-            labels.add(new Label(node));
+            labels.insert(new Label(node));
         }
         // Nodes set
-        for (Label label : labels) {
+        for (Label label : labels.array) {
             label.marked = false;
             label.setPathCost(Float.MAX_VALUE);
             label.parentNode = null;
         }
         // Origin set
-        Label s = labels.get(0);
+        Label s = labels.array.get(0);
         s.setPathCost(0);
-        queue.insert(s);
+        labels.insert(s);
 
         boolean trouve = false; // TODO : breaking condition
         Label x;
-        while (!queue.isEmpty() && !trouve) {
-            x = queue.ExtractMin(); 
+        while (!labels.isEmpty() && !trouve) {
+            x = labels.deleteMin();
             x.mark();
 
-            for (Arc arc : x.node.getSuccessors()) {
-                // TODO : Retrieve label with node 
-                Label y;
-                if (!arc.getDestination().marked) {
-                    float new_cost = x.getCost() + (float) data.getCost(arc);
-                    if (y.getCost() > new_cost) {
-                    y.setPathCost(new_cost);
-                    queue.insert(y);
-                    y.setParentNode(x.getNode());
+            // y shall be all the successors of x
+            float arc_cost = 0;
+            for (Label y : labels.array) {
+                if (y.getParentNode() == x.getNode()) {
+                    if (y.isMarked()) {
+                        // This loop serves to get the lentgh of the arc as 
+                        // we know its origin and destination
+                        for (Arc arc : x.getNode().getSuccessors()) {
+                            if (y.getNode() == arc.getDestination()) {
+                                arc_cost = arc.getLength();
+                            }
+                        }
+                        float new_cost = x.getCost() + arc_cost;
+                        if (y.getCost() > new_cost) {
+                        y.setPathCost(new_cost);
+                        labels.insert(y);
+                        y.setParentNode(x.getNode());
+                        }
                     }
-                }
+            }
             }
         }
 
+        // Create the path ...
+        ArrayList<Arc> arcs_path = new ArrayList<>();
+        Label dest;
+        for (Label label : labels.array) {
+            if (label.getNode() == data.getDestination()){
+                dest = label;
+            }
+        }
+
+        Node current = dest.getParentNode();
+        while (current != null) {
+            current 
+        }
+            arc = predecessorArcs[arc.getOrigin().getId()];
+        }
 
         return solution;
     }
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
index 1c607e6..e685114 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/utils/BinaryHeap.java
@@ -17,7 +17,7 @@ public class BinaryHeap<E extends Comparable<E>> implements PriorityQueue<E> {
     private int currentSize;
 
     // The heap array, which can be larger than currentSize.
-    protected final ArrayList<E> array;
+    public final ArrayList<E> array;
 
     /**
      * Construct a new empty binary heap.