|
@@ -161,10 +161,10 @@ public class StorageProductionController {
|
|
|
activeStoragePower += ele.getEnergyPerElement();
|
|
|
}
|
|
|
}
|
|
|
- if(activeStoragePower < energyNeeded){
|
|
|
+ if((int) activeStoragePower + 1 < energyNeeded){
|
|
|
return Math.pow(9000, 9000);//TODO:
|
|
|
}else{
|
|
|
- return activeStoragePower - energyNeeded;
|
|
|
+ return Math.abs(activeStoragePower - energyNeeded);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -182,7 +182,7 @@ public class StorageProductionController {
|
|
|
if(ele.getStateOfCharge() - ele.getEnergyPerElement() >= ele.getCurrentMaxOutRatio()){//TODO:
|
|
|
return 0;
|
|
|
}else{
|
|
|
- return Math.pow(2, ele.getStateOfCharge() - ele.getEnergyPerElement());
|
|
|
+ return ele.getCurrentMaxOutRatio() - (ele.getStateOfCharge() - ele.getEnergyPerElement());
|
|
|
}
|
|
|
}
|
|
|
|