Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3257] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl
|
From: <chr...@us...> - 2011-09-14 08:23:20
|
Revision: 3257
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3257&view=rev
Author: christinaunger
Date: 2011-09-14 08:23:09 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
[tbsl] repaired missing '?' in queries
Modified Paths:
--------------
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/cli/TestFrontend.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/cli/TestFrontend.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/cli/TestFrontend.java 2011-09-14 07:43:41 UTC (rev 3256)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/cli/TestFrontend.java 2011-09-14 08:23:09 UTC (rev 3257)
@@ -14,7 +14,7 @@
public class TestFrontend {
// MODE ::= BASIC | LEIPZIG
- static String MODE = "BASIC";
+ static String MODE = "LEIPZIG";
public static void main(String[] args) {
@@ -22,6 +22,9 @@
System.out.println("Running in " + MODE + " mode.");
System.out.println("\nType ':q' to quit.");
+ BasicTemplator btemplator = new BasicTemplator();
+ Templator templator = new Templator();
+
while (true) {
String s = getStringFromUser("input > ").trim();
@@ -30,14 +33,12 @@
}
if (MODE.equals("BASIC")) {
- BasicTemplator btemplator = new BasicTemplator();
Set<BasicQueryTemplate> querytemps = btemplator.buildBasicQueries(s);
for (BasicQueryTemplate temp : querytemps) {
System.out.println(temp.toString());
}
}
- else if (MODE.equals("LEIPZG")) {
- Templator templator = new Templator();
+ else if (MODE.equals("LEIPZIG")) {
Set<Template> temps = templator.buildTemplates(s);
for (Template temp : temps) {
System.out.println(temp.toString());
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java 2011-09-14 07:43:41 UTC (rev 3256)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java 2011-09-14 08:23:09 UTC (rev 3257)
@@ -231,9 +231,9 @@
SPARQL_Property prop = new SPARQL_Property(predicate);
prop.setIsVariable(true);
- boolean noliteral = true;
+ boolean literal = false;
if (simple.getArguments().size() > 1 && simple.getArguments().get(1).getValue().matches("\\d+")) {
- noliteral = false;
+ literal = true;
}
if (predicate.equals("count")) {
@@ -247,28 +247,28 @@
query.addFilter(new SPARQL_Filter(
new SPARQL_Pair(
new SPARQL_Term(simple.getArguments().get(0).getValue(),true),
- new SPARQL_Term(simple.getArguments().get(1).getValue(),noliteral),
+ new SPARQL_Term(simple.getArguments().get(1).getValue(),literal),
SPARQL_PairType.GT)));
return query;
} else if (predicate.equals("greaterorequal")) {
query.addFilter(new SPARQL_Filter(
new SPARQL_Pair(
new SPARQL_Term(simple.getArguments().get(0).getValue(),true),
- new SPARQL_Term(simple.getArguments().get(1).getValue(),noliteral),
+ new SPARQL_Term(simple.getArguments().get(1).getValue(),literal),
SPARQL_PairType.GTEQ)));
return query;
} else if (predicate.equals("less")) {
query.addFilter(new SPARQL_Filter(
new SPARQL_Pair(
new SPARQL_Term(simple.getArguments().get(0).getValue(),true),
- new SPARQL_Term(simple.getArguments().get(1).getValue(),noliteral),
+ new SPARQL_Term(simple.getArguments().get(1).getValue(),literal),
SPARQL_PairType.LT)));
return query;
} else if (predicate.equals("lessorequal")) {
query.addFilter(new SPARQL_Filter(
new SPARQL_Pair(
new SPARQL_Term(simple.getArguments().get(0).getValue(),true),
- new SPARQL_Term(simple.getArguments().get(1).getValue(),noliteral),
+ new SPARQL_Term(simple.getArguments().get(1).getValue(),literal),
SPARQL_PairType.LTEQ)));
return query;
} else if (predicate.equals("maximum")) {
@@ -285,19 +285,19 @@
query.addFilter(new SPARQL_Filter(
new SPARQL_Pair(
new SPARQL_Term(simple.getArguments().get(0).getValue(),true),
- new SPARQL_Term(simple.getArguments().get(1).getValue(),noliteral),
+ new SPARQL_Term(simple.getArguments().get(1).getValue(),literal),
SPARQL_PairType.EQ)));
return query;
}
if (arity == 1) {
- SPARQL_Term term = new SPARQL_Term(simple.getArguments().get(0).getValue(),true);
+ SPARQL_Term term = new SPARQL_Term(simple.getArguments().get(0).getValue(),false);
query.addCondition(new SPARQL_Triple(term,new SPARQL_Property("type",new SPARQL_Prefix("rdf","")),prop));
}
else if (arity == 2) {
String arg1 = simple.getArguments().get(0).getValue();
String arg2 = simple.getArguments().get(1).getValue();
- query.addCondition(new SPARQL_Triple(new SPARQL_Term(arg1,true),prop,new SPARQL_Term(arg2,true)));
+ query.addCondition(new SPARQL_Triple(new SPARQL_Term(arg1,false),prop,new SPARQL_Term(arg2,false)));
}
else if (arity > 2) {
// TODO
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java 2011-09-14 07:43:41 UTC (rev 3256)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java 2011-09-14 08:23:09 UTC (rev 3257)
@@ -53,7 +53,7 @@
List<String> words = new ArrayList<String>();
words.add(token);
if (!pos.equals("NNP") && !pos.equals("NNPS") && !pos.equals("JJNN")) {
- words.addAll(wordnet.getBestSynonyms(token));
+// words.addAll(wordnet.getBestSynonyms(token));
}
String tokenfluent = token.replaceAll(" ","").replaceAll("_","");
@@ -175,15 +175,15 @@
else {
slot = "SLOT_" + token + "/PROPERTY/" + token;
symslot = "SLOT_" + token + "/SYMPROPERTY/" + token;
- List<String> preds = wordnet.getAttributes(token);
- for (Iterator<String> i = preds.iterator(); i.hasNext();) {
- slot += i.next();
- symslot += i.next();
- if (i.hasNext()) {
- slot += "^";
- symslot += "^";
- }
- }
+// List<String> preds = wordnet.getAttributes(token);
+// for (Iterator<String> i = preds.iterator(); i.hasNext();) {
+// slot += i.next();
+// symslot += i.next();
+// if (i.hasNext()) {
+// slot += "^";
+// symslot += "^";
+// }
+// }
}
if (pos.equals("PASSIVE")) {
String[] passEntry1 = {token,
@@ -283,13 +283,13 @@
else if (equalsOneOf(pos,adjective)) {
String slot = "SLOT_" + token + "/PROPERTY/" + token;
- List<String> preds = wordnet.getAttributes(token);
- for (Iterator<String> i = preds.iterator(); i.hasNext();) {
- slot += i.next();
- if (i.hasNext()) {
- slot += "^";
- }
- }
+// List<String> preds = wordnet.getAttributes(token);
+// for (Iterator<String> i = preds.iterator(); i.hasNext();) {
+// slot += i.next();
+// if (i.hasNext()) {
+// slot += "^";
+// }
+// }
/* ADJECTIVE */
if (pos.equals("JJ")) {
String[] adjEntry = {token,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
