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

[<lor...@us...>]

Revision: 1849
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1849&view=rev
Author:   lorenz_b
Date:     2009-09-14 12:26:04 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
fixed bug in explanation generator, wrong set of explanations was returned

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java
    trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties

Removed Paths:
-------------
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassificationProgressMonitor.java

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java	2009-09-14 11:43:37 UTC (rev 1848)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java	2009-09-14 12:26:04 UTC (rev 1849)
@@ -179,7 +179,7 @@
 
 		}
 		Set<Explanation> explanations = new HashSet<Explanation>();
-		for (Explanation explanation : allPreviouslyFoundExplanations) {
+		for (Explanation explanation : allPreviouslyFoundExplanations) {System.out.println(explanation);
 			if (!nonLaconicExplanations.contains(explanation)) {
 				if (laconicExplanations.contains(explanation)) {
 					explanations.add(explanation);
@@ -189,7 +189,7 @@
 			}
 		}
 
-		return laconicExplanations;//retrieveAxioms(explanations);
+		return explanations;//retrieveAxioms(explanations);
 	}
     
     public boolean isLaconic(Explanation explanation)

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties	2009-09-14 11:43:37 UTC (rev 1848)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties	2009-09-14 12:26:04 UTC (rev 1849)
@@ -1,5 +1,6 @@
 log4j.rootLogger=INFO, A
 log4j.logger.org.dllearner.tools.ore.explanation = DEBUG, A
+log4j.logger.org.dllearner.tools.ore.explanation.HSTExplanationGenerator = INFO, A
 log4j.appender.A=org.apache.log4j.ConsoleAppender 
 log4j.appender.A.layout=org.apache.log4j.PatternLayout
 log4j.appender.A.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n

Deleted: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassificationProgressMonitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassificationProgressMonitor.java	2009-09-14 11:43:37 UTC (rev 1848)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ClassificationProgressMonitor.java	2009-09-14 12:26:04 UTC (rev 1849)
@@ -1,117 +0,0 @@
-package org.dllearner.tools.ore.ui;
-
-import java.awt.Cursor;
-import java.awt.Dimension;
-
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.SwingUtilities;
-
-import org.mindswap.pellet.utils.progress.ProgressMonitor;
-
-public class ClassificationProgressMonitor extends JPanel implements ProgressMonitor{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4913267621100462227L;
-	private javax.swing.ProgressMonitor monitor;
-	private JProgressBar progressBar;
-	private String progressMessage = "";
-	private String	progressTitle	= "";
-	private int		progress		= 0;
-	private int		progressLength	= 0;
-	private int		progressPercent	= -1;
-	private long		startTime		= -1;
-	private boolean	canceled		= false;
-
-	
-	public ClassificationProgressMonitor(){
-		super();
-		monitor = new javax.swing.ProgressMonitor(this, progressTitle, progressMessage, 0 ,progressLength);
-		progressBar = new JProgressBar(0, progressLength);
-		progressBar.setValue(progress);
-		progressBar.setStringPainted(true);
-		add(progressBar);
-		setSize(new Dimension(200, 200));
-		
-	}
-
-	@Override
-	public int getProgress() {
-		return progress;
-	}
-
-	@Override
-	public int getProgressPercent() {
-		return progressPercent;
-	}
-
-	@Override
-	public void incrementProgress() {
-		setProgress(progress + 1);
-		
-	}
-
-	@Override
-	public boolean isCanceled() {
-		return monitor.isCanceled();
-	}
-
-	@Override
-	public void setProgress(int progress) {
-		this.progress = progress;
-		updateProgress();
-		
-	}
-
-	@Override
-	public void setProgressLength(int length) {
-		progressLength = length;
-		monitor.setMaximum(length);
-		progressBar.setMaximum(length);
-		
-	}
-
-	@Override
-	public void setProgressMessage(String message) {
-		progressMessage = message;
-		monitor.setNote(message);
-		
-	}
-
-	@Override
-	public void setProgressTitle(String title) {
-		progressTitle = title;
-		
-	}
-
-	@Override
-	public void taskFinished() {
-		monitor.close();
-		setCursor(null);
-		
-	}
-
-	@Override
-	public void taskStarted() {
-		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-		
-	}
-	
-	private void updateProgress(){
-		SwingUtilities.invokeLater(new Runnable(){
-
-			@Override
-			public void run() {
-				monitor.setProgress(progress);
-				progressBar.setValue(progress);
-				
-			}
-			
-		});
-	}
-	
-	
-
-}


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