Browse Source

fixes in holdMaxPowerFitness

David Heck 4 years ago
parent
commit
6dbedc9e18
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/ui/controller/StorageProductionController.java

+ 3 - 3
src/ui/controller/StorageProductionController.java

@@ -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());
 		}
 	}