From 021e924098ac2900e1aac3ebd1c2a0a5b0ae992f Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 22 Apr 2014 21:49:03 -0500 Subject: [PATCH] Fixed issue with error prone Grid Visitors. Increased Channel update speed. Renamed Controller Method. --- me/GridConnection.java | 2 +- me/GridNode.java | 29 +++++++++++++---------------- me/cache/PathGridCache.java | 4 ++-- tile/networking/TileController.java | 2 +- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/me/GridConnection.java b/me/GridConnection.java index 450a3d47..22aaf77a 100644 --- a/me/GridConnection.java +++ b/me/GridConnection.java @@ -24,7 +24,7 @@ public class GridConnection implements IGridConnection, IPathItem private ForgeDirection fromAtoB; private GridNode sideB; - byte visitorIterationNumber = Byte.MIN_VALUE; + Object visitorIterationNumber = null; public int channelData = 0; diff --git a/me/GridNode.java b/me/GridNode.java index af808da9..c33008a7 100644 --- a/me/GridNode.java +++ b/me/GridNode.java @@ -42,10 +42,7 @@ public class GridNode implements IGridNode, IPathItem IGridBlock gridProxy; Grid myGrid; - public static byte currentVisitorIterationNumber = Byte.MIN_VALUE; - public static byte currentChannelsIterationNumber = Byte.MIN_VALUE; - - byte visitorIterationNumber = Byte.MIN_VALUE; + Object visitorIterationNumber = null; // connection criteria AEColor myColor = AEColor.Transparent; @@ -152,12 +149,12 @@ public class GridNode implements IGridNode, IPathItem @Override public void beginVisition(IGridVisitor g) { - currentVisitorIterationNumber++; + Object tracker = new Object(); LinkedList nextRun = new LinkedList(); nextRun.add( this ); - visitorIterationNumber = currentVisitorIterationNumber; + visitorIterationNumber = tracker; if ( g instanceof IGridConnecitonVisitor ) { @@ -173,7 +170,7 @@ public class GridNode implements IGridNode, IPathItem nextRun = new LinkedList(); for (GridNode n : thisRun) - n.visitorConnection( g, nextRun, nextConn ); + n.visitorConnection( tracker, g, nextRun, nextConn ); } } else @@ -184,12 +181,12 @@ public class GridNode implements IGridNode, IPathItem nextRun = new LinkedList(); for (GridNode n : thisRun) - n.visitorNode( g, nextRun ); + n.visitorNode( tracker, g, nextRun ); } } } - private void visitorConnection(IGridVisitor g, LinkedList nextRun, LinkedList nextConnections) + private void visitorConnection(Object tracker, IGridVisitor g, LinkedList nextRun, LinkedList nextConnections) { if ( g.visitNode( this ) ) { @@ -198,23 +195,23 @@ public class GridNode implements IGridNode, IPathItem GridNode gn = (GridNode) gc.getOtherSide( this ); GridConnection gcc = (GridConnection) gc; - if ( gcc.visitorIterationNumber != currentVisitorIterationNumber ) + if ( gcc.visitorIterationNumber != tracker ) { - gcc.visitorIterationNumber = currentChannelsIterationNumber; + gcc.visitorIterationNumber = tracker; nextConnections.add( gc ); } - if ( currentVisitorIterationNumber == gn.visitorIterationNumber ) + if ( tracker == gn.visitorIterationNumber ) continue; - gn.visitorIterationNumber = currentVisitorIterationNumber; + gn.visitorIterationNumber = tracker; nextRun.add( gn ); } } } - private void visitorNode(IGridVisitor g, LinkedList nextRun) + private void visitorNode(Object tracker, IGridVisitor g, LinkedList nextRun) { if ( g.visitNode( this ) ) { @@ -222,10 +219,10 @@ public class GridNode implements IGridNode, IPathItem { GridNode gn = (GridNode) gc.getOtherSide( this ); - if ( currentVisitorIterationNumber == gn.visitorIterationNumber ) + if ( tracker == gn.visitorIterationNumber ) continue; - gn.visitorIterationNumber = currentVisitorIterationNumber; + gn.visitorIterationNumber = tracker; nextRun.add( gn ); } diff --git a/me/cache/PathGridCache.java b/me/cache/PathGridCache.java index a444992e..14ef209a 100644 --- a/me/cache/PathGridCache.java +++ b/me/cache/PathGridCache.java @@ -84,7 +84,7 @@ public class PathGridCache implements IPathingGrid used = 0; int nodes = myGrid.getNodes().size(); - ticksUntilReady = 20 + (nodes / 10); + ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); channelsByBlocks = nodes * used; channelPowerUsage = (double) channelsByBlocks / 128.0; @@ -98,7 +98,7 @@ public class PathGridCache implements IPathingGrid else { int nodes = myGrid.getNodes().size(); - ticksUntilReady = 20 + (nodes / 10); + ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); closedList = new HashSet(); semiOpen = new HashSet(); diff --git a/tile/networking/TileController.java b/tile/networking/TileController.java index e2a1043b..beb5ffdf 100644 --- a/tile/networking/TileController.java +++ b/tile/networking/TileController.java @@ -83,7 +83,7 @@ public class TileController extends AENetworkPowerTile implements IAEPowerStorag } @MENetworkEventSubscribe - public void onPowerChange(MENetworkControllerChange status) + public void onControllerChange(MENetworkControllerChange status) { updateMeta(); }