|
@@ -282,11 +282,20 @@ public class ControlAlgorithm implements AddOn {
|
|
|
// addCertainKindOfBatteries(Integer.parseInt(addBatteryTextfield.getText()),addBatteryTypeTextfield.getText());
|
|
|
// removeCertainKindOfBatteries(Integer.parseInt(removeBatteryTextfield.getText()), removeBatteryTypeTextfield.getText());
|
|
|
totalNumberOfHouses = consumers.size();
|
|
|
- powerplant = control.getSimManager().getPowerplant();// DANGER DONT GIVE NULL
|
|
|
+ lines = new ArrayList<String>();
|
|
|
+ lines.add(fileNameTextfield.getText());
|
|
|
+ if(control.getSimManager().getPowerplant() != null){
|
|
|
+ powerplant = control.getSimManager().getPowerplant();// DANGER DONT GIVE NULL
|
|
|
+ }else{
|
|
|
+ println("No Power plant in model");
|
|
|
+ return;
|
|
|
+ }
|
|
|
setPowerPlantBlackstartResistance(-Float.parseFloat(blackstartEnergyrequierementTextfield.getText()));
|
|
|
- SPC = new StorageProductionController(getStorageElements(), getEnergyRequiredForPowerplantBlackstart());// DANGER DONT GIVE NULL
|
|
|
- if(powerplant == null){
|
|
|
- println("No Power Plant in Model");
|
|
|
+ if(getEnergyRequiredForPowerplantBlackstart() != 0){
|
|
|
+ SPC = new StorageProductionController(getStorageElements(), getEnergyRequiredForPowerplantBlackstart());// DANGER DONT GIVE NULL
|
|
|
+
|
|
|
+ }else{
|
|
|
+ println("No blackstart Power Plant in Model");
|
|
|
return;
|
|
|
}
|
|
|
control.getModel().setResistanceCalculator(new ResistanceCalculator(
|
|
@@ -322,8 +331,7 @@ public class ControlAlgorithm implements AddOn {
|
|
|
se.setStateOfCharge(Float.parseFloat(storageStartCharge.getText()));
|
|
|
}
|
|
|
}
|
|
|
- lines = new ArrayList<String>();
|
|
|
- lines.add(fileNameTextfield.getText());
|
|
|
+
|
|
|
file = Paths.get(fileNameTextfield.getText());
|
|
|
updateVisual();
|
|
|
if (blackstartStartTime + blackstartSuccessTime > control.getModel().getIterations() - 1) {
|