Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3339] trunk/components-ext/src/main
|
From: <chr...@us...> - 2011-10-28 14:01:27
|
Revision: 3339
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3339&view=rev
Author: christinaunger
Date: 2011-10-28 14:01:16 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
[tbsl] small bug fixes and changes
Modified Paths:
--------------
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/GrammarFilter.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/Preprocessor.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java
trunk/components-ext/src/main/resources/tbsl/evaluation/dbpedia-test-questions-tagged(ideal).xml
trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
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-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java 2011-10-28 14:01:16 UTC (rev 3339)
@@ -76,7 +76,7 @@
}
template = new Template(new Query());
- slots = ls;
+ // slots = ls;
Query q = convert(drs, new Query(), false);
if (q == null) {
@@ -102,7 +102,7 @@
}
// System.out.println("--- DRS (after) : " + drs); // DEBUG
- for (DiscourseReferent referent : drs.getDRs()) {
+ for (DiscourseReferent referent : drs.collectDRs()) {
if (referent.isMarked()) {
SPARQL_Term term = new SPARQL_Term(referent.toString().replace("?",""));
term.setIsVariable(true);
@@ -115,9 +115,13 @@
f.addNotBound(term);
query.addFilter(f);
}
+
+// System.out.println("--- referent: " + referent.toString()); // DEBUG
for (Slot s : slots) {
- if (s.getAnchor().equals(referent.toString())) {
- template.addSlot(s);
+// System.out.println("--- slot: " + s.toString()); // DEBUG
+ if (s.getAnchor().equals(referent.getValue()) || s.getAnchor().equals(referent.toString())) {
+// System.out.println(" fits!"); // DEBUG
+ template.addSlot(s);
break;
}
}
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/GrammarFilter.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/GrammarFilter.java 2011-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/GrammarFilter.java 2011-10-28 14:01:16 UTC (rev 3339)
@@ -254,7 +254,7 @@
try {
for (String[] entry : entries) {
String anchor = entry[0];
- String treestring = entry[1];
+ String treestring = entry[1];
List<String> dudeStrings = new ArrayList<String>();
for (String s : entry[2].trim().split(";;")) {
if (!s.equals("")) {
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/Preprocessor.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/Preprocessor.java 2011-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/Preprocessor.java 2011-10-28 14:01:16 UTC (rev 3339)
@@ -70,8 +70,8 @@
Pattern passivePattern1a = Pattern.compile("(((has)|(have)|(had))/VB[A-Z]?.been/VBN.(\\w+)/VBN.by/IN)");
Pattern passivePattern1b = Pattern.compile("(\\s((has)|(have)|(had))/VB[A-Z]?(.+\\s)been/VBN\\s(\\w+)/VB(N|D))");
Pattern passivePattern2a = Pattern.compile("(((is)|(are)|(was)|(were))/VB[A-Z]?.(\\w+)/VBN.by/IN)");
- Pattern pseudopassPattern = Pattern.compile("(((is)|(are)|(was)|(were))/VB[A-Z]?.(\\w+)/VBN.\\w+/TO)");
- Pattern pseudopwhPattern = Pattern.compile("(((is)|(are)|(was)|(were))/VB[A-Z]?.(.+)\\s(\\w+)/VB(N|D).\\w+/TO)");
+ Pattern pseudopassPattern = Pattern.compile("(((is)|(are)|(was)|(were))/VB[A-Z]?.(\\w+)/VBN.\\w+/((TO)|(IN)))");
+ Pattern pseudopwhPattern = Pattern.compile("(((is)|(are)|(was)|(were))/VB[A-Z]?.(.+)\\s(\\w+)/VB(N|D).\\w+/((TO)|(IN)))");
Pattern saveIsThere = Pattern.compile("((is)|(are))/(VB[A-Z]?).there/(RB)");
Pattern passivePattern2b = Pattern.compile("(((is)|(are)|(was)|(were))/VB[A-Z]?.((.+)\\s\\w+)/VB(N|D))");
Pattern passpartPattern = Pattern.compile("\\s((\\w+)/VBN.by/IN)");
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java 2011-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java 2011-10-28 14:01:16 UTC (rev 3339)
@@ -43,7 +43,7 @@
case NEQ:
return a + "!=" + b;
case REGEX:
- return "regex(" + a + "," + b + ")";
+ return "regex(" + a + "," + b + ",'i')";
}
return "";
}
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-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java 2011-10-28 14:01:16 UTC (rev 3339)
@@ -124,7 +124,7 @@
else if (pos.equals("JJNPREP")) {
String jjtoken = token.substring(0,token.indexOf("_"));
String nntoken = token.substring(token.indexOf("_")+1);
- String slotfluent = "SLOT_" + tokenfluent + "/CLASS/" + token;
+ String slotfluent = "SLOT_" + tokenfluent + "/PROPERTY/" + token;
String slotnn = "SLOT_" + nntoken + "/PROPERTY/" + nntoken;
String slotnnc = "SLOT_" + nntoken + "/CLASS/" + nntoken;
String slotjj = "SLOT_" + jjtoken + "/CLASS/" + jjtoken;
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java 2011-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java 2011-10-28 14:01:16 UTC (rev 3339)
@@ -147,11 +147,11 @@
if (!containsModuloRenaming(drses,drs)) {
// // DEBUG
-// System.out.println(dude);
-// System.out.println(drs);
-// for (Slot sl : slots) {
-// System.out.println(sl.toString());
-// }
+ System.out.println(dude);
+ System.out.println(drs);
+ for (Slot sl : slots) {
+ System.out.println(sl.toString());
+ }
// //
drses.add(drs);
@@ -190,7 +190,7 @@
}
newwords = new ArrayList<String>();
- newwords.add(word);
+ newwords.addAll(slot.getWords());
newwords.addAll(strings);
if (wordnetpos != null && !slot.getSlotType().equals(SlotType.RESOURCE)) {
Modified: trunk/components-ext/src/main/resources/tbsl/evaluation/dbpedia-test-questions-tagged(ideal).xml
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/evaluation/dbpedia-test-questions-tagged(ideal).xml 2011-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/resources/tbsl/evaluation/dbpedia-test-questions-tagged(ideal).xml 2011-10-28 14:01:16 UTC (rev 3339)
@@ -84,13 +84,13 @@
<string>Which/WDT European/JJ countries/NNS are/VBP a/DT constitutional/JJ monarchy/NN</string>
</question>
<question id="40">
-<string>Who/WP is/VBZ the/DT author/NN of/IN WikiLeaks/NNS</string>
+<string>Who/WP is/VBZ the/DT author/NN of/IN WikiLeaks/NNP</string>
</question>
<question id="17">
<string>Which/WDT state/NN of/IN the/DT United/NNP States/NNPS of/IN America/NNP has/VBZ the/DT highest/JJS density/NN</string>
</question>
<question id="19">
-<string>What/WP is/VBZ the/DT currency/NN of/IN the/DT Czech/JJ Republic/NNP</string>
+<string>What/WP is/VBZ the/DT currency/NN of/IN the/DT Czech/NNP Republic/NNP</string>
</question>
<question id="22">
<string>Which/WDT countries/NNS in/IN the/DT European/NNP Union/NNP adopted/VBD the/DT Euro/NNP</string>
@@ -111,7 +111,7 @@
<string>When/WRB did/VBD Germany/NNP join/VB the/DT EU/NNP</string>
</question>
<question id="36">
-<string>Which/WDT monarchs/NNS of/IN the/DT United/NNP Kingdom/NNP were/VBD married/VBN to/TO a/DT German/JJ</string>
+<string>Which/WDT monarchs/NNS of/IN the/DT United/NNP Kingdom/NNP were/VBD married/VBN to/TO a/DT German/NN</string>
</question>
<question id="8">
<string>When/WRB was/VBD the/DT Battle/NNP of/IN Gettysburg/NNP</string>
Modified: trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex 2011-10-28 09:43:10 UTC (rev 3338)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex 2011-10-28 14:01:16 UTC (rev 3339)
@@ -85,6 +85,9 @@
the most || (DET DET:'the' DET:'most') || <y, l1, e, [ l1:[ | l2:[ y | ] THEMOST y l3:[|] ] ], [], [],[]>
the least || (DET DET:'the' DET:'least') || <y, l1, e, [ l1:[ | l2:[ y | ] THELEAST y l3:[|] ] ], [], [],[]>
+ // CHEAT!
+ highest || (NP ADJ:'highest' NP*) || <x, l1, e, [ l1:[ | maximum(a,x,x) ] ], [], [],[]> ;; <x, l1, e, [ l1:[ | SLOT_high(x), maximum(a,x,x) ] ],[],[],[ SLOT_high/PROPERTY/height^elevation ]>
+
// COUNT
more than || (DP DET:'more' DET:'than' NUM[num] NP[np]) || <y,l1,<<e,t>,t>,[ l1:[ y,c | count(y,c), greater(c,z) ] ],[(l2,y,np,<e,t>),(l3,z,num,e)],[l2=l1,l3=l1],[]> ;; <y,l1,<<e,t>,t>,[ l1:[ y | greater(y,z) ] ],[(l2,y,np,<e,t>),(l3,z,num,e)],[l2=l1,l3=l1],[]>
less than || (DP DET:'less' DET:'than' NUM[num] NP[np]) || <y,l1,<<e,t>,t>,[ l1:[ y,c | count(y,c), less(c,z) ] ],[(l2,y,np,<e,t>),(l3,z,num,e)],[l2=l1,l3=l1],[]> ;; <y,l1,<<e,t>,t>,[ l1:[ y | less(y,z) ] ],[(l2,y,np,<e,t>),(l3,z,num,e)],[l2=l1,l3=l1],[]>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
