Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3732] trunk/components-ext/src
|
From: <chr...@us...> - 2012-06-11 17:06:29
|
Revision: 3732
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3732&view=rev
Author: christinaunger
Date: 2012-06-11 17:06:18 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
[tbsl] differentiated object and datatype properties, and filtered templates inconsistent with those requirements
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/sem/dudes/data/Dude.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SlotType.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicTemplator.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/java/org/dllearner/algorithm/tbsl/templator/TemplatorHandler.java
trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java
Added Paths:
-----------
trunk/components-ext/src/main/resources/tbsl/lexicon/english_oxford.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 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -76,7 +76,7 @@
}
template = new Template(new Query());
- // slots = ls;
+ slots = ls;
Query q = convert(drs, new Query(), false);
if (q == null) {
@@ -127,6 +127,8 @@
}
}
+ for (Slot s : slots) if (s.getAnchor().equals("SLOT_arg")) template.addSlot(s);
+
Set<SPARQL_Triple> statements = new HashSet<SPARQL_Triple>();
for (DRS_Condition condition : drs.getConditions()) {
@@ -242,7 +244,7 @@
}
}
SPARQL_Property prop = new SPARQL_Property(predicate);
- prop.setIsVariable(true);
+ if (!predicate.contains(":")) prop.setIsVariable(true);
boolean literal = false;
if (simple.getArguments().size() > 1 && simple.getArguments().get(1).getValue().matches("\\d+")) {
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 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/GrammarFilter.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -131,12 +131,18 @@
*/
try {
- TreeNode tree = c.construct("NUM:'" + token + "'");
+ TreeNode tree = c.construct("NUM:'" + token + "'");
+ TreeNode tree2 = c.construct("(NP NUM:'" + token + "' NP*)");
int gid = grammar.addTree(grammar.size(), new Pair<String,TreeNode>(token,tree),
- Collections.singletonList("<x,l1,e,[l1:[ x | equal(x," + token + ")]],[],[],[]>"));
+ Collections.singletonList("<x,l1,e,[l1:[ x | equal(x," + token + ")]],[],[],[ SLOT_arg/LITERAL/x ]>"));
add(parseG, tree, gid-1, localID);
localID++;
+
+// int gid = grammar.addTree(grammar.size(), new Pair<String,TreeNode>(token,tree2),
+// Collections.singletonList("<x,l1,<e,t>,[l1:[ | count(x," + token + ")]],[],[],[ SLOT_arg/RESOURCE/x ]>"));
+// add(parseG, tree2, gid-1, localID);
+// localID++;
foundCandidates = true;
coveredTokens.add(token);
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/data/Dude.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/data/Dude.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/data/Dude.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -1,11 +1,11 @@
package org.dllearner.algorithm.tbsl.sem.dudes.data;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.dllearner.algorithm.tbsl.sem.drs.DRS;
+import org.dllearner.algorithm.tbsl.sem.drs.DiscourseReferent;
import org.dllearner.algorithm.tbsl.sem.drs.Simple_DRS_Condition;
import org.dllearner.algorithm.tbsl.sem.util.DomType;
import org.dllearner.algorithm.tbsl.sem.util.DominanceConstraint;
@@ -14,6 +14,7 @@
import org.dllearner.algorithm.tbsl.sem.util.Type;
import org.dllearner.algorithm.tbsl.sparql.BasicSlot;
import org.dllearner.algorithm.tbsl.sparql.Slot;
+import org.dllearner.algorithm.tbsl.sparql.SlotType;
public class Dude implements SemanticRepresentation{
@@ -156,9 +157,9 @@
output.components.addAll(input.components);
output.dominanceConstraints.addAll(input.dominanceConstraints);
output.arguments.remove(argument);
- output.arguments.addAll(dude.arguments);
- output.slots.addAll(input.slots);
-
+ output.arguments.addAll(dude.arguments);
+ output.slots.addAll(input.slots);
+
return output;
}
@@ -177,7 +178,7 @@
output.components.addAll(input.components);
output.dominanceConstraints.addAll(input.dominanceConstraints);
output.arguments.addAll(input.arguments);
- output.slots.addAll(input.slots);
+ output.slots.addAll(input.slots);
// finally add a constraint to link the main input-component to the bottom output-component (with DomType.equal)
DominanceConstraint newConstraint = new DominanceConstraint(getBottomLabel(output),input.mainLabel);
@@ -359,6 +360,9 @@
}
for (Slot slot : slots) {
slot.replaceReferent(ref1.replace("?",""),ref2.replace("?",""));
+ String minus = null;
+ for (String w : slot.getWords()) if (w.equals(ref1.replace("?",""))) minus = w;
+ if (minus != null) { slot.getWords().remove(minus); slot.getWords().add(ref2.replace("?","")); }
}
}
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -491,8 +491,11 @@
}
if (type.toString().equals("CLASS")) { slottype = SlotType.CLASS; }
else if (type.toString().equals("RESOURCE")) { slottype = SlotType.RESOURCE; }
+ else if (type.toString().equals("DATATYPEPROPERTY")) { slottype = SlotType.DATATYPEPROPERTY; }
+ else if (type.toString().equals("OBJECTPROPERTY")) { slottype = SlotType.OBJECTPROPERTY; }
else if (type.toString().equals("PROPERTY")) { slottype = SlotType.PROPERTY; }
else if (type.toString().equals("SYMPROPERTY")) { slottype = SlotType.SYMPROPERTY; }
+ else if (type.toString().equals("LITERAL")) { slottype = SlotType.LITERAL; }
else { slottype = SlotType.UNSPEC; }
{if (true) return new Slot(ref.toString(),slottype,words);}
@@ -827,6 +830,14 @@
finally { jj_save(39, xla); }
}
+ private boolean jj_3R_13() {
+ if (jj_3R_7()) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3_36()) jj_scanpos = xsp;
+ return false;
+ }
+
private boolean jj_3_12() {
if (jj_scan_token(2)) return true;
if (jj_3R_1()) return true;
@@ -838,14 +849,6 @@
return false;
}
- private boolean jj_3R_13() {
- if (jj_3R_7()) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_36()) jj_scanpos = xsp;
- return false;
- }
-
private boolean jj_3_11() {
if (jj_scan_token(2)) return true;
if (jj_3R_3()) return true;
@@ -883,20 +886,14 @@
return false;
}
- private boolean jj_3R_11() {
- if (jj_scan_token(LABEL)) return true;
- if (jj_scan_token(11)) return true;
- return false;
- }
-
private boolean jj_3_40() {
if (jj_scan_token(B)) return true;
return false;
}
- private boolean jj_3R_16() {
- if (jj_3R_7()) return true;
- if (jj_scan_token(14)) return true;
+ private boolean jj_3R_11() {
+ if (jj_scan_token(LABEL)) return true;
+ if (jj_scan_token(11)) return true;
return false;
}
@@ -905,8 +902,9 @@
return false;
}
- private boolean jj_3_23() {
- if (jj_scan_token(MOST)) return true;
+ private boolean jj_3R_16() {
+ if (jj_3R_7()) return true;
+ if (jj_scan_token(14)) return true;
return false;
}
@@ -915,12 +913,6 @@
return false;
}
- private boolean jj_3_30() {
- if (jj_3R_10()) return true;
- if (jj_scan_token(6)) return true;
- return false;
- }
-
private boolean jj_3R_7() {
Token xsp;
xsp = jj_scanpos;
@@ -931,9 +923,8 @@
return false;
}
- private boolean jj_3_34() {
- if (jj_scan_token(2)) return true;
- if (jj_3R_4()) return true;
+ private boolean jj_3_23() {
+ if (jj_scan_token(MOST)) return true;
return false;
}
@@ -942,6 +933,12 @@
return false;
}
+ private boolean jj_3_30() {
+ if (jj_3R_10()) return true;
+ if (jj_scan_token(6)) return true;
+ return false;
+ }
+
private boolean jj_3R_10() {
Token xsp;
xsp = jj_scanpos;
@@ -952,6 +949,12 @@
return false;
}
+ private boolean jj_3_34() {
+ if (jj_scan_token(2)) return true;
+ if (jj_3R_4()) return true;
+ return false;
+ }
+
private boolean jj_3R_3() {
if (jj_3R_15()) return true;
return false;
@@ -1110,6 +1113,12 @@
return false;
}
+ private boolean jj_3_36() {
+ if (jj_scan_token(15)) return true;
+ if (jj_3R_13()) return true;
+ return false;
+ }
+
private boolean jj_3_25() {
if (jj_scan_token(THELEAST)) return true;
return false;
@@ -1126,12 +1135,6 @@
return false;
}
- private boolean jj_3_36() {
- if (jj_scan_token(15)) return true;
- if (jj_3R_13()) return true;
- return false;
- }
-
private boolean jj_3_18() {
if (jj_scan_token(2)) return true;
if (jj_3R_8()) return true;
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj 2012-06-11 17:06:18 UTC (rev 3732)
@@ -451,8 +451,11 @@
}
if (type.toString().equals("CLASS")) { slottype = SlotType.CLASS; }
else if (type.toString().equals("RESOURCE")) { slottype = SlotType.RESOURCE; }
+ else if (type.toString().equals("DATATYPEPROPERTY")) { slottype = SlotType.DATATYPEPROPERTY; }
+ else if (type.toString().equals("OBJECTPROPERTY")) { slottype = SlotType.OBJECTPROPERTY; }
else if (type.toString().equals("PROPERTY")) { slottype = SlotType.PROPERTY; }
else if (type.toString().equals("SYMPROPERTY")) { slottype = SlotType.SYMPROPERTY; }
+ else if (type.toString().equals("LITERAL")) { slottype = SlotType.LITERAL; }
else { slottype = SlotType.UNSPEC; }
return new Slot(ref.toString(),slottype,words);
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SlotType.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SlotType.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SlotType.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -1,5 +1,6 @@
package org.dllearner.algorithm.tbsl.sparql;
public enum SlotType {
- CLASS, PROPERTY, SYMPROPERTY, RESOURCE, LITERAL, UNSPEC
+ RESOURCE, CLASS, OBJECTPROPERTY, DATATYPEPROPERTY, PROPERTY, LITERAL, UNSPEC,
+ SYMPROPERTY // TODO don't use them anymore
}
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -2,7 +2,9 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
public class Template implements Serializable, Comparable<Template>{
@@ -27,6 +29,47 @@
public void addSlot(Slot s) {
slots.add(s);
}
+
+ public Template checkandrefine() {
+
+ Set<Slot> argslots = new HashSet<Slot>();
+ for (Slot slot : slots) if (slot.anchor.equals("SLOT_arg")) argslots.add(slot);
+
+ for (Slot slot : slots) {
+ // check for clashes
+ if (slot.type.equals(SlotType.CLASS)) {
+ for (SPARQL_Triple triple : query.conditions) {
+ if (triple.property.toString().equals("rdf:type") && triple.value.toString().equals("?"+slot.anchor)) {
+ for (Slot s : argslots) {
+ if (s.words.contains(triple.variable.toString().replace("?","")) && s.type.equals(SlotType.LITERAL))
+ return null;
+ }
+ }
+ }
+ }
+ // refine property if possible
+ if (slot.type.equals(SlotType.PROPERTY) || slot.type.equals(SlotType.SYMPROPERTY)) {
+ Set<String> args = new HashSet<String>();
+ for (SPARQL_Triple triple : query.conditions) {
+ if (triple.property.toString().equals("?"+slot.anchor))
+ args.add(triple.value.toString());
+ }
+ for (String arg : args) {
+ for (Slot s : argslots) {
+ if (s.anchor.equals("SLOT_arg") && s.words.contains(arg.replace("?",""))) {
+ if (s.type.equals(SlotType.LITERAL)) slot.type = SlotType.DATATYPEPROPERTY;
+ else if (s.type.equals(SlotType.RESOURCE)) slot.type = SlotType.OBJECTPROPERTY;
+ }
+ }
+ }
+ }
+ }
+
+ // finally remove all argslots
+ slots.removeAll(argslots);
+
+ return this;
+ }
public String toString() {
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicTemplator.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicTemplator.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicTemplator.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -39,15 +39,16 @@
public boolean UNTAGGED_INPUT = true;
public BasicTemplator() {
- List<InputStream> grammarFiles = new ArrayList<InputStream>();
- for(int i = 0; i < GRAMMAR_FILES.length; i++){
- grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
- }
+
+ List<InputStream> grammarFiles = new ArrayList<InputStream>();
+ for(int i = 0; i < GRAMMAR_FILES.length; i++){
+ grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
+ }
- g = LTAG_Constructor.construct(grammarFiles);
+ g = LTAG_Constructor.construct(grammarFiles);
- tagger = new StanfordPartOfSpeechTagger();
-// tagger = new ApachePartOfSpeechTagger();
+ tagger = new StanfordPartOfSpeechTagger();
+// tagger = new ApachePartOfSpeechTagger();
p = new Parser();
p.SHOW_GRAMMAR = true;
@@ -61,6 +62,14 @@
d2s = new DRS2BasicSPARQL_Converter();
}
+ public void setGrammarFiles(String[] files) {
+ GRAMMAR_FILES = files;
+ List<InputStream> grammarFiles = new ArrayList<InputStream>();
+ for(int i = 0; i < GRAMMAR_FILES.length; i++){
+ grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
+ }
+ }
+
public void setUNTAGGED_INPUT(boolean b) {
UNTAGGED_INPUT = b;
}
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 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -299,15 +299,15 @@
result.add(wasGerEntry);
}
else if (pos.equals("WHEN")) {
- String dateSlot = "SLOT_" + token + "/PROPERTY/" + token +"^" + token + "_date";
- String tokenSlot = "SLOT_" + token + "/PROPERTY/" + token;
+ String dateSlot = "SLOT_" + token + "/DATATYPEPROPERTY/" + token +"^" + token + "_date";
+ String tokenSlot = "SLOT_" + token + "/DATATYPEPROPERTY/" + token;
String[] whenEntry1 = {token,
"(S DP[subj] (VP V:'" + token + "'))",
"<x,l1,t,[ l1:[ ?y | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>)],[ l2=l1 ],[ " + dateSlot + " ]>"};
String[] whenEntry2 = {token,
"(S DP[subj] (VP V:'" + token + "' DP[obj]))",
"<x,l1,t,[ l1:[|], l4:[ ?z | SLOT_" + token + "(x,y), SLOT_date(x,z) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ]," +
- "[" + tokenSlot + ", SLOT_date/PROPERTY/date ]>"};
+ "[" + tokenSlot + ", SLOT_date/DATATYPEPROPERTY/date ]>"};
result.add(whenEntry1);
result.add(whenEntry2);
}
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 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -33,7 +33,7 @@
private static final Logger logger = Logger.getLogger(Templator.class);
- String[] GRAMMAR_FILES = {"tbsl/lexicon/english.lex"};
+ String[] GRAMMAR_FILES = {"tbsl/lexicon/english.lex","tbsl/lexicon/english_oxford.lex"};
private String[] noun = {"NN","NNS","NNP","NNPS","NPREP","JJNN","JJNPREP"};
private String[] adjective = {"JJ","JJR","JJS","JJH"};
@@ -67,16 +67,16 @@
}
public Templator(final PartOfSpeechTagger tagger, WordNet wordnet) {
- this.tagger = tagger;
- this.wordnet = wordnet;
+ this.tagger = tagger;
+ this.wordnet = wordnet;
+
+ List<InputStream> grammarFiles = new ArrayList<InputStream>();
+ for(int i = 0; i < GRAMMAR_FILES.length; i++){
+ grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
+ }
- List<InputStream> grammarFiles = new ArrayList<InputStream>();
- for(int i = 0; i < GRAMMAR_FILES.length; i++){
- grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
- }
+ g = LTAG_Constructor.construct(grammarFiles);
- g = LTAG_Constructor.construct(grammarFiles);
-
p = new Parser();
p.SHOW_GRAMMAR = true;
p.USE_DPS_AS_INITTREES = true;
@@ -87,16 +87,16 @@
}
public Templator(boolean b) {
- this.tagger = new StanfordPartOfSpeechTagger();
- this.USE_WORDNET = false;
- VERBOSE = b;
+ this.tagger = new StanfordPartOfSpeechTagger();
+ this.USE_WORDNET = false;
+ VERBOSE = b;
- List<InputStream> grammarFiles = new ArrayList<InputStream>();
- for(int i = 0; i < GRAMMAR_FILES.length; i++){
- grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
- }
+ List<InputStream> grammarFiles = new ArrayList<InputStream>();
+ for(int i = 0; i < GRAMMAR_FILES.length; i++){
+ grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
+ }
- g = LTAG_Constructor.construct(grammarFiles);
+ g = LTAG_Constructor.construct(grammarFiles);
p = new Parser();
p.SHOW_GRAMMAR = false;
@@ -119,7 +119,12 @@
VERBOSE = b;
}
public void setGrammarFiles(String[] gf) {
- GRAMMAR_FILES = gf;
+ GRAMMAR_FILES = gf;
+ List<InputStream> grammarFiles = new ArrayList<InputStream>();
+ for(int i = 0; i < GRAMMAR_FILES.length; i++){
+ grammarFiles.add(this.getClass().getClassLoader().getResourceAsStream(GRAMMAR_FILES[i]));
+ }
+ g = LTAG_Constructor.construct(grammarFiles);
}
public Set<Template> buildTemplates(String s) {
@@ -196,6 +201,7 @@
try {
Template temp = d2s.convert(drs,slots);
+ temp = temp.checkandrefine();
if (temp == null) {
continue;
}
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/TemplatorHandler.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/TemplatorHandler.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/TemplatorHandler.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -7,20 +7,16 @@
public class TemplatorHandler {
- static String[] GRAMMAR_FILES;
Templator templator;
BasicTemplator basictemplator;
public TemplatorHandler(String[] files) {
templator = new Templator();
basictemplator = new BasicTemplator();
- GRAMMAR_FILES = files;
+ templator.setGrammarFiles(files);
+ basictemplator.setGrammarFiles(files);
}
- public void setGRAMMAR_FILES(String[] g) {
- GRAMMAR_FILES = g;
- }
-
public Set<Template> buildTemplates(String s) {
return templator.buildTemplates(s);
}
Modified: trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex 2012-06-11 17:06:18 UTC (rev 3732)
@@ -75,8 +75,8 @@
least || (ADJ DET:'least' ADJ*) || <x,l1,<e,t>,[ l1:[ | minimum(a,x,x) ] ], [],[],[]>
- how many || (DET DET:'how' DET:'many') || <x,l1,e, [ l1:[ ?x | ] ], [],[],[]>
- how many || (DET DET:'how' DET:'many') || <x,l1,e, [ l1:[ ?c,x | count(a,x,c) ] ], [],[],[]>
+ how many || (DET DET:'how' DET:'many') || <x,l1,e, [ l1:[ ?x | ] ], [],[],[ SLOT_arg/DATATYPEPROPERTY/x ]>
+ how many || (DET DET:'how' DET:'many') || <x,l1,e, [ l1:[ ?c,x | count(a,x,c) ] ], [],[],[ SLOT_arg/OBJECTPROPERTY_CLASS/x ]>
a || (DET DET:'a') || <x,l1,e, [ l1:[ x |] ], [],[],[]>
an || (DET DET:'an') || <x,l1,e, [ l1:[ x |] ], [],[],[]>
which || (DET DET:'which') || <x,l1,e, [ l1:[ ?x |] ], [],[],[]>
@@ -85,11 +85,11 @@
the least || (DET DET:'the' DET:'least') || <y, l1, e, [ l1:[ | l2:[ y | ] THELEAST y l3:[|] ] ], [], [],[]>
// NECESSARY "CHEAT"
- highest || (NP ADJ:'highest' NP*) || <x, l1, e, [ l1:[ | maximum(x) ] ], [], [],[]> ;; <x, l1, e, [ l1:[ j | SLOT_high(x,j), maximum(j) ] ],[],[],[ SLOT_high/PROPERTY/height ]>
+ highest || (NP ADJ:'highest' NP*) || <x, l1, e, [ l1:[ | maximum(x) ] ], [], [],[]> ;; <x, l1, e, [ l1:[ j | SLOT_high(x,j), maximum(j) ] ],[],[],[ SLOT_high/DATATYPEPROPERTY/height ]>
// 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],[]>
+ 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],[ SLOT_arg/RESOURCE/y ]> ;; <y,l1,<<e,t>,t>,[ l1:[ y | greater(y,z) ] ],[(l2,y,np,<e,t>),(l3,z,num,e)],[l2=l1,l3=l1],[ SLOT_arg/LITERAL/y ]>
+ 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],[ SLOT_arg/RESOURCE/y ]> ;; <y,l1,<<e,t>,t>,[ l1:[ y | less(y,z) ] ],[(l2,y,np,<e,t>),(l3,z,num,e)],[l2=l1,l3=l1],[ SLOT_arg/LITERAL/y ]>
// HOW
// how || (DP DET:'how' ADJ[adj]) || <x,l1,<<e,t>,t>,[ l1:[?x,|] ],[ (x,l2,adj,<e,t>) ],[l2=l1],[]>
@@ -115,7 +115,7 @@
what || (DP WH:'what') || <x, l1, <<e,t>,t>, [ l1:[ ?x | ] ], [], [], []>
which || (DP WH:'which') || <x, l1, <<e,t>,t>, [ l1:[ ?x | ] ], [], [], []>
- how many || (DP WH:'how' ADJ:'many' NP[noun]) || <y, l1, <<e,t>,t>, [ l1:[ | l2:[ y | ] HOWMANY y l3:[|] ] ], [ (l4,y,noun,<e,t>) ], [ l4=l2 ],[]>
+ how many || (DP WH:'how' ADJ:'many' NP[noun]) || <y, l1, <<e,t>,t>, [ l1:[ | l2:[ y | ] HOWMANY y l3:[|] ] ], [ (l4,y,noun,<e,t>) ], [ l4=l2 ],[ SLOT_arg/RESOURCE/y ]>
who || (DP WH:'who') || <x, l1, <<e,t>,t>, [ l1:[ ?x | ] ], [], [], []>
whom || (DP WH:'whom') || <x, l1, <<e,t>,t>, [ l1:[ ?x | ] ], [], [], []>
when || (S WH:'when' S[s]) || <x, l1, t, [ l1:[ ?x | SLOT_p(y,x) ] ], [(l2,y,s,t)], [l2=l1], [ SLOT_p/PROPERTY/date ]>
@@ -162,24 +162,25 @@
// NUMBERS (1-10)
// ---------------------
- one || (NP NUM:'one' NP*) || <x,l1,<e,t>,[l1:[x|count(x,1)]],[],[],[]>
- two || (NP NUM:'two' NP*) || <x,l1,<e,t>,[l1:[x|count(x,2)]],[],[],[]>
- three || (NP NUM:'three' NP*) || <x,l1,<e,t>,[l1:[x|count(x,3)]],[],[],[]>
- four || (NP NUM:'four' NP*) || <x,l1,<e,t>,[l1:[x|count(x,4)]],[],[],[]>
- five || (NP NUM:'five' NP*) || <x,l1,<e,t>,[l1:[x|count(x,5)]],[],[],[]>
- six || (NP NUM:'six' NP*) || <x,l1,<e,t>,[l1:[x|count(x,6)]],[],[],[]>
- seven || (NP NUM:'seven' NP*) || <x,l1,<e,t>,[l1:[x|count(x,7)]],[],[],[]>
- eight || (NP NUM:'eight' NP*) || <x,l1,<e,t>,[l1:[x|count(x,8)]],[],[],[]>
- nine || (NP NUM:'nine' NP*) || <x,l1,<e,t>,[l1:[x|count(x,9)]],[],[],[]>
- ten || (NP NUM:'ten' NP*) || <x,l1,<e,t>,[l1:[x|count(x,10)]],[],[],[]>
+ one || (NP NUM:'one' NP*) || <x,l1,<e,t>,[l1:[x|count(x,1)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ two || (NP NUM:'two' NP*) || <x,l1,<e,t>,[l1:[x|count(x,2)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ three || (NP NUM:'three' NP*) || <x,l1,<e,t>,[l1:[x|count(x,3)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ four || (NP NUM:'four' NP*) || <x,l1,<e,t>,[l1:[x|count(x,4)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ five || (NP NUM:'five' NP*) || <x,l1,<e,t>,[l1:[x|count(x,5)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ six || (NP NUM:'six' NP*) || <x,l1,<e,t>,[l1:[x|count(x,6)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ seven || (NP NUM:'seven' NP*) || <x,l1,<e,t>,[l1:[x|count(x,7)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ eight || (NP NUM:'eight' NP*) || <x,l1,<e,t>,[l1:[x|count(x,8)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ nine || (NP NUM:'nine' NP*) || <x,l1,<e,t>,[l1:[x|count(x,9)]],[],[],[ SLOT_arg/RESOURCE/x ]>
+ ten || (NP NUM:'ten' NP*) || <x,l1,<e,t>,[l1:[x|count(x,10)]],[],[],[ SLOT_arg/RESOURCE/x ]>
- one || (NUM NUM:'one') || <x,l1,e,[l1:[x|equal(x,1)]],[],[],[]>
- two || (NUM NUM:'two') || <x,l1,e,[l1:[x|equal(x,2)]],[],[],[]>
- three || (NUM NUM:'three') || <x,l1,e,[l1:[x|equal(x,3)]],[],[],[]>
- four || (NUM NUM:'four') || <x,l1,e,[l1:[x|equal(x,4)]],[],[],[]>
- five || (NUM NUM:'five') || <x,l1,e,[l1:[x|equal(x,5)]],[],[],[]>
- six || (NUM NUM:'six') || <x,l1,e,[l1:[x|equal(x,6)]],[],[],[]>
- seven || (NUM NUM:'seven') || <x,l1,e,[l1:[x|equal(x,7)]],[],[],[]>
- eight || (NUM NUM:'eight') || <x,l1,e,[l1:[x|equal(x,8)]],[],[],[]>
- nine || (NUM NUM:'nine') || <x,l1,e,[l1:[x|equal(x,9)]],[],[],[]>
- ten || (NUM NUM:'ten') || <x,l1,e,[l1:[x|equal(x,10)]],[],[],[]>
\ No newline at end of file
+ one || (NUM NUM:'one') || <x,l1,e,[l1:[x|equal(x,1)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ two || (NUM NUM:'two') || <x,l1,e,[l1:[x|equal(x,2)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ three || (NUM NUM:'three') || <x,l1,e,[l1:[x|equal(x,3)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ four || (NUM NUM:'four') || <x,l1,e,[l1:[x|equal(x,4)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ five || (NUM NUM:'five') || <x,l1,e,[l1:[x|equal(x,5)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ six || (NUM NUM:'six') || <x,l1,e,[l1:[x|equal(x,6)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ seven || (NUM NUM:'seven') || <x,l1,e,[l1:[x|equal(x,7)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ eight || (NUM NUM:'eight') || <x,l1,e,[l1:[x|equal(x,8)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ nine || (NUM NUM:'nine') || <x,l1,e,[l1:[x|equal(x,9)]],[],[],[ SLOT_arg/LITERAL/x ]>
+ ten || (NUM NUM:'ten') || <x,l1,e,[l1:[x|equal(x,10)]],[],[],[ SLOT_arg/LITERAL/x ]>
+
Copied: trunk/components-ext/src/main/resources/tbsl/lexicon/english_oxford.lex (from rev 3728, trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex)
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/english_oxford.lex (rev 0)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/english_oxford.lex 2012-06-11 17:06:18 UTC (rev 3732)
@@ -0,0 +1,31 @@
+
+// PREPOSITIONS
+
+ close to || (NP NP* (PP P:'close' P:'to' DP[dp])) || <x,l1,<e,t>, [ l1:[ | SLOT_closeto(x,y) ] ], [ (l2,y,dp,<<e,t>,t>) ], [ l2=l1 ],[ SLOT_closeto/OBJECTPROPERTY/near ]>
+ in || (NP NP* (PP P:'in' DP[dp])) || <x,l1,<e,t>, [ l1:[ | SLOT_location(x,y) ] ], [ (l2,y,dp,<<e,t>,t>) ], [ l2=l1 ],[ SLOT_location/PROPERTY/location ]>
+ since || (NP NP* (PP P:'since' DP[dp])) || <x,l1,<e,t>, [ l1:[ | SLOT_since(x,y) ] ], [ (l2,y,dp,<<e,t>,t>) ], [ l2=l1 ],[ SLOT_since/PROPERTY/since ]>
+
+ for . pounds || (NP NP* (PP P:'for' (NP NUM[num] N:'pounds'))) || <x,l1,<e,t>, [ l1:[ | SLOT_price(x,y) ] ], [ (l2,y,num,e) ], [ l2=l1 ],[ SLOT_price/DATATYPEPROPERTY/price ]>
+ for more than . pounds || (NP NP* (PP P:'for' (NP NUM[num] N:'pounds'))) || <x,l1,<e,t>, [ l1:[ | SLOT_price(x,y), greater(y,z) ] ], [ (l2,z,num,e) ], [ l2=l1 ],[ SLOT_price/DATATYPEPROPERTY/price ]>
+ for less than . pounds || (NP NP* (PP P:'for' (NP NUM[num] N:'pounds'))) || <x,l1,<e,t>, [ l1:[ | SLOT_price(x,y), less(y,z) ] ], [ (l2,y,num,e) ], [ l2=l1 ],[ SLOT_price/DATATYPEPROPERTY/price ]>
+ from . to . pounds || (NP NP* (PP P:'from' NUM[num1] P:'to' NUM[num2] N:'pounds')) || <x,l1,<e,t>, [ l1:[ | SLOT_price(x,y), greaterorequal(y,n1), lessorequal(y,n2) ] ], [ (l2,n1,num1,e),(l3,n2,num2,e) ], [ l2=l1,l3=l1 ],[ SLOT_price/DATATYPEPROPERTY/price ]>
+
+ with || (NP NP* (PP P:'with' DP[dp])) || <x,l1,<e,t>, [ l1:[ | empty(x,y) ] ], [ (l2,y,dp,<<e,t>,t>) ], [ l2=l1 ],[]>
+ with || (NP NP* (PP P:'with' NUM[num] DP[dp])) || <x,l1,<e,t>, [ l1:[ | empty(x,y), count(y,z) ] ], [ (l2,y,dp,<<e,t>,t>),(l3,z,num,e) ], [ l2=l1,l3=l1 ],[ SLOT_arg/RESOURCE/y ]>
+ with || (NP NP* (PP P:'with' NUM[num] DP[dp])) || <x,l1,<e,t>, [ l1:[ | empty(x,y), equals(y,z) ] ], [ (l2,y,dp,<<e,t>,t>),(l3,z,num,e) ], [ l2=l1,l3=l1 ],[ SLOT_arg/LITERAL/y ]>
+
+
+// MONTHS
+
+ january || (DP DP:'january') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,1) ]], [],[],[]>
+ february || (DP DP:'february') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,2) ]], [],[],[]>
+ march || (DP DP:'march') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,3) ]], [],[],[]>
+ april || (DP DP:'april') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,4) ]], [],[],[]>
+ may || (DP DP:'may') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,5) ]], [],[],[]>
+ june || (DP DP:'june') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,6) ]], [],[],[]>
+ july || (DP DP:'july') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,7) ]], [],[],[]>
+ august || (DP DP:'august') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,8) ]], [],[],[]>
+ september || (DP DP:'september') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,9) ]], [],[],[]>
+ october || (DP DP:'october') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,10) ]], [],[],[]>
+ november || (DP DP:'november') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,11) ]], [],[],[]>
+ december || (DP DP:'december') || <x,l1,<<e,t>,t>, [ l1:[ x | xsd:month(x,12) ]], [],[],[]>
\ No newline at end of file
Modified: trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java
===================================================================
--- trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java 2012-06-11 13:06:58 UTC (rev 3731)
+++ trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java 2012-06-11 17:06:18 UTC (rev 3732)
@@ -11,7 +11,7 @@
public class TestFrontend {
- static String[] GRAMMAR_FILES = {"src/main/resources/lexicon/english.lex"};
+ static String[] GRAMMAR_FILES = {"tbsl/lexicon/english.lex","tbsl/lexicon/english_oxford.lex"};
static boolean BASIC_MODE = false; // true for BASIC mode, false for LEIPZIG mode
public static void main(String[] args) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
