Procházet zdrojové kódy

Made Some Metrics a little more pretty

Jan Enders před 7 roky
rodič
revize
cc098d6bf1

+ 1 - 9
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/metrics/PlacementCostMetric.java

@@ -114,15 +114,7 @@ public class PlacementCostMetric implements ScopvizGraphMetric {
 					.collect(Collectors.toList()));
 			for (Edge e : mappingEdges) {
 				placementCostSum += placementCost(e.getNode0(), e.getNode1());
-			}
-			/*
-			 * for (Node n : g.getNodeSet()) { if
-			 * (n.getId().startsWith(MappingGraphManager.OPERATOR)) { for (Edge
-			 * e : n.getEdgeSet()) { String edgeTargetParent = e.getNode1()
-			 * .getAttribute(MappingGraphManager.ATTRIBUTE_KEY_MAPPING_PARENT);
-			 * if (edgeTargetParent == MappingGraphManager.UNDERLAY) {
-			 * placementCostSum += placementCost(n, e.getNode1()); } } } }
-			 */
+			}			
 			results.add(new Pair<String, String>("Overall Cost", "" + placementCostSum));
 		}
 		return results;

+ 2 - 2
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/metrics/TaskFulfillmentMetric.java

@@ -63,7 +63,7 @@ public class TaskFulfillmentMetric implements ScopvizGraphMetric {
 			}
 		}
 		// This corresponds to F'
-		double percentagePlaced = placedSum / prioritySum;
+		double percentagePlaced = (placedSum / prioritySum)*100;
 
 		if (error) {
 			error = false;
@@ -71,7 +71,7 @@ public class TaskFulfillmentMetric implements ScopvizGraphMetric {
 		}
 
 		results.add(new Pair<String, String>("Task Placement", "" + placedSum));
-		results.add(new Pair<String, String>("Placement Percentage", "" + percentagePlaced));
+		results.add(new Pair<String, String>("Placement Percentage", percentagePlaced+"%"));
 
 		return results;
 	}