👌formatting
This commit is contained in:
parent
e529438c7e
commit
0c7741120a
@ -60,7 +60,7 @@ public class GoalComposite implements Goal {
|
||||
@Override
|
||||
public double heuristic() {
|
||||
double min = Double.MAX_VALUE;
|
||||
for (Goal g: goals) {
|
||||
for (Goal g : goals) {
|
||||
//just take the highest value that is guaranteed to be inside the goal
|
||||
min = Math.min(min, g.heuristic());
|
||||
}
|
||||
|
@ -56,14 +56,14 @@ public class GoalNear implements Goal, IGoalRenderPos {
|
||||
|
||||
@Override
|
||||
public double heuristic() {//TODO less hacky solution
|
||||
int range = (int)Math.ceil(Math.sqrt(rangeSq));
|
||||
int range = (int) Math.ceil(Math.sqrt(rangeSq));
|
||||
HashSet<Double> maybeAlwaysInside = new HashSet<>();
|
||||
HashSet<Double> sometimesOutside = new HashSet<>();
|
||||
for (int dx = -range; dx <= range; dx++) {
|
||||
for (int dy = -range; dy <= range; dy++) {
|
||||
for (int dz = -range; dz <= range; dz++) {
|
||||
double h = heuristic(x+dx, y+dy, z+dz);
|
||||
if (!sometimesOutside.contains(h) && isInGoal(x+dx, y+dy, z+dz)) {
|
||||
double h = heuristic(x + dx, y + dy, z + dz);
|
||||
if (!sometimesOutside.contains(h) && isInGoal(x + dx, y + dy, z + dz)) {
|
||||
maybeAlwaysInside.add(h);
|
||||
} else {
|
||||
maybeAlwaysInside.remove(h);
|
||||
|
@ -85,7 +85,7 @@ public class GoalRunAway implements Goal {
|
||||
|
||||
@Override
|
||||
public double heuristic() {//TODO less hacky solution
|
||||
int distance = (int)Math.ceil(Math.sqrt(distanceSq));
|
||||
int distance = (int) Math.ceil(Math.sqrt(distanceSq));
|
||||
int minX = from[0].getX() - distance;
|
||||
int minY = from[0].getY() - distance;
|
||||
int minZ = from[0].getZ() - distance;
|
||||
|
Loading…
Reference in New Issue
Block a user