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/22 00:54:05 UTC
svn commit: r1138236 -
/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.java
Author: simonetripodi
Date: Tue Jun 21 22:54:04 2011
New Revision: 1138236
URL: http://svn.apache.org/viewvc?rev=1138236&view=rev
Log:
no needs to store hScores since they are used just to lookup values
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/shortestpath/AStar.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=1138236&r1=1138235&r2=1138236&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 Tue Jun 21 22:54:04 2011
@@ -66,12 +66,9 @@ public final class AStar
final ShortestDistances<V> gScores = new ShortestDistances<V>();
gScores.setWeight( start, 0D );
- final ShortestDistances<V> hScores = new ShortestDistances<V>();
- gScores.setWeight( start, heuristic.applyHeuristic( start, goal ) );
-
// Estimated total cost from start to goal through y.
final ShortestDistances<V> fScores = new ShortestDistances<V>();
- fScores.setWeight( start, hScores.getWeight( start ) );
+ fScores.setWeight( start, heuristic.applyHeuristic( start, goal ) );
// The set of nodes already evaluated.
final Set<V> closedSet = new HashSet<V>();
@@ -112,8 +109,7 @@ public final class AStar
{
predecessors.addPredecessor( v, edge );
gScores.setWeight( v, tentativeGScore );
- hScores.setWeight( v, heuristic.applyHeuristic( v, goal ) );
- fScores.setWeight( v, gScores.getWeight( v ) + hScores.getWeight( v ) );
+ fScores.setWeight( v, gScores.getWeight( v ) + heuristic.applyHeuristic( v, goal ) );
}
}
}