Browse Source

small weight edits

Rolf Egert 3 years ago
parent
commit
e388d50866
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

+ 2 - 2
src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

@@ -15,7 +15,7 @@ public class TopologieObjectiveFunction {
 	//Parameters
 	
 	//weight for f_g(H)
-	static double w_eb = 0.3, w_max = 0.2, w_holon= 0.1, w_selection = .3, w_grid = 0.1;
+	static double w_eb = 0.4, w_max = 0.1, w_holon= 0.2, w_selection = .2, w_grid = 0.1;
 	
 	
 	//--> f_eb parameter
@@ -40,7 +40,7 @@ public class TopologieObjectiveFunction {
 	 *  average Maximum Cost for selction(kappa) of switch and elements.
 	 */
 	static double k_selection = 50000;
-	static double cost_switch = 20;
+	static double cost_switch = 200;
 	private static double cost_of_cable_per_meter = 0.8;
 
 	//--> f_grid parameter