Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3511] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl
|
From: <chr...@us...> - 2011-12-20 11:43:32
|
Revision: 3511
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3511&view=rev
Author: christinaunger
Date: 2011-12-20 11:43:21 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
[tbsl] revised BasicTemplator
Modified Paths:
--------------
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2BasicSPARQL_Converter.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2BasicSPARQL_Converter.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2BasicSPARQL_Converter.java 2011-12-19 16:07:11 UTC (rev 3510)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2BasicSPARQL_Converter.java 2011-12-20 11:43:21 UTC (rev 3511)
@@ -33,6 +33,7 @@
List<Slot> slots;
// BasicQueryTemplate query;
List<Integer> usedInts;
+ List<Simple_DRS_Condition> unusedConditions;
public DRS2BasicSPARQL_Converter() {
// query = new BasicQueryTemplate();
@@ -54,7 +55,7 @@
// query = new BasicQueryTemplate();
slots = ls;
-
+
return convert(drs, new BasicQueryTemplate(), false);
}
@@ -65,8 +66,10 @@
if (!restructureEmpty(drs)) {
return null;
}
- System.out.println("--- DRS (after) : " + drs); // DEBUG
-
+ System.out.println("DRS:\n" + drs); // DEBUG
+
+ unusedConditions = new ArrayList<Simple_DRS_Condition>();
+
for (DRS_Condition condition : drs.getConditions()) {
convertCondition(condition,temp);
if (negate) {
@@ -77,6 +80,21 @@
}
}
}
+
+ for (Simple_DRS_Condition c : unusedConditions) {
+ if (!temp.getVariablesInConditions().contains(c.getArguments().get(0))) {
+ String v = c.getArguments().get(0).getValue();
+ for (Slot s : slots) {
+ if (s.getAnchor().equals(v) && !s.getSlotType().equals(SlotType.RESOURCE)) {
+ String fresh = v+createFresh();
+ s.setAnchor(fresh);
+ temp.addConditions(new Path(v,"isA",fresh));
+ temp.addSlot(s);
+ break;
+ }
+ }
+ }
+ }
for (DiscourseReferent referent : drs.collectDRs()) {
if (referent.isMarked()) {
@@ -91,6 +109,7 @@
f.addNotBound(term);
temp.addFilter(f);
}
+
for (Slot s : slots) {
if (s.getAnchor().equals(referent.getValue())) {
temp.addSlot(s); // query
@@ -311,15 +330,14 @@
new SPARQL_Term(simple.getArguments().get(1).getValue(),true),
SPARQL_PairType.REGEX)));
}
- else if (predicate.equals("ISA")) {
- temp.addConditions(new Path(simple.getArguments().get(0).getValue(),"isA",simple.getArguments().get(1).getValue()));
+ else {
+ if (simple.getArguments().size() == 1) {
+ unusedConditions.add((Simple_DRS_Condition) condition);
+ }
}
-// else {
-// if (simple.getArguments().size() == 1) {
-// temp.addConditions(new Path(simple.getArguments().get(0).getValue(),"rdf:type",simple.getPredicate()));
-// }
-// }
+
}
+
return temp;
}
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java 2011-12-19 16:07:11 UTC (rev 3510)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java 2011-12-20 11:43:21 UTC (rev 3511)
@@ -106,6 +106,16 @@
}
return result;
}
+
+ public Set<String> getVariablesInConditions() {
+ Set<String> vars = new HashSet<String>();
+ for (Path p : conditions) {
+ vars.add(p.start);
+ vars.add(p.via);
+ vars.add(p.target);
+ }
+ return vars;
+ }
public Set<SPARQL_Term> getSelTerms()
{
Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java 2011-12-19 16:07:11 UTC (rev 3510)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java 2011-12-20 11:43:21 UTC (rev 3511)
@@ -59,19 +59,19 @@
/* DP */
String[] dpEntry1 = {token,
"(DP (NP " + treetoken + "))",
- "<x,l1,<<e,t>,t>,[ l1:[ x,p | SLOT_" + tokenfluent + "(p), ISA(x,p) ] ],[],[],[" + slot + "]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ x | SLOT_" + tokenfluent + "(x) ] ],[],[],[" + slot + "]>"};
String[] dpEntry2 = {token,
"(DP (NP " + treetoken + " DP[name]))",
- "<x,l1,<<e,t>,t>,[ l1:[ x,p | SLOT_" + tokenfluent + "(p), ISA(x,p), equal(x,y) ] ],[ (l2,y,name,<<e,t>,t>) ],[l2=l1],[" + slot + "]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ x | SLOT_" + tokenfluent + "(x), equal(x,y) ] ],[ (l2,y,name,<<e,t>,t>) ],[l2=l1],[" + slot + "]>"};
result.add(dpEntry1);
result.add(dpEntry2);
/* NP */
String[] npEntry1 = {token,
"(NP " + treetoken + ")",
- "<x,l1,<e,t>,[ l1:[ p | SLOT_" + tokenfluent + "(p), ISA(x,p) ] ],[],[],[" + slot + "]>"};
+ "<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(x) ] ],[],[],[" + slot + "]>"};
String[] npEntry2 = {token,
"(NP " + treetoken + " DP[name])",
- "<x,l1,<e,t>,[ l1:[ p | SLOT_" + tokenfluent + "(p), ISA(x,p), equal(x,y) ] ],[ (l2,y,name,<<e,t>,t>) ],[l2=l1],[" + slot + "]>"};
+ "<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(x), equal(x,y) ] ],[ (l2,y,name,<<e,t>,t>) ],[l2=l1],[" + slot + "]>"};
result.add(npEntry1);
result.add(npEntry2);
}
@@ -89,13 +89,13 @@
else if (pos.equals("NPREP")) {
String[] dpEntry1 = {token,
"(DP (NP " + treetoken + " DP[pobj]))",
- "<x,l1,<<e,t>,t>,[ l1:[ x | SLOT_" + tokenfluent + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ x | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
String[] dpEntry2 = {token,
"(DP DET[det] (NP " + treetoken + " DP[pobj]))",
- "<x,l1,<<e,t>,t>,[ l1:[ | SLOT_" + tokenfluent + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>),(l3,x,det,e)],[l2=l1,l3=l1],[" + slot + "]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>),(l3,x,det,e)],[l2=l1,l3=l1],[" + slot + "]>"};
String[] npEntry = {token,
"(NP " + treetoken + " DP[pobj])",
- "<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
+ "<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
result.add(dpEntry1);
result.add(dpEntry2);
result.add(npEntry);
@@ -104,13 +104,13 @@
slot = "SLOT_" + tokenfluent + "/UNSPEC/" + token;
String[] dpEntry1 = {token,
"(DP (NP " + treetoken + " DP[pobj]))",
- "<x,l1,<<e,t>,t>,[ l1:[ x,p | SLOT_" + tokenfluent + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>" };
+ "<x,l1,<<e,t>,t>,[ l1:[ x,p | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>" };
String[] dpEntry2 = {token,
"(DP DET[det] (NP " + treetoken + " DP[pobj]))",
- "<x,l1,<<e,t>,t>,[ l1:[ p | SLOT_" + tokenfluent + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>),(l3,x,det,e)],[l2=l1,l3=l1],[" + slot + "]>" };
+ "<x,l1,<<e,t>,t>,[ l1:[ p | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>),(l3,x,det,e)],[l2=l1,l3=l1],[" + slot + "]>" };
String[] npEntry = {token,
"(NP " + treetoken + " DP[pobj])",
- "<x,l1,<e,t>,[ l1:[ p | SLOT_" + tokenfluent + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
+ "<x,l1,<e,t>,[ l1:[ p | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
result.add(dpEntry1);
result.add(dpEntry2);
result.add(npEntry);
@@ -119,7 +119,7 @@
slot = "SLOT_" + tokenfluent + "/UNSPEC/" + token;
String[] npEntry = {token,
"(NP " + treetoken + " )",
- "<x,l1,<e,t>,[ l1:[ p | SLOT_" + tokenfluent + "(p), ISA(x,p) ] ],[],[],[" + slot + "]>"};
+ "<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(x) ] ],[],[],[" + slot + "]>"};
result.add(npEntry);
}
@@ -136,11 +136,11 @@
if (pos.equals("PASSIVE")) {
String[] passEntry1 = {token,
"(S DP[subj] (VP V:'" + token + "' DP[obj]))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
String[] passEntry2 = {token,
"(S DP[wh] (VP DP[dp] V:'" + token + "'))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,x,wh,<<e,t>,t>),(l3,y,dp,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(y,x) ] ],[(l2,x,wh,<<e,t>,t>),(l3,y,dp,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(x,y) ] ],[(l2,x,wh,<<e,t>,t>),(l3,y,dp,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
result.add(passEntry1);
result.add(passEntry2);
@@ -148,35 +148,35 @@
else if (pos.equals("PASSPART")) {
String[] passpartEntry = {token,
"(NP NP* (VP V:'" + token + "' DP[dp]))",
- "<x,l1,t,[ l1:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,y,dp,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[ p | SLOT_" + token + "(y,x) ] ],[(l2,y,dp,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[ | empty(y,x) ] ],[(l2,y,dp,<<e,t>,t>)],[ l2=l1 ],[]>"};
result.add(passpartEntry);
}
else if (pos.equals("VPASS")) {
String[] passEntry = {token,
"(S DP[subj] (VP V:'" + token + "'))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
result.add(passEntry);
}
else if (pos.equals("VPASSIN")) {
String[] passEntry1 = {token,
"(S DP[subj] (VP V:'" + token + "' DP[obj]))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>"};
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>"};
String[] passEntry2 = {token,
"(S DP[dp] (VP V:'" + token + "' NUM[num]))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(y,z) ] ],[(l2,x,dp,<<e,t>,t>),(l3,z,num,e)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>"};
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(y,z) ] ],[(l2,x,dp,<<e,t>,t>),(l3,z,num,e)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>"};
result.add(passEntry1);
result.add(passEntry2);
}
else if (pos.equals("GERUNDIN")) {
String[] gerundinEntry1 = {token,
"(NP NP* V:'" + token + "' DP[obj]))",
- "<x,l1,t,[ l1:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,y,obj,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[ p | SLOT_" + token + "(y,x) ] ],[(l2,y,obj,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[ | empty(x,y) ] ],[(l2,y,obj,<<e,t>,t>)],[ l2=l1 ],[]>"};
String[] gerundinEntry2 = {token,
"(ADJ V:'" + token + "' DP[obj]))",
- "<x,l1,<e,t>,[ l1:[ p | SLOT_" + token + "(p), p(y,x) ] ],[(l2,y,obj,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
+ "<x,l1,<e,t>,[ l1:[ p | SLOT_" + token + "(y,x) ] ],[(l2,y,obj,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
" ;; <x,l1,<e,t>,[ l1:[ | empty(x,y) ] ],[(l2,y,obj,<<e,t>,t>)],[ l2=l1 ],[]>"};
result.add(gerundinEntry1);
result.add(gerundinEntry2);
@@ -184,14 +184,14 @@
else if (pos.equals("VPREP")) {
String[] passEntry1 = {token,
"(S DP[subj] (VP V:'" + token + "' DP[obj]))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
String[] passEntry2 = {token,
"(S DP[subj] (VP V:'" + token + "' NUM[num]))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(x,y), DATE(y,z) ] ],[(l2,x,subj,<<e,t>,t>),(l3,z,num,e)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>"};
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(x,y), DATE(y,z) ] ],[(l2,x,subj,<<e,t>,t>),(l3,z,num,e)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>"};
String[] whEntry = {token,
"(S DP[obj] (VP DP[subj] V:'" + token + "'))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
result.add(passEntry1);
result.add(passEntry2);
@@ -200,7 +200,7 @@
else if (pos.equals("VBD") || pos.equals("VBZ") || pos.equals("VBP")) {
String[] vEntry = {token,
"(S DP[subj] (VP V:'" + token + "' DP[obj]))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(y,x) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
result.add(vEntry);
@@ -208,18 +208,18 @@
else if (pos.equals("VB")) {
String[] whEntry = {token,
"(S DP[obj] (VP DP[subj] V:'" + token + "'))",
- "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[|], l4:[ p | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[" + slot + "]>" +
" ;; <x,l1,t,[ l1:[|], l4:[ | empty(x,y) ] ],[(l2,x,subj,<<e,t>,t>),(l3,y,obj,<<e,t>,t>)],[ l2<l1,l3<l1,l4<scope(l2),l4<scope(l3) ],[]>"};
result.add(whEntry);
}
else if (pos.equals("VBG") || pos.equals("VBN")) {
String[] gerEntry = {token,
"(NP NP* (VP V:'" + token + "' DP[dp]))",
- "<x,l1,t,[ l1:[ p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,dp,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
+ "<x,l1,t,[ l1:[ p | SLOT_" + token + "(x,y) ] ],[(l2,y,dp,<<e,t>,t>)],[ l2=l1 ],[" + slot + "]>" +
";; <x,l1,t,[ l1:[ | empty(x,y) ] ],[(l2,y,dp,<<e,t>,t>)],[ l2=l1 ],[]>"};
String[] wasGerEntry = {token,
"(S DP[comp] (VP V:'was' DP[subject] V:'" + token + "'))",
- "<y,l1,t,[ l1:[ | SLOT_" + token + "(p), p(y,z) ] ],[(l2,y,comp,<<e,t>,t>), (l3,z,subject,<<e,t>,t>) ],[ l2=l1, l3=l1 ],[" + slot + "]>"};
+ "<y,l1,t,[ l1:[ | SLOT_" + token + "(y,z) ] ],[(l2,y,comp,<<e,t>,t>), (l3,z,subject,<<e,t>,t>) ],[ l2=l1, l3=l1 ],[" + slot + "]>"};
result.add(wasGerEntry);
result.add(gerEntry);
}
@@ -227,14 +227,14 @@
slot = "SLOT_" + token + "/PROPERTY/" + token + "_date";
String[] whenEntry = {token,
"(S DP[subj] (VP V:'" + token + "'))",
- "<x,l1,t,[ l1:[ ?y,p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,x,subj,<<e,t>,t>)],[ l2=l1 ],[ " + slot + " ]>"};
+ "<x,l1,t,[ l1:[ ?y,p | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>)],[ l2=l1 ],[ " + slot + " ]>"};
result.add(whenEntry);
}
else if (pos.equals("WHERE")) {
slot = "SLOT_" + token + "/PROPERTY/" + token + "_place";
String[] whereEntry = {token,
"(S DP[subj] (VP V:'" + token + "'))",
- "<x,l1,t,[ l1:[ ?y,p | SLOT_" + token + "(p), p(x,y) ] ],[(l2,x,subj,<<e,t>,t>)],[ l2=l1 ],[ " + slot + " ]>"};
+ "<x,l1,t,[ l1:[ ?y,p | SLOT_" + token + "(x,y) ] ],[(l2,x,subj,<<e,t>,t>)],[ l2=l1 ],[ " + slot + " ]>"};
result.add(whereEntry);
}
@@ -247,13 +247,13 @@
if (pos.equals("JJ")) {
String[] adjEntry = {token,
"(NP ADJ:'" + token.toLowerCase() + "' NP*)",
- "<x,l1,<e,t>,[ l1:[ j | SLOT_" + token + "(p), p(x,j) ] ],[],[],["+slot+"]>"};
+ "<x,l1,<e,t>,[ l1:[ j | SLOT_" + token + "(x,j) ] ],[],[],["+slot+"]>"};
result.add(adjEntry);
}
if (pos.equals("JJH")) {
String[] howEntry = {"how "+token,
"(DP ADJ:'" + token.toLowerCase() + "')",
- "<x,l1,<<e,t>,t>,[ l1:[ ?j,x,p | SLOT_" + token + "(p), p(x,j) ] ],[],[],["+slot+"]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ ?j,x,p | SLOT_" + token + "(x,j) ] ],[],[],["+slot+"]>"};
result.add(howEntry);
}
/* COMPARATIVE */
@@ -266,11 +266,11 @@
String[] compEntry1 = {token,
"(ADJ ADJ:'" + token.toLowerCase() + "' P:'than' DP[compobj])",
- "<x,l1,<e,t>,[ l1:[ p,j,i | SLOT_" + token + "(p), p(x,i), p(y,j), " + comp + "(i,j) ] ],[ (l2,y,compobj,<<e,t>,t>) ],[l1=l2],["+slot+"]>"};
+ "<x,l1,<e,t>,[ l1:[ p,j,i | SLOT_" + token + "(x,i), SLOT_" + token + "(y,j), " + comp + "(i,j) ] ],[ (l2,y,compobj,<<e,t>,t>) ],[l1=l2],["+slot+"]>"};
result.add(compEntry1);
String[] compEntry2 = {token,
"(NP NP* (ADJ ADJ:'" + token.toLowerCase() + "' P:'than' DP[compobj]))",
- "<x,l1,<e,t>,[ l1:[ p,j,i | SLOT_" + token + "(p), p(x,i), p(y,j), " + comp + "(i,j) ] ],[ (l2,y,compobj,<<e,t>,t>) ],[l1=l2],["+slot+"]>"};
+ "<x,l1,<e,t>,[ l1:[ p,j,i | SLOT_" + token + "(x,i), SLOT_" + token + "(y,j), " + comp + "(i,j) ] ],[ (l2,y,compobj,<<e,t>,t>) ],[l1=l2],["+slot+"]>"};
result.add(compEntry2);
}
/* SUPERLATIVE */
@@ -283,28 +283,29 @@
String[] superEntry1 = {token,
"(DET DET:'the' ADJ:'" + token.toLowerCase() + "')",
- "<x,l1,e,[ l1:[ p,x,j | SLOT_" + token + "(p), p(x,j), " + comp + "(j) ] ],[],[],["+slot+"]>"};
+ "<x,l1,e,[ l1:[ p,x,j | SLOT_" + token + "(x,j), " + comp + "(j) ] ],[],[],["+slot+"]>"};
result.add(superEntry1);
String[] superEntry2 = {token,
"(DP (NP DET:'the' ADJ:'" + token.toLowerCase() + "'))",
- "<x,l1,<<e,t>,t>,[ l1:[ p,x,j | SLOT_" + token + "(p), p(x,j), " + comp + "(j) ] ],[],[],["+slot+"]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ p,x,j | SLOT_" + token + "(x,j), " + comp + "(j) ] ],[],[],["+slot+"]>"};
result.add(superEntry2);
String[] superEntry3 = {token,
"(DP (NP DET:'the' ADJ:'" + token.toLowerCase() + "' NP[noun]))",
- "<x,l1,<<e,t>,t>,[ l1:[ p,x,j | SLOT_" + token + "(p), p(x,j), " + comp + "(j) ] ],[ (l2,x,noun,<e,t>) ],[l2=l1],["+slot+"]>"};
+ "<x,l1,<<e,t>,t>,[ l1:[ p,x,j | SLOT_" + token + "(x,j), " + comp + "(j) ] ],[ (l2,x,noun,<e,t>) ],[l2=l1],["+slot+"]>"};
result.add(superEntry3);
}
}
/* PREPOSITIONS */
else if (equalsOneOf(pos,preps)) {
+ slot = "SLOT_" + token + "/PROPERTY/";
String[] npAdjunct = {token,
"(NP NP* (PP P:'" + token.toLowerCase() + "' DP[pobj]))",
- "<x,l1,<e,t>,[ l1:[ | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>" +
- " ;; <x,l1,<e,t>,[ l1:[ | empty(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>"};
+ // "<x,l1,<e,t>,[ l1:[ | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],["+slot+"]>" +
+ "<x,l1,<e,t>,[ l1:[ | empty(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>"};
String[] vpAdjunct = {token,
"(VP VP* (PP P:'" + token.toLowerCase() + "' DP[pobj]))",
- "<x,l1,t,[ l1:[ | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>" +
- " ;; <x,l1,t,[ l1:[ | empty(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>"};
+ // "<x,l1,t,[ l1:[ | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],["+slot+"]>" +
+ "<x,l1,t,[ l1:[ | empty(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>"};
result.add(npAdjunct);
result.add(vpAdjunct);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
