Browse Source

some small changes towards fitnessfunction and parameters

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

+ 5 - 4
src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

@@ -15,14 +15,14 @@ public class TopologieObjectiveFunction {
 	//Parameters
 	
 	//weight for f_g(H)
-	static double w_eb = 0.4, w_max = 0.1, w_holon= 0.2, w_selection = .2, w_grid = 0.1;
+	static double w_eb = 0.4, w_max = 0.2, w_holon= 0.2, w_selection = .1, w_grid = 0.1;
 	
 	
 	//--> f_eb parameter
 	/**
 	 * Maximum Energie Difference(kappa)
 	 */
-	static double k_eb = 20000.f;
+	static double k_eb = 5000.f;
 	/**
 	 * Maximum when all on Energie Difference(kappa)
 	 */
@@ -33,7 +33,7 @@ public class TopologieObjectiveFunction {
 	/**
 	 * maximum penalty from holon element distribution
 	 */
-	static double k_holon= 100000;
+	static double k_holon= 10000;
 	
 	
 	//--> f_selection paramaeter;
@@ -41,7 +41,7 @@ public class TopologieObjectiveFunction {
 	 *  average Maximum Cost for selction(kappa) of switch and elements.
 	 */
 	static double k_selection = 50000;
-	static double cost_switch = 200;
+	static double cost_switch = 1000;
 	private static double cost_of_cable_per_meter = 0.8;
 
 	//--> f_grid parameter
@@ -138,6 +138,7 @@ public class TopologieObjectiveFunction {
 			double f_element = f_elements_deviation_production+f_elements_deviation_consumption;
 			f_holon += f_element;
 		}
+		f_holon /= state.getNetworkList().size();
 		
 		//calculating f_selection
 		double f_selection = 0;