[DL-Learner SVN] SF.net SVN: dl-learner:[1126] trunk/src/dl-learner/org/dllearner

[<ku...@us...>]

Revision: 1126
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1126&view=rev
Author:   kurzum
Date:     2008-08-22 07:30:58 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------


Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
    trunk/src/dl-learner/org/dllearner/utilities/Helper.java
    trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java	2008-08-21 16:58:03 UTC (rev 1125)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java	2008-08-22 07:30:58 UTC (rev 1126)
@@ -27,6 +27,7 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.dllearner.kb.aquisitors.TupleAquisitor;
+import org.dllearner.utilities.JamonMonitorLogger;
 import org.dllearner.utilities.statistics.SimpleClock;
 
 /**
@@ -83,7 +84,7 @@
 		newNodes.add(seedNode);
 		
 
-		
+		JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeBasicExtraction").start();
 		for (int x = 1; x <= configuration.getRecursiondepth(); x++) {
 			
 			sc.reset();
@@ -105,20 +106,24 @@
 			logger.info("Recursion counter: " + x + " with " + newNodes.size()
 					+ " Nodes remaining, " + sc.getAndSet(""));
 		}
-
+		JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeBasicExtraction").stop();
 		
 		if(configuration.isCloseAfterRecursion()){
+			JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeCloseAfterRecursion").start();
 			List<InstanceNode> l = getInstanceNodes(newNodes);
 			logger.info("Getting classes for remaining instances: "+l.size() + " instances");
 			tupelAquisitor.setNextTaskToClassesForInstances();
 			collectNodes.addAll(expandCloseAfterRecursion(l, tupelAquisitor));
+			JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeCloseAfterRecursion").stop();
 		}
 		// gets All Class Nodes and expands them further
 		if (configuration.isGetAllSuperClasses()) {
+			JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeGetAllSuperClasses").start();
 			List<ClassNode> allClassNodes = getClassNodes(collectNodes);
 			tupelAquisitor.setNextTaskToClassInformation();
 			logger.info("Get all superclasses for "+allClassNodes.size() + " classes");
 			expandAllSuperClassesOfANode(allClassNodes, tupelAquisitor);
+			JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeGetAllSuperClasses").stop();
 		}
 			
 		return seedNode;

Modified: trunk/src/dl-learner/org/dllearner/utilities/Helper.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/Helper.java	2008-08-21 16:58:03 UTC (rev 1125)
+++ trunk/src/dl-learner/org/dllearner/utilities/Helper.java	2008-08-22 07:30:58 UTC (rev 1126)
@@ -170,7 +170,22 @@
 
 		return str;
 	}
+	
+	public static String prettyPrintMilliSeconds(long milliSeconds) {
+	
 
+		long seconds = milliSeconds / 1000;
+		milliSeconds = milliSeconds % 1000;
+
+		// Mikrosekunden werden immer angezeigt, Sekunden nur falls größer 0
+		String str = "";
+		if (seconds > 0)
+			str = seconds + "s ";
+		str += milliSeconds + "ms";
+		
+		return str;
+	}
+
 	public static <T1, T2> void addMapEntry(Map<T1, SortedSet<T2>> map, T1 keyEntry, T2 setEntry) {
 		if (map.containsKey(keyEntry)) {
 			map.get(keyEntry).add(setEntry);

Modified: trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java	2008-08-21 16:58:03 UTC (rev 1125)
+++ trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java	2008-08-22 07:30:58 UTC (rev 1126)
@@ -76,7 +76,8 @@
 		StringBuffer sbuf = new StringBuffer();
 		for (int i = 0; i < l.size(); i++) {
 			Monitor monitor = l.get(i);
-			sset.add(monitor.toString());
+			
+			sset.add(convMonitorToString(monitor));
 		}
 		for (String onemon : sset) {
 			sbuf.append(onemon+"\n");
@@ -84,8 +85,22 @@
 		return sbuf.toString();
 	}
 	
+	public static String convMonitorToString (Monitor m) {
+		String retVal = m.getLabel();
+		String unit = m.getUnits();
+		long content = new Double(m.getTotal()).longValue();
+		String contentstr = (unit.equals("ms."))? Helper.prettyPrintNanoSeconds(content ) : content+"" ;
+		retVal+= "total:"+contentstr+"|\t";
+		
+		long avg = new Double(m.getAvg()).longValue();
+		String avgstr = (unit.equals("ms."))? Helper.prettyPrintMilliSeconds(avg ) : avg+"" ;
+		retVal+= "avg:"+avgstr+"|\t";
+		
+		return retVal;
+	}
 	
 	
+	
 	@SuppressWarnings("all")
 	public static String getMonitorPrefix(Class clazz){
 		String retval="";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.