Browse Source

fixes in fistanceFitness

David Heck 4 years ago
parent
commit
7ad28f8c26

+ 5 - 2
src/classes/StorageElement.java

@@ -83,7 +83,8 @@ public class StorageElement extends HolonElement implements Comparable<StorageEl
 	 * @return float how much energy was collected/emited
 	 */
 	public double setStatusAndSetEnergy(Mode status, double energyWanted, float energyRequiredForPowerplantBlackstart) {
-		double energyNeed = resistanceCalculator.calcEnergyNeededForCertainEnergyAfterResistance(energyWanted, getLowDistance(), getHighDistance(), energyRequiredForPowerplantBlackstart);
+		double energyNeed = resistanceCalculator.calcEnergyNeededForCertainEnergyAfterResistance(
+				energyWanted, getLowDistance(), getHighDistance(), energyRequiredForPowerplantBlackstart);
 		this.status = status;
 		switch (status) {
 		case STANDBY:
@@ -96,7 +97,9 @@ public class StorageElement extends HolonElement implements Comparable<StorageEl
 					return emitWantedEnergy(currentMaxOutRatio, energyRequiredForPowerplantBlackstart);
 				}
 			} else {// less wanted than what can be max be given
-				if(stateOfCharge >= energyNeed){//TODO: das kann doch garnicht funktioniern
+				if(stateOfCharge >= energyNeed){
+					//das kann doch garnicht funktioniern!
+					// doch geht need 'vor abzuegen'ist das was abgezogen wird want 'nach abzuegen' das eingespeist wird
 //					return emitWantedEnergy(energyNeed, energyRequiredForPowerplantBlackstart);//zurueckrechnungs problem! float nicht genau genug
 					this.setEnergyPerElement((float) energyWanted);
 					chargingRatio = (float) energyNeed;

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

@@ -112,7 +112,7 @@ public class StorageProductionController {
 		if(avgUtilization() >= ele.getUtilization(energyRequiredForPowerplantBlackstart)){
 			return 0;
 		}else{
-			return 1;
+			return Math.abs(avgUtilization() - ele.getUtilization(energyRequiredForPowerplantBlackstart));
 		}
 	}
 
@@ -120,7 +120,7 @@ public class StorageProductionController {
 		if(avgUtilization() <= ele.getUtilization(energyRequiredForPowerplantBlackstart)){
 			return 0;
 		}else{
-			return 1;
+			return Math.abs(avgUtilization() - ele.getUtilization(energyRequiredForPowerplantBlackstart));
 		}
 	}