Thread: [DL-Learner SVN] SF.net SVN: dl-learner:[1073] trunk/src/dl-learner/org/dllearner (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1073
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1073&view=rev
Author:   kurzum
Date:     2008-08-14 14:18:37 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
intermediate commit

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
    trunk/src/dl-learner/org/dllearner/test/FilterTest.java

Added Paths:
-----------
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/LinkedDataTupelAquisitor.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitor.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorClasses.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQuery.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryClasses.java
    trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryInterface.java
    trunk/src/dl-learner/org/dllearner/test/TripleTypeTest.java
    trunk/src/dl-learner/org/dllearner/utilities/datastructures/RDFNodeTuple.java

Removed Paths:
-------------
    trunk/src/dl-learner/org/dllearner/kb/extraction/SparqlTupelAquisitor.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/TupelAquisitor.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
    trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java

Added: trunk/src/dl-learner/org/dllearner/kb/aquisitors/LinkedDataTupelAquisitor.java
===================================================================

--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/LinkedDataTupelAquisitor.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/LinkedDataTupelAquisitor.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.SortedSet;
+
+import org.apache.log4j.Logger;
+import org.dllearner.kb.extraction.Configuration;
+import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlQueryMaker;
+import org.dllearner.utilities.datastructures.RDFNodeTuple;
+
+/**
+ * Can execute different queries.
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public class LinkedDataTupelAquisitor extends TupelAquisitor {
+	
+	@SuppressWarnings("unused")
+	private static Logger logger = Logger.getLogger(LinkedDataTupelAquisitor.class);
+	
+	private Configuration configuration;
+	protected SparqlQueryMaker sparqlQueryMaker;
+	protected SPARQLTasks sparqlTasks;
+
+	public LinkedDataTupelAquisitor(Configuration Configuration) {
+		this.configuration = Configuration;
+		this.sparqlQueryMaker = configuration.getSparqlQueryMaker();
+		this.sparqlTasks = configuration.sparqlTasks;
+	}
+
+	// standard query get a tupels (p,o) for subject s
+	@Override
+	public SortedSet<RDFNodeTuple> getTupelForResource(URI uri) {
+		
+		
+		String pred = "predicate";
+		String obj = "object";
+		// getQuery
+		String sparqlQueryString = sparqlQueryMaker
+				.makeSubjectQueryUsingFilters(uri.toString());
+		
+		return  sparqlTasks.queryAsRDFNodeTuple(sparqlQueryString, pred, obj);
+
+	}
+	
+	
+	
+
+
+}

Copied: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitor.java (from rev 1072, trunk/src/dl-learner/org/dllearner/kb/extraction/SparqlTupelAquisitor.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitor.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitor.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.SortedSet;
+
+import org.apache.log4j.Logger;
+import org.dllearner.kb.extraction.Configuration;
+import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlQueryMaker;
+import org.dllearner.utilities.datastructures.RDFNodeTuple;
+
+/**
+ * Can execute different queries.
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public class SparqlTupelAquisitor extends TupelAquisitor {
+	
+	@SuppressWarnings("unused")
+	private static Logger logger = Logger.getLogger(SparqlTupelAquisitor.class);
+	
+	private Configuration configuration;
+	protected SparqlQueryMaker sparqlQueryMaker;
+	protected SPARQLTasks sparqlTasks;
+
+	public SparqlTupelAquisitor(Configuration Configuration) {
+		this.configuration = Configuration;
+		this.sparqlQueryMaker = configuration.getSparqlQueryMaker();
+		this.sparqlTasks = configuration.sparqlTasks;
+	}
+
+	// standard query get a tupels (p,o) for subject s
+	@Override
+	public SortedSet<RDFNodeTuple> getTupelForResource(URI uri) {
+		
+		
+		String pred = "predicate";
+		String obj = "object";
+		// getQuery
+		String sparqlQueryString = sparqlQueryMaker
+				.makeSubjectQueryUsingFilters(uri.toString());
+		
+		return  sparqlTasks.queryAsRDFNodeTuple(sparqlQueryString, pred, obj);
+
+	}
+	
+	
+	
+
+
+}


Property changes on: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitor.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorClasses.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorClasses.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorClasses.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,61 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.SortedSet;
+
+import org.apache.log4j.Logger;
+import org.dllearner.kb.extraction.Configuration;
+import org.dllearner.utilities.datastructures.RDFNodeTuple;
+
+/**
+ * Can execute different queries.
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public class SparqlTupelAquisitorClasses extends SparqlTupelAquisitor {
+
+	@SuppressWarnings("unused")
+	private static Logger logger = Logger.getLogger(SparqlTupelAquisitor.class);
+	
+	public SparqlTupelAquisitorClasses(Configuration configuration) {
+		super(configuration);
+	}
+
+	/*
+	 * Special TypedSparqlQuery which returns superclasses of classes
+	 * (non-Javadoc)
+	 * 
+	 * @see org.dllearner.kb.sparql.TypedSparqlQuery#getTupelForResource(java.net.URI)
+	 */
+	@Override
+	@SuppressWarnings({"unchecked"})
+	public SortedSet<RDFNodeTuple> getTupelForResource(URI uri) {
+		//Set<RDFNodeTuple> s = new TreeSet<RDFNodeTuple>();
+		String pred = "predicate";
+		String obj = "object";
+		// getQuery
+		String sparqlQueryString = sparqlQueryMaker.makeClassQueryUsingFilters(uri.toString());
+		return  sparqlTasks.queryAsRDFNodeTuple(sparqlQueryString, pred, obj);
+	}
+
+}


Property changes on: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorClasses.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.SortedSet;
+
+import org.apache.log4j.Logger;
+import org.dllearner.kb.extraction.Configuration;
+import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlQueryMaker;
+import org.dllearner.utilities.datastructures.RDFNodeTuple;
+
+/**
+ * Can execute different queries.
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public class SparqlTupelAquisitorImproved extends TupelAquisitor {
+	
+	@SuppressWarnings("unused")
+	private static Logger logger = Logger.getLogger(SparqlTupelAquisitorImproved.class);
+	
+	private Configuration configuration;
+	protected SparqlQueryMaker sparqlQueryMaker;
+	protected SPARQLTasks sparqlTasks;
+
+	public SparqlTupelAquisitorImproved(Configuration Configuration) {
+		this.configuration = Configuration;
+		this.sparqlQueryMaker = configuration.getSparqlQueryMaker();
+		this.sparqlTasks = configuration.sparqlTasks;
+	}
+
+	// standard query get a tupels (p,o) for subject s
+	@Override
+	public SortedSet<RDFNodeTuple> getTupelForResource(URI uri) {
+		
+		
+		String pred = "predicate";
+		String obj = "object";
+		// getQuery
+		String sparqlQueryString = sparqlQueryMaker
+				.makeSubjectQueryUsingFilters(uri.toString());
+		
+		return  sparqlTasks.queryAsRDFNodeTuple(sparqlQueryString, pred, obj);
+
+	}
+	
+	
+	
+
+
+}

Copied: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java (from rev 1072, trunk/src/dl-learner/org/dllearner/kb/extraction/TupelAquisitor.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.SortedSet;
+
+import org.dllearner.utilities.datastructures.RDFNodeTuple;
+
+/**
+ * 
+ * Typed SPARQL query interface. The typing means that they all have the same
+ * input and the same output: They are fn: resource -> ( a | b ) where a
+ * normally is a predicate and b an object
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public abstract class TupelAquisitor {
+
+	public abstract SortedSet<RDFNodeTuple> getTupelForResource(URI u);
+}
+
+


Property changes on: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQuery.java (from rev 1072, trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQuery.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQuery.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,124 @@
+/**
+ * Copyright (C) 2007, Sebastian Hellmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.dllearner.core.KnowledgeSource;
+import org.dllearner.kb.extraction.Configuration;
+import org.dllearner.kb.sparql.Cache;
+import org.dllearner.kb.sparql.SparqlQuery;
+import org.dllearner.kb.sparql.SparqlQueryMaker;
+import org.dllearner.utilities.datastructures.StringTuple;
+
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.sparql.core.ResultBinding;
+
+/**
+ * Can execute different queries.
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public class TypedSparqlQuery implements TypedSparqlQueryInterface {
+	
+	private static Logger logger = Logger.getLogger(KnowledgeSource.class);
+
+	
+	boolean print_flag = false;
+	protected Configuration configuration;
+	private SparqlQueryMaker sparqlQueryMaker;
+	Cache cache;
+
+	// boolean debug_no_cache = false;// true means no cache is used
+	// private SparqlHTTPRequest SparqlHTTPRequest;
+	// private SparqlQuery sparqlQuery;
+	// private CachedSparqlQuery cachedSparqlQuery;
+
+	public TypedSparqlQuery(Configuration Configuration) {
+		this.configuration = Configuration;
+		this.sparqlQueryMaker =Configuration.getSparqlQueryMaker();
+		
+		this.cache = new Cache(configuration.cacheDir); 
+		// this.sparqlQuery=new SparqlQuery(configuration.getSparqlEndpoint());
+		// this.cachedSparqlQuery=new
+		// CachedSparqlQuery(this.sparqlQuery,this.cache);
+	}
+
+	// standard query get a tupels (p,o) for subject s
+	/**
+	 * uses a cache and gets the result tuples for a resource u
+	 * 
+	 * @param uri
+	 *            the resource
+	 * @param sparqlQueryString
+	 * @param a
+	 *            the name of the first bound variable for xml parsing, normally
+	 *            predicate
+	 * @param b
+	 *            the name of the second bound variable for xml parsing,
+	 *            normally object
+	 * @return
+	 */
+	@SuppressWarnings({"unchecked"})
+	public Set<StringTuple> getTupelForResource(URI uri) {
+		Set<StringTuple> s = new HashSet<StringTuple>();
+		
+		String a = "predicate";
+		String b = "object";
+		// getQuery
+		String sparqlQueryString = sparqlQueryMaker
+				.makeSubjectQueryUsingFilters(uri.toString());
+
+//		CachedSparqlQuery csq = new CachedSparqlQuery(configuration
+//				.getSparqlEndpoint(), cache, uri.toString(), sparqlQueryString);
+
+		SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
+//		query.extraDebugInfo=uri.toString();
+		String JSON = cache.executeSparqlQuery(query);
+		
+		ResultSet rs = SparqlQuery.convertJSONtoResultSet(JSON);
+		
+		List<ResultBinding> l = ResultSetFormatter.toList(rs);
+		
+		logger.trace(l.toString());
+		for (ResultBinding resultBinding : l) {
+					
+			s.add(new StringTuple(resultBinding.get(a).toString(),
+					resultBinding.get(b).toString()));
+		}
+		return s;
+	}
+
+	
+
+	
+
+	
+	
+
+
+
+}


Property changes on: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQuery.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryClasses.java (from rev 1072, trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryClasses.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryClasses.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,80 @@
+/**
+ * Copyright (C) 2007, Sebastian Hellmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.dllearner.kb.extraction.Configuration;
+import org.dllearner.kb.sparql.SparqlQuery;
+import org.dllearner.utilities.datastructures.StringTuple;
+
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.sparql.core.ResultBinding;
+
+/**
+ * Can execute different queries.
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public class TypedSparqlQueryClasses extends TypedSparqlQuery implements
+		TypedSparqlQueryInterface {
+
+	public TypedSparqlQueryClasses(Configuration configuration) {
+		super(configuration);
+	}
+
+	/*
+	 * Special TypedSparqlQuery which returns superclasses of classes
+	 * (non-Javadoc)
+	 * 
+	 * @see org.dllearner.kb.sparql.TypedSparqlQuery#getTupelForResource(java.net.URI)
+	 */
+	@Override
+	@SuppressWarnings({"unchecked"})
+	public Set<StringTuple> getTupelForResource(URI uri) {
+		Set<StringTuple> s = new HashSet<StringTuple>();
+		String a = "predicate";
+		String b = "object";
+		// getQuery for all super classes of classes only
+		String sparqlQueryString = "SELECT ?predicate ?object " + "WHERE {"
+				+ "<" + uri.toString() + "> ?predicate ?object;"
+				+ "a ?object . "
+				+ " FILTER (!regex(str(?object),'http://xmlns.com/foaf/0.1/'))"
+				+ "}";
+
+		SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
+//		query.extraDebugInfo=uri.toString();
+		ResultSet rs = SparqlQuery.convertJSONtoResultSet(cache.executeSparqlQuery(query));		
+		
+		List<ResultBinding> l = ResultSetFormatter.toList(rs);
+		for (ResultBinding resultBinding : l) {
+					
+			s.add(new StringTuple(resultBinding.get(a).toString(),
+					resultBinding.get(b).toString()));
+		}
+		return s;
+	}
+
+}


Property changes on: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryClasses.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryInterface.java (from rev 1072, trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryInterface.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryInterface.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,39 @@
+/**
+ * Copyright (C) 2007, Sebastian Hellmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.kb.aquisitors;
+
+import java.net.URI;
+import java.util.Set;
+
+import org.dllearner.utilities.datastructures.StringTuple;
+
+/**
+ * 
+ * Typed SPARQL query interface. The typing means that they all have the same
+ * input and the same output: They are fn: resource -> ( a | b ) where a
+ * normally is a predicate and b an object
+ * 
+ * @author Sebastian Hellmann
+ * 
+ */
+public interface TypedSparqlQueryInterface {
+
+	public Set<StringTuple> getTupelForResource(URI u);
+}


Property changes on: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TypedSparqlQueryInterface.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -27,6 +27,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import org.dllearner.kb.aquisitors.TypedSparqlQueryInterface;
 import org.dllearner.utilities.datastructures.StringTuple;
 
 /**

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -31,10 +31,11 @@
  */
 public class Configuration {
 
-	private SPARQLTasks sparqlTasks;
+	public SPARQLTasks sparqlTasks;
 	
 	private SparqlEndpoint endpoint;
 	private SparqlQueryMaker sparqlQueryMaker;
+	
 	private Manipulators manipulator;
 	// the following needs to be moved to
 	// class extraction algorithm or manipulator

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -24,6 +24,8 @@
 import java.util.Vector;
 
 import org.apache.log4j.Logger;
+import org.dllearner.kb.aquisitors.TypedSparqlQuery;
+import org.dllearner.kb.aquisitors.TypedSparqlQueryClasses;
 
 /**
  * This class is used to extract the information .

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -27,6 +27,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import org.dllearner.kb.aquisitors.TypedSparqlQueryInterface;
 import org.dllearner.utilities.datastructures.StringTuple;
 
 /**

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -25,6 +25,7 @@
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
+import org.dllearner.kb.aquisitors.TypedSparqlQuery;
 import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.kb.sparql.SparqlQueryMaker;
 import org.dllearner.utilities.statistics.Statistics;

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -23,7 +23,9 @@
 import java.util.SortedSet;
 import java.util.Vector;
 
+import org.dllearner.kb.aquisitors.TypedSparqlQueryInterface;
 
+
 /**
  * Abstract class. defines functions to expand the nodes
  * 

Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -27,6 +27,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import org.dllearner.kb.aquisitors.TypedSparqlQueryInterface;
 import org.dllearner.utilities.datastructures.StringTuple;
 
 /**

Deleted: trunk/src/dl-learner/org/dllearner/kb/extraction/SparqlTupelAquisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/SparqlTupelAquisitor.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/SparqlTupelAquisitor.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -1,124 +0,0 @@
-/**
- * Copyright (C) 2007, Sebastian Hellmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.kb.extraction;
-
-import java.net.URI;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.log4j.Logger;
-import org.dllearner.kb.sparql.Cache;
-import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.kb.sparql.SparqlQueryMaker;
-import org.dllearner.utilities.datastructures.StringTuple;
-
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.ResultSetFormatter;
-import com.hp.hpl.jena.sparql.core.ResultBinding;
-
-/**
- * Can execute different queries.
- * 
- * @author Sebastian Hellmann
- * 
- */
-public class SparqlTupelAquisitor extends TupelAquisitor {
-	
-	private static Logger logger = Logger.getLogger(SparqlTupelAquisitor.class);
-
-	
-	//boolean print_flag = false;
-	private Configuration configuration;
-	private SparqlQueryMaker sparqlQueryMaker;
-	Cache cache;
-
-	// boolean debug_no_cache = false;// true means no cache is used
-	// private SparqlHTTPRequest SparqlHTTPRequest;
-	// private SparqlQuery sparqlQuery;
-	// private CachedSparqlQuery cachedSparqlQuery;
-
-	public SparqlTupelAquisitor(Configuration Configuration) {
-		this.configuration = Configuration;
-		/*this.sparqlQueryMaker = new SparqlQueryMaker(Configuration
-				.getSparqlQueryType());
-		*/
-		this.cache = new Cache(configuration.cacheDir); 
-		// this.sparqlQuery=new SparqlQuery(configuration.getSparqlEndpoint());
-		// this.cachedSparqlQuery=new
-		// CachedSparqlQuery(this.sparqlQuery,this.cache);
-	}
-
-	// standard query get a tupels (p,o) for subject s
-	/**
-	 * uses a cache and gets the result tuples for a resource u
-	 * 
-	 * @param uri
-	 *            the resource
-	 * @param sparqlQueryString
-	 * @param a
-	 *            the name of the first bound variable for xml parsing, normally
-	 *            predicate
-	 * @param b
-	 *            the name of the second bound variable for xml parsing,
-	 *            normally object
-	 * @return
-	 */
-	@Override
-	@SuppressWarnings({"unchecked"})
-	public SortedSet<StringTuple> getTupelForResource(URI uri) {
-		SortedSet<StringTuple> s = new TreeSet<StringTuple>();
-		
-		String a = "predicate";
-		String b = "object";
-		// getQuery
-		String sparqlQueryString = sparqlQueryMaker
-				.makeSubjectQueryUsingFilters(uri.toString());
-
-//		CachedSparqlQuery csq = new CachedSparqlQuery(configuration
-//				.getSparqlEndpoint(), cache, uri.toString(), sparqlQueryString);
-
-		SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
-//		query.extraDebugInfo=uri.toString();
-		String JSON = cache.executeSparqlQuery(query);
-		
-		ResultSet rs = SparqlQuery.convertJSONtoResultSet(JSON);
-		
-		List<ResultBinding> l = ResultSetFormatter.toList(rs);
-		
-		logger.trace(l.toString());
-		for (ResultBinding resultBinding : l) {
-					
-			s.add(new StringTuple(resultBinding.get(a).toString(),
-					resultBinding.get(b).toString()));
-		}
-		return s;
-	}
-
-	
-
-	
-
-	
-	
-
-
-
-}

Deleted: trunk/src/dl-learner/org/dllearner/kb/extraction/TupelAquisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TupelAquisitor.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TupelAquisitor.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -1,41 +0,0 @@
-/**
- * Copyright (C) 2007, Sebastian Hellmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.kb.extraction;
-
-import java.net.URI;
-import java.util.SortedSet;
-
-import org.dllearner.utilities.datastructures.StringTuple;
-
-/**
- * 
- * Typed SPARQL query interface. The typing means that they all have the same
- * input and the same output: They are fn: resource -> ( a | b ) where a
- * normally is a predicate and b an object
- * 
- * @author Sebastian Hellmann
- * 
- */
-public abstract class TupelAquisitor {
-
-	public abstract SortedSet<StringTuple> getTupelForResource(URI u);
-}
-
-

Deleted: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -1,123 +0,0 @@
-/**
- * Copyright (C) 2007, Sebastian Hellmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.kb.extraction;
-
-import java.net.URI;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.dllearner.core.KnowledgeSource;
-import org.dllearner.kb.sparql.Cache;
-import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.kb.sparql.SparqlQueryMaker;
-import org.dllearner.utilities.datastructures.StringTuple;
-
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.ResultSetFormatter;
-import com.hp.hpl.jena.sparql.core.ResultBinding;
-
-/**
- * Can execute different queries.
- * 
- * @author Sebastian Hellmann
- * 
- */
-public class TypedSparqlQuery implements TypedSparqlQueryInterface {
-	
-	private static Logger logger = Logger.getLogger(KnowledgeSource.class);
-
-	
-	boolean print_flag = false;
-	protected Configuration configuration;
-	private SparqlQueryMaker sparqlQueryMaker;
-	Cache cache;
-
-	// boolean debug_no_cache = false;// true means no cache is used
-	// private SparqlHTTPRequest SparqlHTTPRequest;
-	// private SparqlQuery sparqlQuery;
-	// private CachedSparqlQuery cachedSparqlQuery;
-
-	public TypedSparqlQuery(Configuration Configuration) {
-		this.configuration = Configuration;
-		this.sparqlQueryMaker =Configuration.getSparqlQueryMaker();
-		
-		this.cache = new Cache(configuration.cacheDir); 
-		// this.sparqlQuery=new SparqlQuery(configuration.getSparqlEndpoint());
-		// this.cachedSparqlQuery=new
-		// CachedSparqlQuery(this.sparqlQuery,this.cache);
-	}
-
-	// standard query get a tupels (p,o) for subject s
-	/**
-	 * uses a cache and gets the result tuples for a resource u
-	 * 
-	 * @param uri
-	 *            the resource
-	 * @param sparqlQueryString
-	 * @param a
-	 *            the name of the first bound variable for xml parsing, normally
-	 *            predicate
-	 * @param b
-	 *            the name of the second bound variable for xml parsing,
-	 *            normally object
-	 * @return
-	 */
-	@SuppressWarnings({"unchecked"})
-	public Set<StringTuple> getTupelForResource(URI uri) {
-		Set<StringTuple> s = new HashSet<StringTuple>();
-		
-		String a = "predicate";
-		String b = "object";
-		// getQuery
-		String sparqlQueryString = sparqlQueryMaker
-				.makeSubjectQueryUsingFilters(uri.toString());
-
-//		CachedSparqlQuery csq = new CachedSparqlQuery(configuration
-//				.getSparqlEndpoint(), cache, uri.toString(), sparqlQueryString);
-
-		SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
-//		query.extraDebugInfo=uri.toString();
-		String JSON = cache.executeSparqlQuery(query);
-		
-		ResultSet rs = SparqlQuery.convertJSONtoResultSet(JSON);
-		
-		List<ResultBinding> l = ResultSetFormatter.toList(rs);
-		
-		logger.trace(l.toString());
-		for (ResultBinding resultBinding : l) {
-					
-			s.add(new StringTuple(resultBinding.get(a).toString(),
-					resultBinding.get(b).toString()));
-		}
-		return s;
-	}
-
-	
-
-	
-
-	
-	
-
-
-
-}

Deleted: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -1,79 +0,0 @@
-/**
- * Copyright (C) 2007, Sebastian Hellmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.kb.extraction;
-
-import java.net.URI;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.utilities.datastructures.StringTuple;
-
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.ResultSetFormatter;
-import com.hp.hpl.jena.sparql.core.ResultBinding;
-
-/**
- * Can execute different queries.
- * 
- * @author Sebastian Hellmann
- * 
- */
-public class TypedSparqlQueryClasses extends TypedSparqlQuery implements
-		TypedSparqlQueryInterface {
-
-	public TypedSparqlQueryClasses(Configuration configuration) {
-		super(configuration);
-	}
-
-	/*
-	 * Special TypedSparqlQuery which returns superclasses of classes
-	 * (non-Javadoc)
-	 * 
-	 * @see org.dllearner.kb.sparql.TypedSparqlQuery#getTupelForResource(java.net.URI)
-	 */
-	@Override
-	@SuppressWarnings({"unchecked"})
-	public Set<StringTuple> getTupelForResource(URI uri) {
-		Set<StringTuple> s = new HashSet<StringTuple>();
-		String a = "predicate";
-		String b = "object";
-		// getQuery for all super classes of classes only
-		String sparqlQueryString = "SELECT ?predicate ?object " + "WHERE {"
-				+ "<" + uri.toString() + "> ?predicate ?object;"
-				+ "a ?object . "
-				+ " FILTER (!regex(str(?object),'http://xmlns.com/foaf/0.1/'))"
-				+ "}";
-
-		SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
-//		query.extraDebugInfo=uri.toString();
-		ResultSet rs = SparqlQuery.convertJSONtoResultSet(cache.executeSparqlQuery(query));		
-		
-		List<ResultBinding> l = ResultSetFormatter.toList(rs);
-		for (ResultBinding resultBinding : l) {
-					
-			s.add(new StringTuple(resultBinding.get(a).toString(),
-					resultBinding.get(b).toString()));
-		}
-		return s;
-	}
-
-}

Deleted: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -1,39 +0,0 @@
-/**
- * Copyright (C) 2007, Sebastian Hellmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.kb.extraction;
-
-import java.net.URI;
-import java.util.Set;
-
-import org.dllearner.utilities.datastructures.StringTuple;
-
-/**
- * 
- * Typed SPARQL query interface. The typing means that they all have the same
- * input and the same output: They are fn: resource -> ( a | b ) where a
- * normally is a predicate and b an object
- * 
- * @author Sebastian Hellmann
- * 
- */
-public interface TypedSparqlQueryInterface {
-
-	public Set<StringTuple> getTupelForResource(URI u);
-}

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -24,6 +24,7 @@
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
+import org.dllearner.utilities.datastructures.RDFNodeTuple;
 import org.dllearner.utilities.datastructures.StringTuple;
 
 import com.hp.hpl.jena.query.ResultSet;
@@ -383,7 +384,7 @@
 		return queryAsSet(sparqlQueryString, variable);
 	}
 	
-	
+	@Deprecated
 	public SortedSet<StringTuple> queryAsTuple(String subject, boolean filterLiterals) {
 		ResultSetRewindable rs = null;
 		String p = "predicate";
@@ -405,6 +406,47 @@
 		return getTuplesFromResultSet(rs, p, o);
 	}
 
+	@Deprecated
+	public SortedSet<StringTuple> queryAsTuple(String sparqlQueryString, String var1, String var2) {
+		ResultSetRewindable rs = null;
+		try {
+			String jsonString = query(sparqlQueryString);
+			rs = SparqlQuery.convertJSONtoResultSet(jsonString);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		
+		//SimpleClock sc = new SimpleClock();
+		//rw = ResultSetFactory.makeRewindable(rs);
+		//sc.printAndSet("rewindable");
+		return getTuplesFromResultSet(rs, var1, var2);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public SortedSet<RDFNodeTuple> queryAsRDFNodeTuple(String sparqlQueryString, String var1, String var2) {
+		ResultSetRewindable rsw = null;
+		SortedSet<RDFNodeTuple> returnSet = new TreeSet<RDFNodeTuple>();
+		
+		try {
+			String jsonString = query(sparqlQueryString);
+			rsw = SparqlQuery.convertJSONtoResultSet(jsonString);
+
+		} catch (Exception e) {
+			logger.warn(e.getMessage());
+		}
+		
+		List<ResultBinding> l = ResultSetFormatter.toList(rsw);
+		for (ResultBinding resultBinding : l) {
+			returnSet.add(new RDFNodeTuple(resultBinding.get(var1),resultBinding.get(var2)));
+		}
+		
+		rsw.reset();
+		
+		return returnSet;
+	}
+
+	
 	/**
 	 * little higher level, executes query ,returns all resources for a
 	 * variable.

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -96,7 +96,23 @@
 
 		return returnString;
 	}
+	
+	public String makeClassQueryUsingFilters(String subject) {
 
+		// String filter = internalFilterAssemblySubject();
+		String tmpFilter = internalFilterAssemblySubject("predicate", "object");
+			tmpFilter = (tmpFilter.length() > 0) ? "FILTER( " + lineend + tmpFilter
+					+ "). " : " ";
+		
+		String returnString = "SELECT * WHERE {" +lineend + 
+			"<" + subject + "> ?predicate ?object;" +
+			"a ?object . "+lineend+
+			tmpFilter + "}";
+
+
+		return returnString;
+	}
+
 	public String makeSubjectQueryLevel(String subject, int level) {
 		
 		// String filter = internalFilterAssemblySubject();

Modified: trunk/src/dl-learner/org/dllearner/test/FilterTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/FilterTest.java	2008-08-14 12:09:10 UTC (rev 1072)
+++ trunk/src/dl-learner/org/dllearner/test/FilterTest.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -36,6 +36,7 @@
 	/**
 	 * @param args
 	 */
+	@SuppressWarnings("deprecation")
 	public static void main(String[] args) {
 	//	System.out.println(qextralong);
 	
@@ -78,6 +79,7 @@
 		
 	}
 	
+	@SuppressWarnings("deprecation")
 	static void testShort(){
 		SortedSet<StringTuple> tupleset = new TreeSet<StringTuple>();
 		sc.reset();
@@ -116,6 +118,7 @@
 		sc.printAndSet("qextrashort ");
 	}
 	
+	@SuppressWarnings("deprecation")
 	static void  testShortWithFilter(){
 		SortedSet<StringTuple> tupleset = new TreeSet<StringTuple>();
 		SortedSet<StringTuple> afterfilter= new TreeSet<StringTuple>();

Added: trunk/src/dl-learner/org/dllearner/test/TripleTypeTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/TripleTypeTest.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/test/TripleTypeTest.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,44 @@
+package org.dllearner.test;
+
+import java.util.List;
+
+import org.dllearner.kb.sparql.Cache;
+import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlEndpoint;
+
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.query.ResultSetRewindable;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.sparql.core.ResultBinding;
+
+public class TripleTypeTest {
+
+	
+	public static void main(String[] args) {
+		String sparqlQueryString ="SELECT * WHERE { <http://dbpedia.org/resource/Angela_Merkel> ?predicate ?object. FILTER (isLiteral(?object))}";
+		//sparqlQueryString ="SELECT * WHERE { <http://dbpedia.org/resource/Angela_Merkel> <http://dbpedia.org/property/hasPhotoCollection> ?object }";
+		System.out.println(sparqlQueryString);
+		
+		SPARQLTasks st = new SPARQLTasks (Cache.getDefaultCache(), SparqlEndpoint.getEndpointDBpedia());
+		
+		ResultSetRewindable rsw = st.queryAsResultSet(sparqlQueryString);
+		List<ResultBinding> l = ResultSetFormatter.toList(rsw);
+		
+		for (ResultBinding binding : l) {
+			//RDFNode pred = binding.get("predicate");
+			RDFNode obj = binding.get("object");
+			//System.out.println(pred.toString());
+			//System.out.println(obj.toString());
+			System.out.println(obj.isLiteral());
+			System.out.println(obj.isAnon());
+			System.out.println(obj.isResource());
+			System.out.println(obj.isURIResource());
+			Literal lit =(Literal) obj;
+			System.out.println(lit.toString());
+			System.out.println(lit.getLanguage());
+		}
+		
+		
+	}
+}

Added: trunk/src/dl-learner/org/dllearner/utilities/datastructures/RDFNodeTuple.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/datastructures/RDFNodeTuple.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/utilities/datastructures/RDFNodeTuple.java	2008-08-14 14:18:37 UTC (rev 1073)
@@ -0,0 +1,55 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.utilities.datastructures;
+
+import com.hp.hpl.jena.rdf.model.RDFNode;
+
+/**
+ * A container which can hold two Strings, mainly used as a helper.
+ * Also used as pre form, if you want to create triple, that have the same subject
+ * @author Sebastian Hellmann
+ */
+public class RDFNodeTuple implements Comparable<RDFNodeTuple>{
+
+	public RDFNode a;
+	public RDFNode b;
+
+	public RDFNodeTuple(RDFNode a, RDFNode b) {
+		this.a = a;
+		this.b = b;
+	}
+
+	@Override
+	public String toString() {
+		return "<" + a.toString() + "|" + b.toString() + ">";
+	}
+
+	public boolean equals(RDFNodeTuple t) {
+		return ((b.toString().equals(t.b.toString())) && (a.toString().equals(t.a)));
+	}
+	
+	public int compareTo(RDFNodeTuple t){
+		int comp = a.toString().compareTo(t.a.toString());
+		if( comp == 0 ){
+			return b.toString().compareTo(t.b.toString());
+		}else return comp;
+	}
+
+}


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




Thread: [DL-Learner SVN] SF.net SVN: dl-learner:[1073] trunk/src/dl-learner/org/dllearner (Page 2)

dl-learner-svn