You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/06/29 03:26:09 UTC
svn commit: r1140936 - in
/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath:
AStar.java Dijkstra.java
Author: simonetripodi
Date: Wed Jun 29 01:26:09 2011
New Revision: 1140936
URL: http://svn.apache.org/viewvc?rev=1140936&view=rev
Log:
used proper Queue methods
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/Dijkstra.java
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.java?rev=1140936&r1=1140935&r2=1140936&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.java Wed Jun 29 01:26:09 2011
@@ -101,7 +101,7 @@ public final class AStar
WE edge = graph.getEdge( current, v );
Double tentativeGScore = gScores.getWeight( current ) + edge.getWeight();
- if ( openSet.add( v ) || tentativeGScore.compareTo( gScores.getWeight( v ) ) < 0 )
+ if ( openSet.offer( v ) || tentativeGScore.compareTo( gScores.getWeight( v ) ) < 0 )
{
predecessors.addPredecessor( v, current );
gScores.setWeight( v, tentativeGScore );
Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/Dijkstra.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/Dijkstra.java?rev=1140936&r1=1140935&r2=1140936&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/Dijkstra.java (original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/Dijkstra.java Wed Jun 29 01:26:09 2011
@@ -93,7 +93,7 @@ public final class Dijkstra
{
// assign new shortest distance and mark unsettled
shortestDistances.setWeight( v, shortDist );
- unsettledNodes.add( v );
+ unsettledNodes.offer( v );
// assign predecessor in shortest path
predecessors.addPredecessor( v, vertex );