Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [303] trunk/src/dl-learner/org/dllearner/kb/sparql
|
From: <jen...@us...> - 2007-12-02 14:41:40
|
Revision: 303
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=303&view=rev
Author: jenslehmann
Date: 2007-12-02 06:41:38 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
Fixed more code style problems. (Do not use this.object when object is sufficient.)
Modified Paths:
--------------
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/PropertyNode.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Tupel.java
trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -37,14 +37,14 @@
System.out.println("StartVector: " + v);
// n.expand(tsp, this.Manipulator);
// Vector<Node> second=
- for (int x = 1; x <= this.recursionDepth; x++) {
+ for (int x = 1; x <= recursionDepth; x++) {
Vector<Node> tmp = new Vector<Node>();
while (v.size() > 0) {
Node tmpNode = v.remove(0);
System.out.println("Expanding " + tmpNode);
//System.out.println(this.Manipulator);
- Vector<Node> tmpVec = tmpNode.expand(tsp, this.manipulator);
+ Vector<Node> tmpVec = tmpNode.expand(tsp, manipulator);
tmp.addAll(tmpVec);
}
@@ -62,7 +62,7 @@
System.out.println(classes.size());
Node next=classes.remove(0);
System.out.println(next);
- classes.addAll(next.expand(tsp, this.manipulator));
+ classes.addAll(next.expand(tsp, manipulator));
}
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -21,7 +21,7 @@
@Override
public Vector<Node> expand(TypedSparqlQuery tsq, Manipulator m) {
- Set<Tupel> s = tsq.query(this.uri);
+ Set<Tupel> s = tsq.query(uri);
// Manipulation
m.check(s, this);
//System.out.println("fffffff"+m);
@@ -48,7 +48,7 @@
}
}
- this.expanded = true;
+ expanded = true;
return Nodes;
}
@@ -60,15 +60,15 @@
@Override
public Set<String> toNTriple() {
Set<String> s = new HashSet<String>();
- s.add("<" + this.uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ s.add("<" + uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ "http://www.w3.org/2002/07/owl#Thing" + ">.");
for (ClassNode one : classes) {
- s.add("<" + this.uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ s.add("<" + uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ one.getURI() + ">.");
s.addAll(one.toNTriple());
}
for (PropertyNode one : properties) {
- s.add("<" + this.uri + "><" + one.getURI() + "><" + one.getB().getURI() + ">.");
+ s.add("<" + uri + "><" + one.getURI() + "><" + one.getB().getURI() + ">.");
s.addAll(one.toNTriple());
s.addAll(one.getB().toNTriple());
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Manager.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -35,7 +35,7 @@
// this.TypedSparqlQuery.query(uri);
// System.out.println(ExtractionAlgorithm.getFirstNode(uri));
System.out.println("Start extracting");
- Node n = this.extractionAlgorithm.expandNode(uri, this.typedSparqlQuery);
+ Node n = extractionAlgorithm.expandNode(uri, typedSparqlQuery);
Set<String> s = n.toNTriple();
String nt = "";
for (String str : s) {
@@ -52,7 +52,7 @@
for (String one : instances) {
try {
- Node n = this.extractionAlgorithm.expandNode(new URI(one), this.typedSparqlQuery);
+ Node n = extractionAlgorithm.expandNode(new URI(one), typedSparqlQuery);
ret.addAll(n.toNTriple());
} catch (Exception e) {
e.printStackTrace();
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -34,21 +34,20 @@
while (it.hasNext()) {
Tupel t = (Tupel) it.next();
// all classes with owl:type class
- if (t.a.equals(this.type) && t.b.equals(this.classns) && node.isClass()) {
+ if (t.a.equals(type) && t.b.equals(classns) && node.isClass()) {
toRemove.add(t);
}
- ;
+
// all with type class
- if (t.b.equals(this.classns) && node.isClass()) {
+ if (t.b.equals(classns) && node.isClass()) {
toRemove.add(t);
}
- ;
+
// all instances with owl:type thing
- if (t.a.equals(this.type) && t.b.equals(this.thing) && node.isInstance()) {
+ if (t.a.equals(type) && t.b.equals(thing) && node.isInstance()) {
toRemove.add(t);
}
- ;
-
+
}
s.removeAll(toRemove);
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -28,7 +28,7 @@
@Override
public Vector<Node> expand(TypedSparqlQuery tsq, Manipulator m) {
- Set<Tupel> s = tsq.query(this.uri);
+ Set<Tupel> s = tsq.query(uri);
Vector<Node> Nodes = new Vector<Node>();
// Manipulation
@@ -54,16 +54,16 @@
}
public Node getB() {
- return this.b;
+ return b;
}
@Override
public Set<String> toNTriple() {
Set<String> s = new HashSet<String>();
- s.add("<" + this.uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ s.add("<" + uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ "http://www.w3.org/2002/07/owl#ObjectProperty" + ">.");
for (String one : specialTypes) {
- s.add("<" + this.uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ s.add("<" + uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"
+ one + ">.");
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -14,10 +14,10 @@
String Filter = "";
if (!this.sparqlQueryType.isLiterals())
Filter += "!isLiteral(?object))";
- for (String p : this.sparqlQueryType.getPredicatefilterlist()) {
+ for (String p : sparqlQueryType.getPredicatefilterlist()) {
Filter += lineend + filterPredicate(p);
}
- for (String o : this.sparqlQueryType.getObjectfilterlist()) {
+ for (String o : sparqlQueryType.getObjectfilterlist()) {
Filter += lineend + filterObject(o);
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Tupel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Tupel.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Tupel.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -16,7 +16,7 @@
}
public boolean equals(Tupel t) {
- if (this.a.equals(t.a) && this.b.equals(t.b))
+ if (a.equals(t.a) && b.equals(t.b))
return true;
else
return false;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java 2007-12-02 14:34:12 UTC (rev 302)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java 2007-12-02 14:41:38 UTC (rev 303)
@@ -17,13 +17,13 @@
private Configuration configuration;
// private SparqlHTTPRequest SparqlHTTPRequest;
private SparqlQueryMaker sparqlQueryMaker;
- Cache Cache;
+ Cache cache;
public TypedSparqlQuery(Configuration Configuration) {
this.configuration = Configuration;
// this.SparqlHTTPRequest = new SparqlHTTPRequest(Configuration.getSparqlEndpoint());
this.sparqlQueryMaker = new SparqlQueryMaker(Configuration.getSparqlQueryType());
- this.Cache = new Cache("cache");
+ this.cache = new Cache("cache");
}
public Set<Tupel> query(URI u) {
@@ -32,7 +32,7 @@
String sparql = sparqlQueryMaker.makeQueryUsingFilters(u.toString());
// check cache
- String FromCache = this.Cache.get(u.toString(), sparql);
+ String FromCache = cache.get(u.toString(), sparql);
String xml = null;
// if not in cache get it from EndPoint
@@ -45,7 +45,7 @@
}
//System.out.println(sparql);
//System.out.println(xml);
- this.Cache.put(u.toString(), xml, sparql);
+ cache.put(u.toString(), xml, sparql);
System.out.print("\n");
} else {
xml = FromCache;
@@ -54,7 +54,7 @@
// System.out.println(xml);
// process XML
- Set<Tupel> s = this.processResult(xml);
+ Set<Tupel> s = processResult(xml);
try {
System.out.println("retrieved " + s.size() + " tupels");
} catch (Exception e) {
@@ -115,7 +115,7 @@
Iterator<String> it=s.iterator();
String FullURI="";
while (it.hasNext()) {
- String element = (String) it.next();
+ String element = it.next();
FullURI+=""+URLEncoder.encode(element, "UTF-8")+"="+
URLEncoder.encode(se.getParameters().get(element), "UTF-8")+"&";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
