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

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

Revision: 1830
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1830&view=rev
Author:   lorenz_b
Date:     2009-08-24 13:27:45 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
some changes for simple Sparql progress monitor

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java	2009-08-24 09:19:17 UTC (rev 1829)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java	2009-08-24 13:27:45 UTC (rev 1830)
@@ -27,6 +27,8 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import javax.swing.ProgressMonitor;
+
 import org.apache.log4j.Logger;
 import org.dllearner.utilities.JamonMonitorLogger;
 import org.semanticweb.owl.model.OWLOntology;
@@ -46,6 +48,8 @@
 	private int nrOfExtractedTriples = 0;
 	private List<Node> seedNodes = new ArrayList<Node>();
 	
+	private ProgressMonitor mon;
+	
 	private static Logger logger = Logger
 		.getLogger(Manager.class);
 	
@@ -69,9 +73,16 @@
 	public List<Node> extract(Set<String> instances) {
 		List<Node> allExtractedNodes = new ArrayList<Node>();
 		logger.info("Start extracting "+instances.size() + " instances ");
+		if(mon != null){
+			mon.setNote("Start extracting "+instances.size() + " instances ");
+			mon.setMaximum(instances.size());
+		}
 		int progress=0;
 		for (String one : instances) {
 			progress++;
+			if(mon != null){
+				mon.setProgress(progress);
+			}
 			logger.info("Progress: "+progress+" of "+instances.size()+" finished: "+one);
 			try {
 				Node n = extractionAlgorithm.expandNode(one, configuration.getTupelAquisitor());
@@ -144,4 +155,7 @@
 		return nrOfExtractedTriples;
 	}
 
+	public void addProgressMonitor(ProgressMonitor mon){
+		this.mon = mon;
+	}
 }
\ No newline at end of file

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2009-08-24 09:19:17 UTC (rev 1829)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2009-08-24 13:27:45 UTC (rev 1830)
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.TreeSet;
 
+import javax.swing.ProgressMonitor;
+
 import org.apache.log4j.Logger;
 import org.dllearner.core.KnowledgeSource;
 import org.dllearner.core.OntologyFormat;
@@ -59,6 +61,7 @@
 import org.dllearner.utilities.JamonMonitorLogger;
 import org.dllearner.utilities.datastructures.StringTuple;
 import org.dllearner.utilities.statistics.SimpleClock;
+import org.mindswap.pellet.utils.progress.SilentProgressMonitor;
 import org.semanticweb.owl.model.OWLOntology;
 
 import com.jamonapi.Monitor;
@@ -73,6 +76,7 @@
  */
 public class SparqlKnowledgeSource extends KnowledgeSource {
 
+	private ProgressMonitor mon;
 	
 	private static final boolean debug = false;
 	
@@ -236,11 +240,14 @@
 		logger.info("SparqlModul: Collecting Ontology");
 		SimpleClock totalTime = new SimpleClock();
 		//SimpleClock extractionTime = new SimpleClock();
-
+		if(mon != null){
+			mon.setNote("Collecting Ontology");
+		}
 		logger.trace(getURL());
 		logger.trace(getSparqlEndpoint());
 		logger.trace(configurator.getInstances());
 		Manager m = new Manager();
+		m.addProgressMonitor(mon);
 
 		// get Options for Manipulator
 		Manipulator manipulator = getManipulator();
@@ -509,6 +516,10 @@
 	public int getNrOfExtractedAxioms() {
 		return nrOfExtractedAxioms;
 	}
+	
+	public void addProgressMonitor(ProgressMonitor mon){
+		this.mon = mon;
+	}
 
 	/*
 	 * public static void main(String[] args) throws MalformedURLException {


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