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

[<ton...@us...>]

Revision: 686
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=686&view=rev
Author:   tonytacker
Date:     2008-03-04 05:40:00 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
changed methods to get nanoseconds, add percent-method 

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
    trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java

Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java	2008-03-04 12:02:49 UTC (rev 685)
+++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java	2008-03-04 13:40:00 UTC (rev 686)
@@ -90,36 +90,53 @@
 	 * Show Statistics.
 	 */
 	public void showStats() {
+		Long algorithmRunTime = null;
+		Long overallReasoningTime = null;
+		Long instanceCheckReasoningTime = null;
+		Long retrievalReasoningTime = null;
+		Long subsumptionReasoningTime = null;
 		infoArea.setText("");
-		// best solution
-		if (config.getLearningAlgorithm().getBestSolution() != null)
+		// best solutions
+		if (config.getLearningAlgorithm().getBestSolutions(5) != null)
 			infoArea.append("BestSolution:\n"
-					+ config.getLearningAlgorithm().getBestSolution().toString() + "\n\n");
+					+ config.getLearningAlgorithm().getBestSolutions(5).toString() + "\n\n");
 		// solution score
-//		if (config.getLearningAlgorithm().getSolutionScore() != null)
-//			infoArea.append("SolutionScore:\n"
-//					+ config.getLearningAlgorithm().getSolutionScore().toString() + "\n\n");
+		// if (config.getLearningAlgorithm().getSolutionScore() != null)
+		// infoArea.append("SolutionScore:\n"
+		// + config.getLearningAlgorithm().getSolutionScore().toString()
+		// + "\n\n");
+
 		// reasoner statistics
-		if (config.getAlgorithmRunTime() != null)
-			infoArea.append("Algorithm Runtime: " + makeTime(config.getAlgorithmRunTime()) + "\n");
-		infoArea.append("OverallReasoningTime: "
-				+ makeTime(config.getReasoningService().getOverallReasoningTimeNs()) + "\n");
+		if (config.getAlgorithmRunTime() != null) {
+			algorithmRunTime = config.getAlgorithmRunTime();
+			infoArea.append("Algorithm Runtime: " + makeTime(algorithmRunTime) + "\n");
+		}
+		overallReasoningTime = config.getReasoningService().getOverallReasoningTimeNs();
+		infoArea.append("OverallReasoningTime: " + makeTime(overallReasoningTime)
+				+ Percent(overallReasoningTime, algorithmRunTime) + "\n");
 		infoArea.append("Instances (" + config.getReasoningService().getNrOfInstanceChecks()
 				+ "): ");
-		if (config.getReasoningService().getNrOfInstanceChecks() > 0)
-			infoArea.append(makeTime(config.getReasoningService().getTimePerInstanceCheckNs())
-					+ "\n");
-		else
+		if (config.getReasoningService().getNrOfInstanceChecks() > 0) {
+			instanceCheckReasoningTime = config.getReasoningService()
+					.getInstanceCheckReasoningTimeNs();
+			infoArea.append(makeTime(instanceCheckReasoningTime)
+					+ Percent(instanceCheckReasoningTime, algorithmRunTime) + "\n");
+		} else
 			infoArea.append(" - \n");
 		infoArea.append("Retrieval (" + config.getReasoningService().getNrOfRetrievals() + "): ");
-		if (config.getReasoningService().getNrOfRetrievals() > 0)
-			infoArea.append(makeTime(config.getReasoningService().getTimePerRetrievalNs()) + "\n");
-		else
+		if (config.getReasoningService().getNrOfRetrievals() > 0) {
+			retrievalReasoningTime = config.getReasoningService().getRetrievalReasoningTimeNs();
+			infoArea.append(makeTime(retrievalReasoningTime)
+					+ Percent(retrievalReasoningTime, algorithmRunTime) + "\n");
+		} else
 			infoArea.append(" - \n");
-		if (config.getReasoningService().getNrOfSubsumptionChecks() > 0)
+		if (config.getReasoningService().getNrOfSubsumptionChecks() > 0) {
+			subsumptionReasoningTime = config.getReasoningService().getSubsumptionReasoningTimeNs();
 			infoArea.append("Subsumption ("
 					+ config.getReasoningService().getNrOfSubsumptionChecks() + "): "
-					+ makeTime(config.getReasoningService().getTimePerSubsumptionCheckNs()) + "\n");
+					+ makeTime(subsumptionReasoningTime)
+					+ Percent(subsumptionReasoningTime, algorithmRunTime) + "\n");
+		}
 	}
 
 	/**
@@ -161,4 +178,20 @@
 			time += nanos + "ns ";
 		return time;
 	}
+
+	/**
+	 * Get a percent string like this: "(10,5 %)"
+	 * 
+	 * @param a 
+	 * @param b
+	 * @return
+	 */
+	public String Percent(Long a, Long b) {
+		if (a != null && b != null) {
+			Double c = (double) a / (double) b * (double) 100;
+			c = Math.ceil(c * 10) / 10;
+			return " (" + c.toString() + " %) ";
+		}
+		return null;
+	}
 }

Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java	2008-03-04 12:02:49 UTC (rev 685)
+++ trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java	2008-03-04 13:40:00 UTC (rev 686)
@@ -41,6 +41,11 @@
 	@Override
 	public void run() {
 		if (config.getThreadIsRunning()) {
+			try {
+				sleep(1000); // sleep 1 second
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
 			while (config.getThreadIsRunning()) {
 				try {
 					runPanel.showStats();


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