chore: several reworks and refacts

Metaphoriker · Sep 25, 2024 · 65201ee · 65201ee
1 parent fa0807e
commit 65201ee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/pathetic-api/src/main/java/org/patheloper/api/event/PathingFinishedEvent.java b/pathetic-api/src/main/java/org/patheloper/api/event/PathingFinishedEvent.java
@@ -13,5 +13,6 @@
 @AllArgsConstructor
 public class PathingFinishedEvent implements PathingEvent {
 
+  /** The {@link PathfinderResult} of the pathfinding process. */
   @NonNull private final PathfinderResult pathfinderResult;
 }
diff --git a/pathetic-api/src/main/java/org/patheloper/api/event/PathingStartFindEvent.java b/pathetic-api/src/main/java/org/patheloper/api/event/PathingStartFindEvent.java
@@ -8,13 +8,25 @@
 import org.patheloper.api.pathing.filter.PathFilterStage;
 import org.patheloper.api.wrapper.PathPosition;
 
-/** An event called when a Pathfinder starts pathing. */
+/**
+ * An event triggered when a pathfinder begins the pathfinding process.
+ */
 @Getter
 @RequiredArgsConstructor
 public class PathingStartFindEvent implements PathingEvent {
 
+  /** The starting {@link PathPosition} of the pathfinding process. */
   @NonNull private final PathPosition start;
+
+  /** The target {@link PathPosition} of the pathfinding process. */
   @NonNull private final PathPosition target;
+
+  /** A list of {@link PathFilter} objects to be applied during the pathfinding process. */
   @NonNull private final List<PathFilter> filters;
+
+  /**
+   * A list of {@link PathFilterStage} objects representing different stages of the filtering
+   * process.
+   */
   @NonNull private final List<PathFilterStage> filterStages;
 }
diff --git a/pathetic-model/src/main/java/org/patheloper/model/pathing/pathfinder/AStarPathfinder.java b/pathetic-model/src/main/java/org/patheloper/model/pathing/pathfinder/AStarPathfinder.java
@@ -73,7 +73,7 @@ private void evaluateNewNodes(
             examinedPositions, currentNode, filters, filterStages, allowingDiagonal);
 
     for (Node newNode : newNodes) {
-      double nodeCost = newNode.getHeuristic().get();
+      double nodeCost = newNode.getHeuristicCache().get();
       if (pathfinderConfiguration.isPrioritizing()) {
         double priorityAdjustment = calculatePriorityAdjustment(newNode, filterStages);
         nodeCost -= priorityAdjustment;
@@ -92,7 +92,7 @@ private double calculatePriorityAdjustment(Node node, List<PathFilterStage> filt
                   snapshotManager));
 
       if (filterResult) {
-        return node.getHeuristic().get() * (PRIORITY_BOOST_IN_PERCENTAGE / 100.0);
+        return node.getHeuristicCache().get() * (PRIORITY_BOOST_IN_PERCENTAGE / 100.0);
       }
     }
     return 0.0;
@@ -197,7 +197,8 @@ private Node createNeighbourNode(Node currentNode, PathVector offset) {
             currentNode.getStart(),
             currentNode.getTarget(),
             pathfinderConfiguration.getHeuristicWeights(),
-            currentNode.getDepth() + 1);
+            currentNode.getDepth() + 1,
+            pathfinderConfiguration);
     newNode.setParent(currentNode);
     return newNode;
   }

diff --git a/pathetic-model/src/main/java/org/patheloper/model/pathing/pathfinder/AbstractPathfinder.java b/pathetic-model/src/main/java/org/patheloper/model/pathing/pathfinder/AbstractPathfinder.java
@@ -276,7 +276,8 @@ private Node createStartNode(PathPosition start, PathPosition target) {
         start.floor(),
         target.floor(),
         pathfinderConfiguration.getHeuristicWeights(),
-        0);
+        0,
+        pathfinderConfiguration);
   }
 
   private boolean hasReachedLengthLimit(Node currentNode) {