Browse Source

Kappa Update

Troppmann, Tom 3 years ago
parent
commit
5354e269ce
1 changed files with 5 additions and 1 deletions
  1. 5 1
      src/algorithm/objectiveFunction/ObjectiveFunctionByCarlos.java

+ 5 - 1
src/algorithm/objectiveFunction/ObjectiveFunctionByCarlos.java

@@ -15,7 +15,11 @@ public class ObjectiveFunctionByCarlos {
 	static double w_eb = .3, w_state = .3, w_pro = .2, w_perf = .1, w_holon=.1;
 	
 	//kappas for squashing function
-	static double k_eb = 1000000.f, k_state = 15000, k_pro = 2100, k_perf = 1100, k_holon= 200000;
+//	static double k_eb = 1500000.f, k_state = 40000, k_pro = 6000, k_perf = 15000, k_holon= 400000;
+	static double k_eb = 750000.f, k_state = 20000, k_pro = 3000, k_perf = 15000, k_holon= 200000;
+	
+//	old values
+//	static double k_eb = 1000000.f, k_state = 15000, k_pro = 2100, k_perf = 12000, k_holon= 200000;
 	
 	//theta for f_pro
 	static double theta = 3;