some soc as kWh tests

src/blackstart/controlAlgorithm.java

@@ -259,7 +259,7 @@ public class controlAlgorithm implements AddOn {
 
 			// prepare model
 			/////////
-			setPowerplantProduction(0);
+			disablePowerplantProduction();
 			enableAllConsumers();
 			SPC.disableStorageDischarging(-1); //disable all storage production
 			// TODO: prios?
@@ -287,10 +287,6 @@ public class controlAlgorithm implements AddOn {
 		}
 	}
 
-	/**
-	 *
-	 * @param curIteration
-	 */
 	private void blackstartMain(int curIteration) {
 		try {
 			Thread.sleep(Integer.parseInt(waitBetweenIterations.getText()));
@@ -338,9 +334,9 @@ public class controlAlgorithm implements AddOn {
 	 * TODO: prios fuer elemente anschalten
 	 * TODO: elements und amount nachschauen + getEngergyPerElement anschauen
 	 * TODO: batterie status wechesel fuehrt zu unterversorgung in GUI FIX?: in storage if bei charge auskommentieren
-	 * TODO: wie soll ich unter / ueberversorgung handeln vorm blackstart
-	 * TODO: batterie modes wo nicht passiert? obwohl laden / entladen moeglich waere?
-	 * TODO: batterie laden prios? entfernung?
+	 * TODO: batterie laden prios? entfernung? doppelt sortieren
+	 * TODO: renewables mit verlust
+	 * TODO: transformer + voltage unterscheidung
 	 *
 	 * @return true or false depending on whether the blackstart was successful for
 	 *         this iteration
@@ -401,7 +397,7 @@ public class controlAlgorithm implements AddOn {
 		println("currenctrenewable: " + currentRenewableProduction());
 		for (StorageElement ele :
 				getStorageElements()) {
-			println("Storage ID: " + ele.getId() + " now at " + ele.getStateOfCharge() + " charge");
+			println("Storage ID: " + ele.getId() + " now at " + ele.getStateOfCharge() + " charge " + "(" + (ele.getStateOfCharge()/60)/1000 + "kWh)");
 		}
 		println("currenctpossiblestorage: " + SPC.currentPossibleStorageProduction());
 		println("blackstart resi: " + getEnergyRequiredForPowerplantBlackstart());
@@ -478,10 +474,10 @@ public class controlAlgorithm implements AddOn {
 		return totalProduction;
 	}
 
-	private void setPowerplantProduction(float power) {
+	private void disablePowerplantProduction() {
 		for (HolonElement ele : powerplant.getElements()) {
 			if (ele.getEleName().equals("Power")) {
-				ele.setEnergyPerElement(power);
+				ele.setEnergyPerElement(0);
 			}
 		}
 	}

src/classes/StorageElement.java

@@ -1,6 +1,5 @@
 package classes;
 
-import blackstart.resistanceCalculator;
 import com.google.gson.annotations.Expose;
 import ui.model.Model;
 

src/blackstart/resistanceCalculator.java → src/classes/resistanceCalculator.java

@@ -1,4 +1,4 @@
-package blackstart;
+package classes;
 
 import classes.*;
 import com.google.gson.annotations.Expose;
@@ -21,7 +21,7 @@ public class resistanceCalculator {
         this.specificMaterialResistance = specificMaterialResistance;
     }
 
-    void setDistancesToCalcResistance(HolonObject powerPlant) {
+    public void setDistancesToCalcResistance(HolonObject powerPlant) {
         if (powerPlant != null) {
             // travers
             if (powerPlant.getConnectedTo().size() > 0) {