mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-24 22:57:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Finished first unit test (equal power input and output) and fixed bugs detected by it

Browse Source
This commit is contained in:
Timmeey86
2018-11-21 00:04:26 +01:00
parent 222d41c84a
commit 558c89cc30
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/world/BaseBlock.java
View File

@ -25,8 +25,8 @@ public abstract class BaseBlock extends MappableContent{
public boolean outputsLiquid = false; public boolean outputsLiquid = false;
public boolean singleLiquid = true; public boolean singleLiquid = true;
public boolean consumesPower; public boolean consumesPower = true;
public boolean outputsPower; public boolean outputsPower = false;
public boolean bufferedPowerConsumer = false; public boolean bufferedPowerConsumer = false;
/** In case of unbuffered consumers, this stores the amount of power which is required per tick in order to work at maximum efficiency. /** In case of unbuffered consumers, this stores the amount of power which is required per tick in order to work at maximum efficiency.

10
core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
View File

@ -109,10 +109,12 @@ public class PowerGraph{
float powerNeeded = getPowerNeeded(); float powerNeeded = getPowerNeeded();
float powerProduced = getPowerProduced(); float powerProduced = getPowerProduced();
if(powerNeeded > powerProduced){ if(Math.abs(powerNeeded - powerProduced) > 0.0001f){
powerProduced += useBatteries(powerNeeded - powerProduced); if(powerNeeded > powerProduced){
}else if(powerProduced > powerNeeded){ powerProduced += useBatteries(powerNeeded-powerProduced);
powerProduced -= chargeBatteries(powerProduced - powerNeeded); }else if(powerProduced > powerNeeded){
powerProduced -= chargeBatteries(powerProduced-powerNeeded);
}
} }
distributePower(powerNeeded, powerProduced); distributePower(powerNeeded, powerProduced);

28
tests/src/test/java/PowerTests.java
View File

@ -16,6 +16,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import static io.anuke.mindustry.Vars.threads; import static io.anuke.mindustry.Vars.threads;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
public class PowerTests{ public class PowerTests{
@ -60,32 +61,31 @@ public class PowerTests{
void test_balancedPower(){ void test_balancedPower(){
PowerGraph powerGraph = new PowerGraph(); PowerGraph powerGraph = new PowerGraph();
// Create one water extractor (5.4 power consumed) // Create one water extractor (5.4 power/Second = 0.09/tick)
Tile waterExtractorTile = createFakeTile(0, 0, (Floor)Blocks.sand, ProductionBlocks.waterExtractor); Tile waterExtractorTile = createFakeTile(0, 0, (Floor)Blocks.sand, ProductionBlocks.waterExtractor);
powerGraph.add(waterExtractorTile); powerGraph.add(waterExtractorTile);
// Create 20 small solar panels (20*0.27=5.4 power produced) // Create 20 small solar panels (20*0.27=5.4 power/second = 0.09/tick)
List<Tile> solarPanelTiles = new LinkedList<>(); List<Tile> solarPanelTiles = new LinkedList<>();
float producedPowerSum = 0.0f;
for(int counter = 0; counter < 20; counter++){ for(int counter = 0; counter < 20; counter++){
Tile solarPanelTile = createFakeTile( 2 + counter / 2, counter % 2, (Floor)Blocks.sand, PowerBlocks.solarPanel); Tile solarPanelTile = createFakeTile( 2 + counter / 2, counter % 2, (Floor)Blocks.sand, PowerBlocks.solarPanel);
powerGraph.add(solarPanelTile); powerGraph.add(solarPanelTile);
solarPanelTiles.add(solarPanelTile); solarPanelTiles.add(solarPanelTile);
} }
float powerNeeded = powerGraph.getPowerNeeded();
float powerProduced = powerGraph.getPowerProduced();
// If these lines fail, you probably changed power production/consumption and need to adapt this test // If these lines fail, you probably changed power production/consumption and need to adapt this test
// OR their implementation is corrupt.
// TODO: Create fake blocks which are independent of such changes // TODO: Create fake blocks which are independent of such changes
powerGraph.update(); float epsilon = 0.00001f;
assertEquals(powerNeeded, 0.09f, epsilon);
assertEquals(powerProduced, 0.09f, epsilon);
// Note: The assertions above induce that powerNeeded = powerProduced (with floating point inaccuracy)
powerGraph.getPowerNeeded(); // Distribute power and make sure the water extractor is powered
powerGraph.getPowerProduced(); powerGraph.distributePower(powerNeeded, powerProduced);
assertEquals(waterExtractorTile.entity.power.satisfaction, 1.0f, epsilon);
/* if(powerNeeded > powerProduced){
powerProduced += useBatteries(powerNeeded - powerProduced);
}else if(powerProduced > powerNeeded){
powerProduced -= chargeBatteries(powerProduced - powerNeeded);
}
distributePower(powerNeeded, powerProduced);*/
} }
} }