|
@@ -3,6 +3,7 @@ package ui.controller;
|
|
|
import classes.StorageElement;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Collections;
|
|
|
|
|
|
public class StorageProductionController {
|
|
|
private ArrayList<StorageElement> storages;
|
|
@@ -34,9 +35,11 @@ public class StorageProductionController {
|
|
|
}
|
|
|
|
|
|
public void enableStorageDischarging(final float energyNeeded) {
|
|
|
+ Collections.sort(storages, Collections.reverseOrder());
|
|
|
System.out.println("energy needed from storage" + energyNeeded);
|
|
|
float energyLeftToEnabled = energyNeeded;
|
|
|
|
|
|
+
|
|
|
// if(currentStorageProduction() < energyNeeded){//TODO: das if muss ich nochmal ueberdenken
|
|
|
// energyLeftToEnabled = energyNeeded - currentStorageProduction();
|
|
|
//DONE?: Problem: es wird abgezogen weil ja schon emitter aber wir wolle das ja erhoehen...
|
|
@@ -90,6 +93,7 @@ public class StorageProductionController {
|
|
|
|
|
|
//TODO: selbe probleme wie discharging
|
|
|
void enableStorageCharging(float energyAvailable){
|
|
|
+ Collections.sort(storages);
|
|
|
System.out.println("energy available to storage" + energyAvailable);
|
|
|
float availableEnergyLeft = energyAvailable;
|
|
|
for (StorageElement se: storages) {
|