Browse Source

Start Test

Troppmann, Tom 4 years ago
parent
commit
d5e55b6f4c
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

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

@@ -73,7 +73,7 @@ public class TopologieObjectiveFunction {
 	static double range_for_k_disjoint_path = range(k_disjoint_path - centerValue_disjoint_path);
 
 	public static FloatLog log = new FloatLog();
-	static boolean useLog = true;
+	static boolean useLog = false;
 	static {
         //init
 		checkParameter();
@@ -191,6 +191,9 @@ public class TopologieObjectiveFunction {
 		
 			double avgShortestPath = GraphMetrics.averageShortestDistance(G);
 			//double disjpointPaths = GraphMetrics.averageEdgeDisjointPathProblem(G);
+			if(useLog) {
+				log.addSample("avgShortestPath", (float)avgShortestPath);
+			}
 			f_grid += avgShortestPathPenalty(avgShortestPath);// + disjoinPathPenalty(disjpointPaths);
 		}
 		//take average to encourage splitting