From 60c8603c8bb11a444809071ef9fbed3a1f101ea5 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Thu, 5 Jan 2023 02:31:56 +0300 Subject: [PATCH] pathfinder optimizations --- src/astarnavigator/ArrayList.php | 40 ------------ src/astarnavigator/PathTileXYZ.php | 5 +- src/astarnavigator/TileNavigator.php | 63 +++++++++---------- .../algorithms/ManhattanHeuristic3D.php | 2 +- .../ManhattanHeuristicAlgorithm.php | 12 ---- .../algorithms/Pythagoras3D.php | 2 +- .../algorithms/PythagorasAlgorithm.php | 11 ---- .../providers/DiagonalNeighborProvider.php | 17 ----- .../providers/EmptyBlockedProvider.php | 10 --- .../providers/MCDiagonalProvider.php | 9 +-- src/dependencies.php | 9 ++- src/entity/Living.php | 6 +- src/utils/Utils.php | 17 ++++- 13 files changed, 58 insertions(+), 145 deletions(-) delete mode 100644 src/astarnavigator/ArrayList.php delete mode 100644 src/astarnavigator/algorithms/ManhattanHeuristicAlgorithm.php delete mode 100644 src/astarnavigator/algorithms/PythagorasAlgorithm.php delete mode 100644 src/astarnavigator/providers/DiagonalNeighborProvider.php delete mode 100644 src/astarnavigator/providers/EmptyBlockedProvider.php diff --git a/src/astarnavigator/ArrayList.php b/src/astarnavigator/ArrayList.php deleted file mode 100644 index ad6a4a96..00000000 --- a/src/astarnavigator/ArrayList.php +++ /dev/null @@ -1,40 +0,0 @@ -arr[$e->__toString()] = $e; - return $this; - } - - public function addAll($es){ - foreach($es as $e){ - $this->add($this->add($e)); - } - } - - public function getFirst(){ - return array_values($this->arr)[0]; - } - - public function remove(IElement $e){ - unset($this->arr[$e->__toString()]); - return $this; - } - - public function __isset($e){ - return isset($this->arr[$e->__toString()]); - } - - public function has(IElement $e){ - return isset($this->arr[$e->__toString()]); - } - - public function sortWith($func){ - return uasort($this->arr, $func); - } - - public function countElements(){ - return count($this->arr); - } -} diff --git a/src/astarnavigator/PathTileXYZ.php b/src/astarnavigator/PathTileXYZ.php index 26ce0f25..90ec4c98 100644 --- a/src/astarnavigator/PathTileXYZ.php +++ b/src/astarnavigator/PathTileXYZ.php @@ -29,10 +29,7 @@ class PathTileXYZ extends PathTile } public function addOffset($offset){ - $this->x += $offset[0]; - $this->y += $offset[1]; - $this->z += $offset[2]; - return $this; + return new PathTileXYZ($this->x + $offset[0], $this->y + $offset[1], $this->z + $offset[2], $this->level); } public function __toString(){ diff --git a/src/astarnavigator/TileNavigator.php b/src/astarnavigator/TileNavigator.php index 9707ccbd..55f70d94 100644 --- a/src/astarnavigator/TileNavigator.php +++ b/src/astarnavigator/TileNavigator.php @@ -23,64 +23,63 @@ class TileNavigator implements ITileNavigator return array_reverse($totalPath); } - public function navigate(PathTile $from, PathTile $to, $maxDist) //TODO optimizations, no arraylist + public function navigate(PathTile $from, PathTile $to, $maxDist) { - $closed = new ArrayList(); - $open = new ArrayList(); - $open->add($from); - $path = []; //new Dictionary(); - $gScore = []; //new Dictionary(); + $open = new SplPriorityQueue(); + $open->insert($from, 0); + $path = []; + $gScore = []; $gScore[(string) $from] = 0; + $has = [(string)$from, true]; /** * @var array[Tile] $fScore */ - $fScore = [];//new Dictionary(); + $fScore = []; $fScore[(string) $from] = $this->heuristicAlgorithm->calculate($from, $to); if($this->blockedProvider->isBlocked($to)){ return null; } $visited = []; - while($open->countElements() > 0) + while(!$open->isEmpty()) { - //sleep(1); - $open->sortWith(function($k, $k1) use ($fScore){ - return $fScore[(string)$k] === $fScore[(string)$k1] ? 0 : ($fScore[(string)$k] > $fScore[(string)$k1] ? 1 : -1); - }); - $current = $open->getFirst(); - if ($current->equals($to)){ + $current = $open->top(); + $open->next(); + if ($current == $to){ + return $this->reconstructPath($path, $current); } - $open->remove($current); - $closed->add($current); foreach($this->neighborProvider->getNeighbors($current) as $neighbor) { - - if(in_array($neighbor, $visited)){ - continue; - } - - $visited[] = $neighbor; - if ($closed->has($neighbor) || $this->blockedProvider->isBlocked($neighbor)) - { - continue; - } if(!Utils::in_range(Utils::distance($neighbor->asArray(), $from->asArray()), -$maxDist, $maxDist)){ continue; } + if(isset($visited[(string)$neighbor])){ + continue; + } - $tentativeG = $gScore[(string) $current] + $this->distanceAlgorithm->calculate($current, $neighbor); - - if (!$open->has($neighbor)) + $visited[(string)$neighbor] = $neighbor; + if ($this->blockedProvider->isBlocked($neighbor)) { - $open->add($neighbor); + continue; + } + $distbetweenCost = $this->distanceAlgorithm->calculate($current, $neighbor); + $tentativeG = $gScore[(string) $current] + $distbetweenCost; + $tentativeF = $distbetweenCost + $this->heuristicAlgorithm->calculate($neighbor, $to); + if (!isset($has[(string)$neighbor])) + { + $open->insert($neighbor, -$tentativeF); + $has[(string)$neighbor] = true; } else if ($tentativeG >= $gScore[(string) $neighbor]) { continue; } - $path[(string) $neighbor] = $current; + if(!isset($gScore[(string) $neighbor]) || $distbetweenCost < $gScore[(string) $neighbor]){ + $path[(string) $neighbor] = $current; + } + $gScore[(string) $neighbor] = $tentativeG; - $fScore[(string) $neighbor] = $gScore[(string) $neighbor] + $this->heuristicAlgorithm->calculate($neighbor, $to); + $fScore[(string) $neighbor] = $tentativeF; } } diff --git a/src/astarnavigator/algorithms/ManhattanHeuristic3D.php b/src/astarnavigator/algorithms/ManhattanHeuristic3D.php index 2ac95f49..3feccce2 100644 --- a/src/astarnavigator/algorithms/ManhattanHeuristic3D.php +++ b/src/astarnavigator/algorithms/ManhattanHeuristic3D.php @@ -5,7 +5,7 @@ class ManhattanHeuristic3D implements IDistanceAlgorithm public function calculate(PathTile $from, PathTile $to) { if($from instanceof PathTileXYZ && $to instanceof PathTileXYZ){ - return Utils::manh_distance($from->asVector(), $to->asVector()); + return Utils::manh_distance($from->asArray(), $to->asArray()); } return 666; } diff --git a/src/astarnavigator/algorithms/ManhattanHeuristicAlgorithm.php b/src/astarnavigator/algorithms/ManhattanHeuristicAlgorithm.php deleted file mode 100644 index eb9b71f0..00000000 --- a/src/astarnavigator/algorithms/ManhattanHeuristicAlgorithm.php +++ /dev/null @@ -1,12 +0,0 @@ -x - $to->x) + abs($from->y - $to->y); - } - - -} - diff --git a/src/astarnavigator/algorithms/Pythagoras3D.php b/src/astarnavigator/algorithms/Pythagoras3D.php index 939c64db..e6b1d54b 100644 --- a/src/astarnavigator/algorithms/Pythagoras3D.php +++ b/src/astarnavigator/algorithms/Pythagoras3D.php @@ -7,7 +7,7 @@ class Pythagoras3D implements IDistanceAlgorithm if($from instanceof PathTileXYZ && $to instanceof PathTileXYZ){ return Utils::distance($from->asArray(), $to->asArray()); } - return 666; + return INF; } } diff --git a/src/astarnavigator/algorithms/PythagorasAlgorithm.php b/src/astarnavigator/algorithms/PythagorasAlgorithm.php deleted file mode 100644 index 7a46f1b5..00000000 --- a/src/astarnavigator/algorithms/PythagorasAlgorithm.php +++ /dev/null @@ -1,11 +0,0 @@ -x - $from->x, 2) + pow($to->y - $from->y, 2)); - } - -} - diff --git a/src/astarnavigator/providers/DiagonalNeighborProvider.php b/src/astarnavigator/providers/DiagonalNeighborProvider.php deleted file mode 100644 index fa7c891e..00000000 --- a/src/astarnavigator/providers/DiagonalNeighborProvider.php +++ /dev/null @@ -1,17 +0,0 @@ -addOffset($offset); - } - return $result; - } - -} - diff --git a/src/astarnavigator/providers/EmptyBlockedProvider.php b/src/astarnavigator/providers/EmptyBlockedProvider.php deleted file mode 100644 index 87d84242..00000000 --- a/src/astarnavigator/providers/EmptyBlockedProvider.php +++ /dev/null @@ -1,10 +0,0 @@ -addOffset($offset); - } - return $result; + return array_map(function($offset) use($tile){ + return $tile->addOffset($offset); + }, MCDiagonalProvider::$neighbors); } return []; } diff --git a/src/dependencies.php b/src/dependencies.php index c235f520..46829248 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -80,17 +80,16 @@ require_once(FILE_PATH . "/src/pmf/PMF.php"); require_once(FILE_PATH . "/src/astarnavigator/IElement.php"); require_once(FILE_PATH . "/src/astarnavigator/PHPUtils.php"); require_once(FILE_PATH . "/src/astarnavigator/PathTile.php"); -require_once(FILE_PATH . "/src/astarnavigator/ArrayList.php"); require_once(FILE_PATH . "/src/astarnavigator/algorithms/IDistanceAlgorithm.php"); -require_once(FILE_PATH . "/src/astarnavigator/algorithms/PythagorasAlgorithm.php"); -require_once(FILE_PATH . "/src/astarnavigator/algorithms/ManhattanHeuristicAlgorithm.php"); +require_once(FILE_PATH . "/src/astarnavigator/algorithms/Pythagoras3D.php"); +require_once(FILE_PATH . "/src/astarnavigator/algorithms/ManhattanHeuristic3D.php"); require_once(FILE_PATH . "/src/astarnavigator/providers/INeighborProvider.php"); -require_once(FILE_PATH . "/src/astarnavigator/providers/DiagonalNeighborProvider.php"); +require_once(FILE_PATH . "/src/astarnavigator/providers/MCDiagonalProvider.php"); require_once(FILE_PATH . "/src/astarnavigator/providers/IBlockedProvider.php"); -require_once(FILE_PATH . "/src/astarnavigator/providers/EmptyBlockedProvider.php"); +require_once(FILE_PATH . "/src/astarnavigator/providers/MCBlockedProvider.php"); require_once(FILE_PATH . "/src/astarnavigator/ITileNavigator.php"); require_once(FILE_PATH . "/src/astarnavigator/TileNavigator.php"); diff --git a/src/entity/Living.php b/src/entity/Living.php index 59af9c63..c61ea454 100644 --- a/src/entity/Living.php +++ b/src/entity/Living.php @@ -32,9 +32,9 @@ abstract class Living extends Entity implements Damageable, Pathfindable{ } if($this->onGround){ - /*if($this->path === null && $this->pathFinder instanceof ITileNavigator){ // mt_rand(0, 120) === 0){ - $this->path = $this->pathFinder->navigate(new PathTileXYZ($this->x, $this->y, $this->z, $this->level), new PathTileXYZ($this->x + mt_rand(-10, 10), $this->y, $this->z + mt_rand(-10, 10), $this->level), 10); - }*/ + //if(!$this->hasPath() && $this->pathFinder instanceof ITileNavigator){ // mt_rand(0, 120) === 0){ + // $this->path = $this->pathFinder->navigate(new PathTileXYZ($this->x, $this->y, $this->z, $this->level), new PathTileXYZ($this->x + mt_rand(-10, 10), $this->y, $this->z + mt_rand(-10, 10), $this->level), 10); + //} $this->pathFollower->followPath(); } diff --git a/src/utils/Utils.php b/src/utils/Utils.php index 5abec83c..4a9fc024 100644 --- a/src/utils/Utils.php +++ b/src/utils/Utils.php @@ -423,7 +423,11 @@ class Utils{ } return $data; } - + + public static function php8_nulcoal(&$arr, $else){ + return isset($arr) ? $arr : $else; + } + public static function readTriad($str){ return @unpack("N", "\x00" . $str)[1]; } @@ -556,8 +560,15 @@ class Utils{ /** * manhattan distance, less accurate, but still useful sometimes */ - public static function manh_distance(Vector3 $pos1, Vector3 $pos2){ - return abs($pos2->x - $pos1->x) + abs($pos2->y - $pos1->y) + abs($pos2->z - $pos1->z); + public static function manh_distance($pos1, $pos2){ + if($pos1 instanceof Vector3){ + $pos1 = $pos1->toArray(); + } + if($pos2 instanceof Vector3){ + $pos2 = $pos2->toArray(); + } + + return abs($pos2["x"] - $pos1["x"]) + abs($pos2["y"] - $pos1["y"]) + abs($pos2["z"] - $pos1["z"]); } /**