Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [342] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-01-06 11:21:12
|
Revision: 342
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=342&view=rev
Author: jenslehmann
Date: 2008-01-06 03:21:05 -0800 (Sun, 06 Jan 2008)
Log Message:
-----------
Removed warnings. Changed Sebastians class comments to conform to the Javadoc standard.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/SparqlEndpoint.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Configuration.java
trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java
trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java
trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedEndpoint.java
trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedFilter.java
trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryType.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SpecificSparqlEndpoint.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Test.java
trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java
trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryClasses.java
trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryInterface.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
Modified: trunk/src/dl-learner/org/dllearner/kb/SparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/SparqlEndpoint.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/SparqlEndpoint.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -28,6 +28,12 @@
import java.net.URLEncoder;
import java.util.HashMap;
+/**
+ * SPARQL query cache to avoid possibly expensive multiple queries.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class Cache implements Serializable {
// Object can be the cache itself
// or a cache object(one entry)
@@ -40,7 +46,7 @@
long timestamp;
long daysoffreshness = 15;
long multiplier = 24 * 60 * 60 * 1000;// h m s ms
- private HashMap<String, String> inmem_cache;
+ // private HashMap<String, String> inmem_cache;
// constructor for the cache itself
public Cache(String path) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -27,7 +27,11 @@
import org.dllearner.utilities.StringTuple;
-// is a node in the graph that is a class
+/**
+ * Is a node in the graph that is a class.
+ *
+ * @author Sebastian Hellmann
+ */
public class ClassNode extends Node {
Set<PropertyNode> properties = new HashSet<PropertyNode>();
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Configuration.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Configuration.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Configuration.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -19,7 +19,11 @@
*/
package org.dllearner.kb.sparql;
-//stores all configuration settings
+/**
+ * Stores all configuration settings.
+ *
+ * @author Sebastian Hellmann
+ */
public class Configuration {
/*
@@ -35,9 +39,6 @@
private int recursiondepth = 2;
private boolean getAllBackground = true;
- private Configuration() {
- }
-
public Configuration(SpecificSparqlEndpoint specificSparqlEndpoint,
SparqlQueryType sparqlQueryType, Manipulator manipulator, int recursiondepth,
boolean getAllBackground) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -23,7 +23,11 @@
import java.util.HashSet;
import java.util.Vector;
-// this class is used to extract the information recursively
+/**
+ * This class is used to extract the information recursively.
+ *
+ * @author Sebastian Hellmann
+ */
public class ExtractionAlgorithm {
private Configuration configuration;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -27,7 +27,12 @@
import org.dllearner.utilities.StringTuple;
-// a node in the graph that is an instance
+/**
+ * A node in the graph that is an instance.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class InstanceNode extends Node {
Set<ClassNode> classes = new HashSet<ClassNode>();
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -27,7 +27,12 @@
import org.dllearner.utilities.StringTuple;
-// an object of this class encapsulates everything
+/**
+ * An object of this class encapsulates everything.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class Manager {
private Configuration configuration;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -26,7 +26,12 @@
import org.dllearner.utilities.StringTuple;
-// used to manipulate retrieved tupels, identify blanknodes, etc.
+/**
+ * Used to manipulate retrieved tupels, identify blanknodes, etc.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class Manipulator {
public String subclass = "http://www.w3.org/2000/01/rdf-schema#subClassOf";
public String type = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -23,7 +23,12 @@
import java.util.Set;
import java.util.Vector;
-// abstract class
+/**
+ * Abstract class.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public abstract class Node implements Comparable<Node> {
URI uri;
protected String type;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedEndpoint.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedEndpoint.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -22,7 +22,12 @@
import java.net.URL;
import java.util.HashMap;
-// holds some predefined endpoints
+/**
+ * Holds some predefined endpoints.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class PredefinedEndpoint {
public static SpecificSparqlEndpoint getEndpoint(int i) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedFilter.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedFilter.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/PredefinedFilter.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -22,6 +22,12 @@
import java.util.HashSet;
import java.util.Set;
+/**
+ * Predefined filters.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class PredefinedFilter {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -27,6 +27,12 @@
import org.dllearner.utilities.StringTuple;
+/**
+ * Property node.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class PropertyNode extends Node {
// the a and b part of a property
@@ -78,7 +84,10 @@
return this.expand(tsq, m);
}
-
+ public Node getA() {
+ return a;
+ }
+
public Node getB() {
return b;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -19,7 +19,12 @@
*/
package org.dllearner.kb.sparql;
-// can assemble sparql queries
+/**
+ * Can assemble sparql queries.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class SparqlQueryMaker {
String lineend="\n";
boolean print_flag=false;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryType.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryType.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryType.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -21,7 +21,12 @@
import java.util.Set;
-// is used to set the filter: configuration
+/**
+ * Is used to set the filter: configuration.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class SparqlQueryType {
// TODO make sets out of them
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SpecificSparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SpecificSparqlEndpoint.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SpecificSparqlEndpoint.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -22,7 +22,12 @@
import java.net.URL;
import java.util.HashMap;
-// one sparql endpoint configuration
+/**
+ * One sparql endpoint configuration.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class SpecificSparqlEndpoint {
String host;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Test.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Test.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Test.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -23,15 +23,20 @@
import java.io.FileWriter;
import java.net.URI;
-// test class
+/**
+ * Test class.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class Test {
public static void main(String[] args) {
System.out.println("Start");
- String test2 = "http://www.extraction.org/config#dbpediatest";
- String test = "http://www.extraction.org/config#localjoseki";
+ // String test2 = "http://www.extraction.org/config#dbpediatest";
+ // String test = "http://www.extraction.org/config#localjoseki";
try {
- URI u = new URI(test);
+ // URI u = new URI(test);
Manager m = new Manager();
// m.usePredefinedConfiguration(u);
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -34,7 +34,12 @@
import org.dllearner.utilities.StringTuple;
-// can execute different queries
+/**
+ * Can execute different queries.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class TypedSparqlQuery implements TypedSparqlQueryInterface{
boolean print_flag=false;
boolean debug_no_cache=false;// true means no cahce is used
@@ -129,9 +134,9 @@
String two = "binding name=\"" + b + "\"";
String endbinding= "binding";
String uri="uri";
- String uridel = "<uri>";
+ //String uridel = "<uri>";
String bnode = "<bnode>";
- String uriend = "</uri>";
+ //String uriend = "</uri>";
String predtmp = "";
String objtmp = "";
//System.out.println(getNextResult(xml));
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryClasses.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryClasses.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryClasses.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -34,7 +34,12 @@
import org.dllearner.utilities.StringTuple;
-// can execute different queries
+/**
+ * Can execute different queries.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public class TypedSparqlQueryClasses implements TypedSparqlQueryInterface{
boolean print_flag=false;
boolean debug_no_cache=false;
@@ -113,9 +118,9 @@
String two = "binding name=\"" + b + "\"";
String endbinding= "binding";
String uri="uri";
- String uridel = "<uri>";
+ //String uridel = "<uri>";
String bnode = "<bnode>";
- String uriend = "</uri>";
+ //String uriend = "</uri>";
String predtmp = "";
String objtmp = "";
//System.out.println(getNextResult(xml));
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryInterface.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryInterface.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQueryInterface.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -5,6 +5,13 @@
import org.dllearner.utilities.StringTuple;
+/**
+ *
+ * Type SPARQL query interface.
+ *
+ * @author Sebastian Hellmann
+ *
+ */
public interface TypedSparqlQueryInterface {
public Set<StringTuple> query(URI u);
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-01-06 10:57:59 UTC (rev 341)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-01-06 11:21:05 UTC (rev 342)
@@ -37,6 +37,7 @@
import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.dl.AtomicConcept;
import org.dllearner.core.dl.AtomicRole;
+import org.dllearner.core.dl.Concept;
import org.dllearner.core.dl.Individual;
import org.dllearner.core.dl.RoleHierarchy;
import org.dllearner.core.dl.SubsumptionHierarchy;
@@ -69,10 +70,10 @@
private Set<KnowledgeSource> sources;
private OWLReasoner reasoner;
- private ConceptComparator conceptComparator = new ConceptComparator();
- private RoleComparator roleComparator = new RoleComparator();
- private SubsumptionHierarchy subsumptionHierarchy;
- private RoleHierarchy roleHierarchy;
+ // private ConceptComparator conceptComparator = new ConceptComparator();
+ // private RoleComparator roleComparator = new RoleComparator();
+ // private SubsumptionHierarchy subsumptionHierarchy;
+ // private RoleHierarchy roleHierarchy;
public OWLAPIReasoner(Set<KnowledgeSource> sources) {
this.sources = sources;
@@ -151,7 +152,7 @@
* @see org.dllearner.core.Reasoner#getAtomicConcepts()
*/
public Set<AtomicConcept> getAtomicConcepts() {
- // reasoner
+ // reasoner.
// TODO Auto-generated method stub
return null;
@@ -189,6 +190,12 @@
}
+ @Override
+ public boolean subsumes(Concept superConcept, Concept subConcept) {
+ // reasoner.isSubClassOf(arg0, arg1);
+ return false;
+ }
+
/**
* Test
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
