vergnet/BE-GRAPH
1
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

Fixed costs source

瀏覽代碼
This commit is contained in:
Arnaud Vergnet 2020-03-30 16:05:47 +02:00
父節點 b2aa8243cc
當前提交 daec1d198f
共有 1 個文件被更改，包括 3 次插入 和 4 次删除
Show stats Download patch file Download diff file Expand all files Collapse all files

7
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
查看文件

@ -49,13 +49,12 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
notifyNodeReached(arc.getDestination()); notifyNodeReached(arc.getDestination());
if (current.isNotMarked() && data.isAllowed(arc)) { if (current.isNotMarked() && data.isAllowed(arc)) {
this.updateCost(arc, parent, current, heap); this.updateCost(arc, parent, current, heap, data);
} }
} }
} }
System.out.println("Nb itérations: " + iterationCounter); System.out.println("Nb itérations: " + iterationCounter);
ShortestPathSolution solution = null; ShortestPathSolution solution = null;
// Destination has no predecessor, the solution is infeasible... // Destination has no predecessor, the solution is infeasible...
if (labels[destination].getFatherArc() == null) { if (labels[destination].getFatherArc() == null) {
solution = new ShortestPathSolution(data, AbstractSolution.Status.INFEASIBLE); solution = new ShortestPathSolution(data, AbstractSolution.Status.INFEASIBLE);
@ -81,8 +80,8 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
return solution; return solution;
} }
private void updateCost(Arc arc, Label parent, Label current, BinaryHeap<Label> heap) { private void updateCost(Arc arc, Label parent, Label current, BinaryHeap<Label> heap, ShortestPathData data) {
double newCost = parent.getCost() + arc.getLength(); double newCost = parent.getCost() + data.getCost(arc);
if (newCost < current.getCost()) { if (newCost < current.getCost()) {
try { try {
heap.remove(current); heap.remove(current);