AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

What's everyone's favourite kind of safety?

Browse Source 
Type Safety!!


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@19 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Mark Johnson
2006-07-22 00:35:05 +00:00
parent 6913e5a127
commit 5376be6a88
2 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/util/AStarPathUtil.java
+77 -76
View File
@@ -133,52 +133,52 @@ public class AStarPathUtil
* *
* @return the list of points in the path. * @return the list of points in the path.
*/ */
public static List getPath (TraversalPred tpred, Stepper stepper, public static List<Point> getPath (
Object trav, int longest, int ax, int ay, TraversalPred tpred, Stepper stepper, Object trav, int longest,
int bx, int by, boolean partial) int ax, int ay, int bx, int by, boolean partial)
{ {
Info info = new Info(tpred, trav, longest, bx, by); Info info = new Info(tpred, trav, longest, bx, by);
// set up the starting node // set up the starting node
Node s = info.getNode(ax, ay); Node s = info.getNode(ax, ay);
s.g = 0; s.g = 0;
s.h = getDistanceEstimate(ax, ay, bx, by); s.h = getDistanceEstimate(ax, ay, bx, by);
s.f = s.g + s.h; s.f = s.g + s.h;
// push starting node on the open list // push starting node on the open list
info.open.add(s); info.open.add(s);
_considered = 1; _considered = 1;
// track the best path // track the best path
float bestdist = Float.MAX_VALUE; float bestdist = Float.MAX_VALUE;
Node bestpath = null; Node bestpath = null;
// while there are more nodes on the open list // while there are more nodes on the open list
while (info.open.size() > 0) { while (info.open.size() > 0) {
// pop the best node so far from open // pop the best node so far from open
Node n = (Node)info.open.first(); Node n = (Node)info.open.first();
info.open.remove(n); info.open.remove(n);
// if node is a goal node // if node is a goal node
if (n.x == bx && n.y == by) { if (n.x == bx && n.y == by) {
// construct and return the acceptable path // construct and return the acceptable path
return getNodePath(n); return getNodePath(n);
} else if (partial) { } else if (partial) {
float pathdist = MathUtil.distance(n.x, n.y, bx, by); float pathdist = MathUtil.distance(n.x, n.y, bx, by);
if (pathdist < bestdist) { if (pathdist < bestdist) {
bestdist = pathdist; bestdist = pathdist;
bestpath = n; bestpath = n;
}
} }
}
// consider each successor of the node // consider each successor of the node
stepper.init(info, n); stepper.init(info, n);
stepper.considerSteps(n.x, n.y); stepper.considerSteps(n.x, n.y);
// push the node on the closed list // push the node on the closed list
info.closed.add(n); info.closed.add(n);
} }
// return the best path we could find if we were asked to do so // return the best path we could find if we were asked to do so
if (bestpath != null) { if (bestpath != null) {
@@ -193,8 +193,9 @@ public class AStarPathUtil
* Gets a path with the default stepper which assumes the piece can * Gets a path with the default stepper which assumes the piece can
* move one in any of the eight cardinal directions. * move one in any of the eight cardinal directions.
*/ */
public static List getPath (TraversalPred tpred, Object trav, int longest, public static List<Point> getPath (
int ax, int ay, int bx, int by, boolean partial) TraversalPred tpred, Object trav, int longest,
int ax, int ay, int bx, int by, boolean partial)
{ {
return getPath( return getPath(
tpred, new Stepper(), trav, longest, ax, ay, bx, by, partial); tpred, new Stepper(), trav, longest, ax, ay, bx, by, partial);
@@ -226,40 +227,40 @@ public class AStarPathUtil
return; return;
} }
// calculate the new cost for this node // calculate the new cost for this node
int newg = n.g + cost; int newg = n.g + cost;
// make sure the cost is reasonable // make sure the cost is reasonable
if (newg > info.maxcost) { if (newg > info.maxcost) {
// Log.info("Rejected costly step."); // Log.info("Rejected costly step.");
return;
}
// retrieve the node corresponding to this location
Node np = info.getNode(x, y);
// skip if it's already in the open or closed list or if its
// actual cost is less than the just-calculated cost
if ((info.open.contains(np) || info.closed.contains(np)) &&
np.g <= newg) {
return; return;
} }
// retrieve the node corresponding to this location // remove the node from the open list since we're about to
Node np = info.getNode(x, y); // modify its score which determines its placement in the list
info.open.remove(np);
// skip if it's already in the open or closed list or if its // update the node's information
// actual cost is less than the just-calculated cost np.parent = n;
if ((info.open.contains(np) || info.closed.contains(np)) && np.g = newg;
np.g <= newg) { np.h = getDistanceEstimate(np.x, np.y, info.destx, info.desty);
return; np.f = np.g + np.h;
}
// remove the node from the open list since we're about to // remove it from the closed list if it's present
// modify its score which determines its placement in the list info.closed.remove(np);
info.open.remove(np);
// update the node's information // add it to the open list for further consideration
np.parent = n; info.open.add(np);
np.g = newg;
np.h = getDistanceEstimate(np.x, np.y, info.destx, info.desty);
np.f = np.g + np.h;
// remove it from the closed list if it's present
info.closed.remove(np);
// add it to the open list for further consideration
info.open.add(np);
_considered++; _considered++;
} }
@@ -272,21 +273,21 @@ public class AStarPathUtil
* *
* @return the list detailing the path. * @return the list detailing the path.
*/ */
protected static List getNodePath (Node n) protected static List<Point> getNodePath (Node n)
{ {
Node cur = n; Node cur = n;
ArrayList path = new ArrayList(); ArrayList<Point> path = new ArrayList<Point>();
while (cur != null) { while (cur != null) {
// add to the head of the list since we're traversing from // add to the head of the list since we're traversing from
// the end to the beginning // the end to the beginning
path.add(0, new Point(cur.x, cur.y)); path.add(0, new Point(cur.x, cur.y));
// advance to the next node in the path // advance to the next node in the path
cur = cur.parent; cur = cur.parent;
} }
return path; return path;
} }
/** /**
@@ -318,10 +319,10 @@ public class AStarPathUtil
public Object trav; public Object trav;
/** The set of open nodes being searched. */ /** The set of open nodes being searched. */
public SortedSet open; public SortedSet<Node> open;
/** The set of closed nodes being searched. */ /** The set of closed nodes being searched. */
public ArrayList closed; public ArrayList<Node> closed;
/** The destination coordinates in the tile array. */ /** The destination coordinates in the tile array. */
public int destx, desty; public int destx, desty;
@@ -342,8 +343,8 @@ public class AStarPathUtil
this.maxcost = longest * ADJACENT_COST; this.maxcost = longest * ADJACENT_COST;
// construct the open and closed lists // construct the open and closed lists
open = new TreeSet(); open = new TreeSet<Node>();
closed = new ArrayList(); closed = new ArrayList<Node>();
} }
/** /**
@@ -390,7 +391,7 @@ public class AStarPathUtil
// note: this _could_ break for unusual values of x and y. // note: this _could_ break for unusual values of x and y.
// perhaps use a IntTuple as a key? Bleah. // perhaps use a IntTuple as a key? Bleah.
int key = (x << 16) | (y & 0xffff); int key = (x << 16) | (y & 0xffff);
Node node = (Node) _nodes.get(key); Node node = _nodes.get(key);
if (node == null) { if (node == null) {
node = new Node(x, y); node = new Node(x, y);
_nodes.put(key, node); _nodes.put(key, node);
@@ -399,7 +400,7 @@ public class AStarPathUtil
} }
/** The nodes being considered in the path. */ /** The nodes being considered in the path. */
protected HashIntMap _nodes = new HashIntMap(); protected HashIntMap<Node> _nodes = new HashIntMap<Node>();
} }
/** /**
src/java/com/threerings/miso/client/MisoScenePanel.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class MisoScenePanel extends VirtualMediaPanel
// get a reasonable tile path through the scene // get a reasonable tile path through the scene
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
List points = AStarPathUtil.getPath( List<Point> points = AStarPathUtil.getPath(
this, sprite, longestPath, src.x, src.y, dest.x, dest.y, loose); this, sprite, longestPath, src.x, src.y, dest.x, dest.y, loose);
long duration = System.currentTimeMillis() - start; long duration = System.currentTimeMillis() - start;