Merge branch 'updateInProgress' of

git@git.tk.informatik.tu-darmstadt.de:carlos.garcia/praktikum-holons.git
into updateInProgress

Conflicts:
	src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

@@ -42,6 +42,7 @@ public class TopologieObjectiveFunction {
 	static double k_selection = 50000;
 	static double cost_switch = 20;
 	private static double cost_of_cable_per_meter = 0.8;
+
 	//--> f_grid parameter