[DL-Learner SVN] SF.net SVN: dl-learner:[3757] trunk/components-ext/src/main

[<chr...@us...>]

Revision: 3757
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3757&view=rev
Author:   christinaunger
Date:     2012-06-18 07:37:27 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
[tbsl] "Oh look... is it a stockbroker? Is it a quantity Surveyor? Is it a church warden? NO! It's Bicycle Repair Man!"

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/Preprocessor.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java
    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	2012-06-18 07:16:33 UTC (rev 3756)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java	2012-06-18 07:37:27 UTC (rev 3757)
@@ -474,7 +474,7 @@
                     }
                 }
                 if (takeit) {
-                    regex += cond.getPredicate().replace("SLOT","") + " ";
+                    regex += cond.getPredicate().replace("SLOT_","") + " ";
                     used.add(cond);
                 }
                 else {
@@ -488,6 +488,7 @@
                 c.getArguments().add(new DiscourseReferent("'"+regex.trim()+"'"));
                 c.setPredicate("regex");
             }
+            else {} // TODO should not happen!
             for (Slot s : slots) {
                 if (s.getWords().contains(var)) {
                     s.getWords().remove(var);

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	2012-06-18 07:16:33 UTC (rev 3756)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/ltag/parser/Preprocessor.java	2012-06-18 07:37:27 UTC (rev 3757)
@@ -223,7 +223,7 @@
 		while (m.find()) {
 //                    if (!m.group(4).startsWith("NNP")) {
 			if (VERBOSE) logger.trace("Replacing " + m.group(1) + " by " + m.group(2)+"_"+m.group(3)+"/JJNN");
-			condensedstring = condensedstring.replaceFirst(m.group(1),m.group(2)+"_"+m.group(3)+"/JJNN");
+			condensedstring = condensedstring.replaceFirst(m.group(1),m.group(2)+"_"+m.group(3)+"/JJNN ");
 //                    }
 		}
 		m = adjnprepPattern.matcher(condensedstring); 

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	2012-06-18 07:16:33 UTC (rev 3756)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java	2012-06-18 07:37:27 UTC (rev 3757)
@@ -33,7 +33,7 @@
 		case B:
 			return "BOUND(" + a + ")";
 		case EQ:
-			return a + " == " + b;
+			return a + " = " + b;
 		case GT:
 			return a + " > " + b;
 		case GTEQ:

Modified: trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex	2012-06-18 07:16:33 UTC (rev 3756)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex	2012-06-18 07:37:27 UTC (rev 3757)
@@ -68,7 +68,7 @@
 	many || (DP DET:'many' NP[noun]) || <y, l1, <<e,t>,t>, [ l1:[ | l2:[ y | ] MANY y l3:[|] ] ], [ (l4,y,noun,<e,t>) ], [ l4=l2 ],[]>
 	the || (DP DET:'the' NP[noun]) || <x, l1, <<e,t>,t>, [ l1:[x|] ], [ (l2,x,noun,<e,t>) ], [ l2=l1 ],[]>
 	at least || (DP DET:'at' DET:'least' NUM[num] NP[noun]) || <y,l1,<<e,t>,t>,[l1:[ y,j |count(a,y,j), greaterorequal(j,x) ]],[(l2,y,noun,<e,t>),(l3,x,num,e)],[ l1=l2, l2=l3 ],[]>
-	at most || (DP DET:'at' DET:'most' NUM[num] NP[noun]) || <y,l1,<<e,t>,t>,[l1:[ y,j | count(a,y,j), smallerorequal(j,x) ]],[(l2,y,noun,<e,t>),(l3,x,num,e)],[ l1=l2, l2=l3 ],[]>
+	at most || (DP DET:'at' DET:'most' NUM[num] NP[noun]) || <y,l1,<<e,t>,t>,[l1:[ y,j | count(a,y,j), lessorequal(j,x) ]],[(l2,y,noun,<e,t>),(l3,x,num,e)],[ l1=l2, l2=l3 ],[]>
 	exactly || (DP DET:'exactly' NUM[num] NP[noun]) || <y,l1,<<e,t>,t>,[l1:[ y,j | count(y,j), equals(j,x) ]],[(l2,y,noun,<e,t>),(l3,x,num,e)],[ l1=l2, l2=l3 ],[]>
 	
 	other || (NP ADJ:'other' NP*) || <x,l1,<e,t>,[ l1:[ | ] ], [],[],[]>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.