azalea/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

num lookups check

Browse Source
This commit is contained in:
Leijurv
2018-08-31 11:51:08 -07:00
parent c370461a24
commit 836b41a3aa
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/baritone/pathing/calc/AStarPathFinder.java
+4
View File
@@ -28,6 +28,7 @@ import baritone.pathing.movement.Movement;
import baritone.pathing.movement.MovementHelper; import baritone.pathing.movement.MovementHelper;
import baritone.pathing.movement.movements.*; import baritone.pathing.movement.movements.*;
import baritone.pathing.path.IPath; import baritone.pathing.path.IPath;
import baritone.utils.BlockStateInterface;
import baritone.utils.Helper; import baritone.utils.Helper;
import baritone.utils.pathing.BetterBlockPos; import baritone.utils.pathing.BetterBlockPos;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@@ -82,6 +83,7 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
boolean minimumImprovementRepropagation = Baritone.settings().minimumImprovementRepropagation.get(); boolean minimumImprovementRepropagation = Baritone.settings().minimumImprovementRepropagation.get();
HashMap<Class<? extends Movement>, Long> timeConsumed = new HashMap<>(); HashMap<Class<? extends Movement>, Long> timeConsumed = new HashMap<>();
HashMap<Class<? extends Movement>, Integer> count = new HashMap<>(); HashMap<Class<? extends Movement>, Integer> count = new HashMap<>();
HashMap<Class<? extends Movement>, Integer> stateLookup = new HashMap<>();
long heapRemove = 0; long heapRemove = 0;
int heapRemoveCount = 0; int heapRemoveCount = 0;
long heapAdd = 0; long heapAdd = 0;
@@ -157,8 +159,10 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
chunkCount++; chunkCount++;
//long costStart = System.nanoTime(); //long costStart = System.nanoTime();
// TODO cache cost // TODO cache cost
int numLookupsBefore = BlockStateInterface.numBlockStateLookups;
double actionCost = movementToGetToNeighbor.getCost(calcContext); double actionCost = movementToGetToNeighbor.getCost(calcContext);
long costEnd = System.nanoTime(); long costEnd = System.nanoTime();
stateLookup.put(movementToGetToNeighbor.getClass(), BlockStateInterface.numBlockStateLookups - numLookupsBefore + stateLookup.getOrDefault(movementToGetToNeighbor.getClass(), 0));
timeConsumed.put(movementToGetToNeighbor.getClass(), costEnd - costStart + timeConsumed.getOrDefault(movementToGetToNeighbor.getClass(), 0L)); timeConsumed.put(movementToGetToNeighbor.getClass(), costEnd - costStart + timeConsumed.getOrDefault(movementToGetToNeighbor.getClass(), 0L));
count.put(movementToGetToNeighbor.getClass(), 1 + count.getOrDefault(movementToGetToNeighbor.getClass(), 0)); count.put(movementToGetToNeighbor.getClass(), 1 + count.getOrDefault(movementToGetToNeighbor.getClass(), 0));
//System.out.println(movementToGetToNeighbor.getClass() + "" + (costEnd - costStart)); //System.out.println(movementToGetToNeighbor.getClass() + "" + (costEnd - costStart));
src/main/java/baritone/utils/BlockStateInterface.java
+3 -1
View File
@@ -30,8 +30,10 @@ import net.minecraft.world.chunk.Chunk;
public class BlockStateInterface implements Helper { public class BlockStateInterface implements Helper {
public static IBlockState get(BlockPos pos) { // wrappers for chunk caching capability public static int numBlockStateLookups = 0;
public static IBlockState get(BlockPos pos) { // wrappers for chunk caching capability
numBlockStateLookups++;
// Invalid vertical position // Invalid vertical position
if (pos.getY() < 0 || pos.getY() >= 256) if (pos.getY() < 0 || pos.getY() >= 256)
return Blocks.AIR.getDefaultState(); return Blocks.AIR.getDefaultState();