fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

energy fixes

Browse Source
This commit is contained in:
PrototypeTrousers
2021-10-22 15:37:08 -03:00
parent 75843e802d
commit 2f5ecfe638
1 changed files with 104 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cache/EnergyGridCache.java
Vendored
+104 -77
View File
@@ -64,18 +64,21 @@ import appeng.me.energy.EnergyWatcher;
public class EnergyGridCache implements IEnergyGrid public class EnergyGridCache implements IEnergyGrid
{ {
private static final double MAX_BUFFER_STORAGE = 800.0; private static final double MAX_BUFFER_STORAGE = 800;
private static final Comparator<IEnergyGridProvider> COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST = ( o1, o2 ) -> Double.compare( o2.getProviderStoredEnergy(), o1.getProviderStoredEnergy() ); private static final Comparator<IEnergyGridProvider> COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST = ( o1, o2 ) -> Double.compare( o2.getProviderStoredEnergy(), o1.getProviderStoredEnergy() );
private static final Comparator<IEnergyGridProvider> COMPARATOR_LOWEST_PERCENTAGE_FIRST = ( o1, o2 ) -> { private static final Comparator<IEnergyGridProvider> COMPARATOR_LOWEST_PERCENTAGE_FIRST = ( o1, o2 ) -> {
final double percent1 = ( o1.getProviderStoredEnergy() + 1.0 ) / ( o1.getProviderMaxEnergy() + 1.0 ); final double percent1 = ( o1.getProviderStoredEnergy() + 1 ) / ( o1.getProviderMaxEnergy() + 1 );
final double percent2 = ( o2.getProviderStoredEnergy() + 1.0 ) / ( o2.getProviderMaxEnergy() + 1.0 ); final double percent2 = ( o2.getProviderStoredEnergy() + 1 ) / ( o2.getProviderMaxEnergy() + 1 );
return Double.compare( percent1, percent2 ); return Double.compare( percent1, percent2 );
}; };
private final NavigableSet<EnergyThreshold> interests = Sets.newTreeSet(); private final NavigableSet<EnergyThreshold> interests = Sets.newTreeSet();
// Should only be modified from the add/remove methods below to guard against
// concurrent modifications
private final double averageLength = 40.0;
private final Set<IAEPowerStorage> providers = new LinkedHashSet<>(); private final Set<IAEPowerStorage> providers = new LinkedHashSet<>();
// Used to track whether an extraction is currently in progress, to fail fast // Used to track whether an extraction is currently in progress, to fail fast
// when something externally // when something externally
@@ -91,40 +94,40 @@ public class EnergyGridCache implements IEnergyGrid
private boolean ongoingInjectOperation = false; private boolean ongoingInjectOperation = false;
private final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create(); private final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
final IGrid myGrid; private final IGrid myGrid;
private final HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<>(); private final HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<>();
/** /**
* estimated power available. * estimated power available.
*/ */
private int availableTicksSinceUpdate = 0; private int availableTicksSinceUpdate = 0;
private double globalAvailablePower = 0.0; private double globalAvailablePower = 0;
private double globalMaxPower = MAX_BUFFER_STORAGE; private double globalMaxPower = MAX_BUFFER_STORAGE;
/** /**
* idle draw. * idle draw.
*/ */
private double drainPerTick = 0.0; private double drainPerTick = 0;
private double avgDrainPerTick = 0.0; private double avgDrainPerTick = 0;
private double avgInjectionPerTick = 0.0; private double avgInjectionPerTick = 0;
private double tickDrainPerTick = 0.0; private double tickDrainPerTick = 0;
private double tickInjectionPerTick = 0.0; private double tickInjectionPerTick = 0;
/** /**
* power status * power status
*/ */
private boolean publicHasPower = false; private boolean publicHasPower = false;
private boolean hasPower = true; private boolean hasPower = true;
long ticksSinceHasPowerChange = 900L; private long ticksSinceHasPowerChange = 900;
private PathGridCache pgc; private PathGridCache pgc;
private double lastStoredPower = -1.0; private double lastStoredPower = -1;
private final GridPowerStorage localStorage = new GridPowerStorage(); private final GridPowerStorage localStorage = new GridPowerStorage();
private final Set<IAEPowerStorage> providersToRemove = new HashSet<>(); private Set<IAEPowerStorage> providerToRemove = new HashSet<>();
private final Set<IAEPowerStorage> requestersToRemove = new HashSet<>(); private Set<IAEPowerStorage> requesterToRemove = new HashSet<>();
private final Set<IAEPowerStorage> providersToAdd = new HashSet<>(); private Set<IAEPowerStorage> providersToAdd = new HashSet<>();
private final Set<IAEPowerStorage> requestersToAdd = new HashSet<>(); private Set<IAEPowerStorage> requesterToAdd = new HashSet<>();
public EnergyGridCache( final IGrid g ) public EnergyGridCache( final IGrid g )
{ {
@@ -182,7 +185,7 @@ public class EnergyGridCache implements IEnergyGrid
} }
else else
{ {
this.requestersToAdd.add( ev.storage ); this.requesterToAdd.add( ev.storage );
} }
} }
} }
@@ -210,20 +213,17 @@ public class EnergyGridCache implements IEnergyGrid
} }
} }
// Should only be modified from the add/remove methods below to guard against this.avgDrainPerTick *= ( this.averageLength - 1 ) / this.averageLength;
// concurrent modifications this.avgInjectionPerTick *= ( this.averageLength - 1 ) / this.averageLength;
double averageLength = 40.0;
this.avgDrainPerTick *= ( averageLength - 1.0 ) / averageLength;
this.avgInjectionPerTick *= ( averageLength - 1.0 ) / averageLength;
this.avgDrainPerTick += this.tickDrainPerTick / averageLength; this.avgDrainPerTick += this.tickDrainPerTick / this.averageLength;
this.avgInjectionPerTick += this.tickInjectionPerTick / averageLength; this.avgInjectionPerTick += this.tickInjectionPerTick / this.averageLength;
this.tickDrainPerTick = 0.0; this.tickDrainPerTick = 0;
this.tickInjectionPerTick = 0.0; this.tickInjectionPerTick = 0;
// power information. // power information.
boolean currentlyHasPower; boolean currentlyHasPower = false;
if( this.drainPerTick > 0.0001 ) if( this.drainPerTick > 0.0001 )
{ {
@@ -232,7 +232,7 @@ public class EnergyGridCache implements IEnergyGrid
} }
else else
{ {
currentlyHasPower = this.extractAEPower( 0.1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.0; currentlyHasPower = this.extractAEPower( 0.1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0;
} }
// ticks since change.. // ticks since change..
@@ -242,14 +242,14 @@ public class EnergyGridCache implements IEnergyGrid
} }
else else
{ {
this.ticksSinceHasPowerChange = 0L; this.ticksSinceHasPowerChange = 0;
} }
// update status.. // update status..
this.hasPower = currentlyHasPower; this.hasPower = currentlyHasPower;
// update public status, this buffers power ups for 30 ticks. // update public status, this buffers power ups for 30 ticks.
if( this.hasPower && this.ticksSinceHasPowerChange > 30L ) if( this.hasPower && this.ticksSinceHasPowerChange > 30 )
{ {
this.publicPowerState( true, this.myGrid ); this.publicPowerState( true, this.myGrid );
} }
@@ -268,10 +268,10 @@ public class EnergyGridCache implements IEnergyGrid
final Queue<IEnergyGridProvider> toVisit = new PriorityQueue<>( COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST ); final Queue<IEnergyGridProvider> toVisit = new PriorityQueue<>( COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST );
final Set<IEnergyGridProvider> visited = new HashSet<>(); final Set<IEnergyGridProvider> visited = new HashSet<>();
double extracted = 0.0; double extracted = 0;
toVisit.add( this ); toVisit.add( this );
while ( !toVisit.isEmpty() && extracted < toExtract ) while( !toVisit.isEmpty() && extracted < toExtract )
{ {
final IEnergyGridProvider next = toVisit.poll(); final IEnergyGridProvider next = toVisit.poll();
visited.add( next ); visited.add( next );
@@ -296,7 +296,7 @@ public class EnergyGridCache implements IEnergyGrid
return this.drainPerTick + this.pgc.getChannelPowerUsage(); return this.drainPerTick + this.pgc.getChannelPowerUsage();
} }
void publicPowerState( final boolean newState, final IGrid grid ) private void publicPowerState( final boolean newState, final IGrid grid )
{ {
if( this.publicHasPower == newState ) if( this.publicHasPower == newState )
{ {
@@ -314,7 +314,7 @@ public class EnergyGridCache implements IEnergyGrid
private void refreshPower() private void refreshPower()
{ {
this.availableTicksSinceUpdate = 0; this.availableTicksSinceUpdate = 0;
this.globalAvailablePower = 0.0; this.globalAvailablePower = 0;
for( final IAEPowerStorage p : this.providers ) for( final IAEPowerStorage p : this.providers )
{ {
this.globalAvailablePower += p.getAECurrentPower(); this.globalAvailablePower += p.getAECurrentPower();
@@ -330,37 +330,59 @@ public class EnergyGridCache implements IEnergyGrid
@Override @Override
public double extractProviderPower( final double amt, final Actionable mode ) public double extractProviderPower( final double amt, final Actionable mode )
{ {
double extractedPower = 0.0; double extractedPower = 0;
if( !ongoingExtractOperation ) this.providers.addAll( providersToAdd );
{ providersToAdd.clear();
this.providers.addAll( providersToAdd ); providers.removeIf( providerToRemove::contains );
providersToAdd.clear(); this.providerToRemove.clear();
if( providers.remove( localStorage ) )
{
providers.add( localStorage );
}
}
final Iterator<IAEPowerStorage> it = this.providers.iterator(); final Iterator<IAEPowerStorage> it = this.providers.iterator();
ongoingExtractOperation = true; ongoingExtractOperation = true;
boolean ls = false;
try try
{ {
while ( extractedPower < amt && it.hasNext() ) while ( extractedPower < amt && it.hasNext() )
{ {
final IAEPowerStorage node = it.next(); final IAEPowerStorage node = it.next();
if( node != null )
{
if( node == localStorage && mode == Actionable.MODULATE )
{
ls = true;
continue;
}
final double req = amt - extractedPower; final double req = amt - extractedPower;
final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE ); final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
extractedPower += newPower; extractedPower += newPower;
if( newPower < req && mode == Actionable.MODULATE )
{
it.remove();
}
}
else
{
it.remove();
}
} }
} finally } finally
{ {
ongoingExtractOperation = false; ongoingExtractOperation = false;
this.providers.removeIf( providersToRemove::contains ); if( ls && extractedPower < amt )
this.providersToRemove.clear(); {
final double req = amt - extractedPower;
final double newPower = localStorage.extractAEPower( req, mode, PowerMultiplier.ONE );
extractedPower += newPower;
if( newPower < req )
{
providers.remove( localStorage );
}
}
} }
final double result = Math.min( extractedPower, amt ); final double result = Math.min( extractedPower, amt );
@@ -384,28 +406,37 @@ public class EnergyGridCache implements IEnergyGrid
{ {
final double originalAmount = amt; final double originalAmount = amt;
if( !ongoingInjectOperation ) this.requesters.addAll( requesterToAdd );
{ requesterToAdd.clear();
this.requesters.addAll( requestersToAdd ); requesters.removeIf( requesterToRemove::contains );
requestersToAdd.clear(); this.requesterToRemove.clear();
}
final Iterator<IAEPowerStorage> it = this.requesters.iterator(); final Iterator<IAEPowerStorage> it = this.requesters.iterator();
ongoingInjectOperation = true; ongoingInjectOperation = true;
try try
{ {
while ( amt > 0.0 && it.hasNext() ) while ( amt > 0 && it.hasNext() )
{ {
final IAEPowerStorage node = it.next(); final IAEPowerStorage node = it.next();
amt = node.injectAEPower( amt, mode ); if( node != null )
{
amt = node.injectAEPower( amt, mode );
if( amt > 0 && mode == Actionable.MODULATE )
{
it.remove();
}
}
else
{
it.remove();
}
} }
} finally } finally
{ {
ongoingInjectOperation = false; ongoingInjectOperation = false;
this.requesters.removeIf( requestersToRemove::contains );
this.requestersToRemove.clear();
} }
final double overflow = Math.max( 0.0, amt ); final double overflow = Math.max( 0.0, amt );
@@ -421,7 +452,7 @@ public class EnergyGridCache implements IEnergyGrid
@Override @Override
public double getProviderEnergyDemand( final double maxRequired ) public double getProviderEnergyDemand( final double maxRequired )
{ {
double required = 0.0; double required = 0;
final Iterator<IAEPowerStorage> it = this.requesters.iterator(); final Iterator<IAEPowerStorage> it = this.requesters.iterator();
while ( required < maxRequired && it.hasNext() ) while ( required < maxRequired && it.hasNext() )
@@ -463,7 +494,7 @@ public class EnergyGridCache implements IEnergyGrid
double leftover = amt; double leftover = amt;
while ( !toVisit.isEmpty() && leftover > 0.0 ) while( !toVisit.isEmpty() && leftover > 0 )
{ {
final IEnergyGridProvider next = toVisit.poll(); final IEnergyGridProvider next = toVisit.poll();
visited.add( next ); visited.add( next );
@@ -502,9 +533,9 @@ public class EnergyGridCache implements IEnergyGrid
final Set<IEnergyGridProvider> visited = new HashSet<>(); final Set<IEnergyGridProvider> visited = new HashSet<>();
toVisit.add( this ); toVisit.add( this );
double required = 0.0; double required = 0;
while ( !toVisit.isEmpty() && required < maxRequired ) while( !toVisit.isEmpty() && required < maxRequired )
{ {
final IEnergyGridProvider next = toVisit.poll(); final IEnergyGridProvider next = toVisit.poll();
visited.add( next ); visited.add( next );
@@ -532,7 +563,7 @@ public class EnergyGridCache implements IEnergyGrid
@Override @Override
public double getProviderMaxEnergy() public double getProviderMaxEnergy()
{ {
return this.globalMaxPower; return this.getMaxStoredPower();
} }
@Override @Override
@@ -564,7 +595,7 @@ public class EnergyGridCache implements IEnergyGrid
} }
else else
{ {
this.providersToRemove.add( ps ); this.providerToRemove.add( ps );
} }
if( !ongoingInjectOperation ) if( !ongoingInjectOperation )
{ {
@@ -572,7 +603,7 @@ public class EnergyGridCache implements IEnergyGrid
} }
else else
{ {
this.requestersToRemove.add( ps ); this.requesterToRemove.add( ps );
} }
} }
} }
@@ -642,7 +673,7 @@ public class EnergyGridCache implements IEnergyGrid
this.globalMaxPower += ps.getAEMaxPower(); this.globalMaxPower += ps.getAEMaxPower();
} }
if( current > 0.0 && ps.getPowerFlow() != AccessRestriction.WRITE ) if( current > 0 && ps.getPowerFlow() != AccessRestriction.WRITE )
{ {
this.globalAvailablePower += current; this.globalAvailablePower += current;
if( !ongoingExtractOperation ) if( !ongoingExtractOperation )
@@ -663,7 +694,7 @@ public class EnergyGridCache implements IEnergyGrid
} }
else else
{ {
this.requestersToAdd.add( ps ); this.requesterToAdd.add( ps );
} }
} }
} }
@@ -684,7 +715,7 @@ public class EnergyGridCache implements IEnergyGrid
@Override @Override
public void onSplit( final IGridStorage storageB ) public void onSplit( final IGridStorage storageB )
{ {
final double newBuffer = this.localStorage.getAECurrentPower() / 2.0; final double newBuffer = this.localStorage.getAECurrentPower() / 2;
this.localStorage.removeCurrentAEPower( newBuffer ); this.localStorage.removeCurrentAEPower( newBuffer );
storageB.dataObject().setDouble( "buffer", newBuffer ); storageB.dataObject().setDouble( "buffer", newBuffer );
} }
@@ -713,11 +744,7 @@ public class EnergyGridCache implements IEnergyGrid
private class GridPowerStorage implements IAEPowerStorage private class GridPowerStorage implements IAEPowerStorage
{ {
private double stored = 0.0; private double stored = 0;
GridPowerStorage()
{
}
@Override @Override
public double extractAEPower( double amt, Actionable mode, PowerMultiplier usePowerMultiplier ) public double extractAEPower( double amt, Actionable mode, PowerMultiplier usePowerMultiplier )
@@ -769,7 +796,7 @@ public class EnergyGridCache implements IEnergyGrid
return this.stored; return this.stored;
} }
void addCurrentAEPower( double amount ) private void addCurrentAEPower( double amount )
{ {
this.stored += amount; this.stored += amount;
@@ -779,7 +806,7 @@ public class EnergyGridCache implements IEnergyGrid
} }
} }
void removeCurrentAEPower( double amount ) private void removeCurrentAEPower( double amount )
{ {
this.stored -= amount; this.stored -= amount;
@@ -790,7 +817,7 @@ public class EnergyGridCache implements IEnergyGrid
if( this.stored < 0.01 ) if( this.stored < 0.01 )
{ {
EnergyGridCache.this.ticksSinceHasPowerChange = 0L; EnergyGridCache.this.ticksSinceHasPowerChange = 0;
EnergyGridCache.this.publicPowerState( false, EnergyGridCache.this.myGrid ); EnergyGridCache.this.publicPowerState( false, EnergyGridCache.this.myGrid );
} }
} }