refactor

src/blackstart/controlAlgorithm.java → src/blackstart/ControlAlgorithm.java

@@ -12,7 +12,7 @@ import classes.*;
 import ui.controller.Control;
 import ui.controller.StorageProductionController;
 
-public class controlAlgorithm implements AddOn {
+public class ControlAlgorithm implements AddOn {
 	// Gui Part:
 	private Control control;
 	private JTextArea textArea;
@@ -45,14 +45,14 @@ public class controlAlgorithm implements AddOn {
 
 	public static void main(String[] args) {
 		JFrame newFrame = new JFrame("exampleWindow");
-		controlAlgorithm instance = new controlAlgorithm();
+		ControlAlgorithm instance = new ControlAlgorithm();
 		newFrame.setContentPane(instance.getPanel());
 		newFrame.pack();
 		newFrame.setVisible(true);
 		newFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 	}
 
-	public controlAlgorithm() {
+	public ControlAlgorithm() {
 		content.setLayout(new BorderLayout());
 
 		textArea = new JTextArea();
@@ -237,7 +237,7 @@ public class controlAlgorithm implements AddOn {
 				println("No Power Plant in Model");
 				return;
 			}
-			control.getModel().setResistanceCalculator(new resistanceCalculator(
+			control.getModel().setResistanceCalculator(new ResistanceCalculator(
 					Integer.parseInt(lowVolatageTextfield.getText()),
 					Integer.parseInt(highVolatageTextfield.getText()),
 					10, 25,0.017, 0.017));

src/classes/resistanceCalculator.java → src/classes/ResistanceCalculator.java

@@ -2,7 +2,7 @@ package classes;
 
 import com.google.gson.annotations.Expose;
 
-public class resistanceCalculator {
+public class ResistanceCalculator {
     @Expose
     private int lowVoltage;
 
@@ -21,7 +21,7 @@ public class resistanceCalculator {
     @Expose
     private double highSpecificMaterialResistance;
 
-    public resistanceCalculator(int lowVoltage, int highVoltage, int lowDiameter, int highDiameter, double lowSpecificMaterialResistance, double highSpecificMaterialResistance){
+    public ResistanceCalculator(int lowVoltage, int highVoltage, int lowDiameter, int highDiameter, double lowSpecificMaterialResistance, double highSpecificMaterialResistance){
         this.lowVoltage = lowVoltage;
         this.highVoltage = highVoltage;
         this.lowDiameter = lowDiameter;

src/classes/StorageElement.java

@@ -27,7 +27,7 @@ public class StorageElement extends HolonElement implements Comparable<StorageEl
 	private float chargingRatio;
 
 	@Expose
-	private resistanceCalculator resistanceCalculator;
+	private ResistanceCalculator resistanceCalculator;
 
 	public StorageElement(String eleName, int amount, float energy, Model model, float capacity, float maxInRatio, float nominalOutRatio) {
 		super(eleName, amount, energy, model);
@@ -37,7 +37,7 @@ public class StorageElement extends HolonElement implements Comparable<StorageEl
 		this.capacity = capacity * 60;// we save in watts per minute for ease of use
 		this.status = Mode.STANDBY;
 		this.chargingRatio = 0;
-		this.resistanceCalculator = new resistanceCalculator(230, 20000,10, 25, 0.017, 0.017);//TODO
+		this.resistanceCalculator = new ResistanceCalculator(230, 20000,10, 25, 0.017, 0.017);//TODO
 	}
 
 	public float getEnergyPerElement() {

src/ui/model/Model.java

@@ -78,7 +78,7 @@ public class Model {
     //TODO:
     private int iterations=100;
 
-    private resistanceCalculator resistanceCalculator;
+    private ResistanceCalculator resistanceCalculator;
     
     /**
 	 * All implemented FairnessModels:<br>
@@ -1106,11 +1106,11 @@ public class Model {
 		}
 	}
 
-    public void setResistanceCalculator(resistanceCalculator resistanceCalculator) {
+    public void setResistanceCalculator(ResistanceCalculator resistanceCalculator) {
         this.resistanceCalculator = resistanceCalculator;
     }
 
-    public classes.resistanceCalculator getResistanceCalculator() {
+    public ResistanceCalculator getResistanceCalculator() {
         return resistanceCalculator;
     }
 }