refactoring

src/algo/StorageObject.java

@@ -1,101 +0,0 @@
-package algo;
-
-import classes.HolonElement;
-import classes.HolonObject;
-import classes.HolonBattery.State;
-
-public class StorageObject extends HolonObject {
-
-	private Mode status;
-	private float stateOfCharge;
-	private float capacity;
-	private float inRatio;
-	private float maxInRatio;
-	private float outRatio;
-	private float maxOutRatio;
-
-	public StorageObject(String objName) {
-		super(objName);
-		maxInRatio = 5000.0f;
-		this.addElement(new HolonElement("Collector", 1, 0, null));
-		maxOutRatio = 5000.0f;
-		this.addElement(new HolonElement("Emitter", 1, 0, null));
-		// TODO: das ist ja in pro stunde nicht pro iteration
-		capacity = 10000.0f;
-		stateOfCharge = 0;
-		setStatus(Mode.STANDBY, 0);
-		
-	}
-
-	public Mode getStatus() {
-		return this.status;
-	}
-
-	public void setStatus(Mode status, float energyNeed) {
-		switch (status) {
-		case STANDBY:
-			setStorageBehaviour(0, 0);
-			break;
-		case EMIT:
-			setStorageBehaviour(0, energyNeed);
-			break;
-		case COLLECT:
-//			if
-			setStorageBehaviour(-energyNeed, 0);
-			break;
-		}
-		this.status = status;
-	}
-	
-	private void setStorageBehaviour(float collector, float emitter) {
-		for (HolonElement ele : this.getElements()) {
-			if (ele.getObjName().equals("Collector")) {
-				ele.setEnergyPerElement(collector);
-			}
-			if (ele.getObjName().equals("Emitter")) {
-				ele.setEnergyPerElement(emitter);
-			}
-		}
-	}
-
-	public float getStateOfCharge() {
-		return stateOfCharge;
-	}
-
-	public void setStateOfCharge(float stateOfCharge) {
-		this.stateOfCharge = stateOfCharge;
-	}
-
-	public float getCapacity() {
-		return capacity;
-	}
-
-
-	public float getInRatio() {
-		return inRatio;
-	}
-
-	public void setInRatio(float inRatio) {
-		this.inRatio = inRatio;
-	}
-
-	public float getMaxInRation() {
-		return maxInRatio;
-	}
-
-	public float getOutRatio() {
-		return outRatio;
-	}
-
-	public void setOutRatio(float outRatio) {
-		this.outRatio = outRatio;
-	}
-
-	public float getMaxOutRatio() {
-		return maxOutRatio;
-	}
-
-	public enum Mode {
-		COLLECT, EMIT, STANDBY
-	}
-}

src/algo/StorageProductionController.java → src/blackstart/StorageProductionController.java

@@ -1,7 +1,8 @@
-package algo;
+package blackstart;
+
+import classes.StorageElement;
 
 import java.util.ArrayList;
-import java.util.EmptyStackException;
 
 public class StorageProductionController {
 	private ArrayList<StorageElement> storages;

src/algo/TestAlgo.java → src/blackstart/controlAlgorithm.java

@@ -1,4 +1,4 @@
-package algo;
+package blackstart;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -11,7 +11,7 @@ import api.AddOn;
 import classes.*;
 import ui.controller.Control;
 
-public class TestAlgo implements AddOn {
+public class controlAlgorithm implements AddOn {
 	private boolean cancel = false;
 
 	// Gui Part:
@@ -44,14 +44,14 @@ public class TestAlgo implements AddOn {
 
 	public static void main(String[] args) {
 		JFrame newFrame = new JFrame("exampleWindow");
-		TestAlgo instance = new TestAlgo();
+		controlAlgorithm instance = new controlAlgorithm();
 		newFrame.setContentPane(instance.getPanel());
 		newFrame.pack();
 		newFrame.setVisible(true);
 		newFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 	}
 
-	public TestAlgo() {
+	public controlAlgorithm() {
 		content.setLayout(new BorderLayout());
 
 		textArea = new JTextArea();

src/algo/StorageElement.java → src/classes/StorageElement.java

@@ -1,4 +1,4 @@
-package algo;
+package classes;
 
 import com.google.gson.annotations.Expose;
 

src/ui/controller/LoadController.java

@@ -7,7 +7,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 
-import algo.StorageElement;
+import classes.StorageElement;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
@@ -17,7 +17,6 @@ import org.apache.commons.compress.utils.IOUtils;
 
 import ui.model.Model;
 
-import java.awt.*;
 import java.awt.geom.Point2D;
 import java.io.*;
 import java.nio.file.Files;

src/ui/controller/SaveController.java

@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.reflect.TypeToken;
 
-import algo.StorageElement;
+import classes.StorageElement;
 
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;

src/ui/controller/SimulationManager.java

@@ -1,6 +1,6 @@
 package ui.controller;
 
-import algo.StorageElement;
+import classes.StorageElement;
 import classes.*;
 import ui.model.IntermediateCableWithState;
 import ui.model.DecoratedCable;