Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3299] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl
|
From: <chr...@us...> - 2011-10-12 10:34:59
|
Revision: 3299
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3299&view=rev
Author: christinaunger
Date: 2011-10-12 10:34:52 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
[tbsl] fixed small bugs in template generation and DRS2SPARQL conversion
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/templator/Templator.java
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-11 08:51:56 UTC (rev 3298)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java 2011-10-12 10:34:52 UTC (rev 3299)
@@ -246,38 +246,38 @@
} else if (predicate.equals("greater")) {
query.addFilter(new SPARQL_Filter(
new SPARQL_Pair(
- new SPARQL_Term(simple.getArguments().get(0).getValue(),true),
+ new SPARQL_Term(simple.getArguments().get(0).getValue(),false),
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(0).getValue(),false),
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(0).getValue(),false),
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(0).getValue(),false),
new SPARQL_Term(simple.getArguments().get(1).getValue(),literal),
SPARQL_PairType.LTEQ)));
return query;
} else if (predicate.equals("maximum")) {
- query.addSelTerm(new SPARQL_Term(simple.getArguments().get(0).getValue(),true));
+ query.addSelTerm(new SPARQL_Term(simple.getArguments().get(0).getValue(),false));
query.addOrderBy(new SPARQL_Term(simple.getArguments().get(0).getValue(), SPARQL_OrderBy.DESC));
query.setLimit(1);
return query;
} else if (predicate.equals("minimum")) {
- query.addSelTerm(new SPARQL_Term(simple.getArguments().get(0).getValue(),true));
+ query.addSelTerm(new SPARQL_Term(simple.getArguments().get(0).getValue(),false));
query.addOrderBy(new SPARQL_Term(simple.getArguments().get(0).getValue(), SPARQL_OrderBy.ASC));
query.setLimit(1);
return query;
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-11 08:51:56 UTC (rev 3298)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java 2011-10-12 10:34:52 UTC (rev 3299)
@@ -116,7 +116,7 @@
// build pairs <String,POStag> from tagged
Hashtable<String,String> postable = new Hashtable<String,String>();
for (String st : newtagged.split(" ")) {
- postable.put(st.substring(0,st.indexOf("/")),st.substring(st.indexOf("/")+1));;
+ postable.put(st.substring(0,st.indexOf("/")).toLowerCase(),st.substring(st.indexOf("/")+1));;
}
//
@@ -136,11 +136,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);
@@ -155,21 +155,23 @@
if (!slot.getWords().isEmpty()) {
word = slot.getWords().get(0);
- pos = postable.get(word.replace(" ","_"));
+ pos = postable.get(word.toLowerCase().replace(" ","_"));
POS wordnetpos = null;
- if (equalsOneOf(pos,noun)) {
- wordnetpos = POS.NOUN;
- }
- else if (equalsOneOf(pos,adjective)) {
- wordnetpos = POS.ADJECTIVE;
- }
- else if (equalsOneOf(pos,verb)) {
- wordnetpos = POS.VERB;
- }
+ if (pos != null) {
+ if (equalsOneOf(pos,noun)) {
+ wordnetpos = POS.NOUN;
+ }
+ else if (equalsOneOf(pos,adjective)) {
+ wordnetpos = POS.ADJECTIVE;
+ }
+ else if (equalsOneOf(pos,verb)) {
+ wordnetpos = POS.VERB;
+ }
+ }
List<String> strings = new ArrayList<String>();
- if (wordnetpos.equals(POS.ADJECTIVE)) {
+ if (wordnetpos != null && wordnetpos.equals(POS.ADJECTIVE)) {
strings = wordnet.getAttributes(word);
}
@@ -177,9 +179,11 @@
newwords.add(word);
newwords.addAll(strings);
- newwords.addAll(wordnet.getBestSynonyms(wordnetpos,getLemmatizedWord(word)));
- for (String att : getLemmatizedWords(strings)) {
- newwords.addAll(wordnet.getBestSynonyms(wordnetpos,att));
+ if (wordnetpos != null) {
+ newwords.addAll(wordnet.getBestSynonyms(wordnetpos,getLemmatizedWord(word)));
+ for (String att : getLemmatizedWords(strings)) {
+ newwords.addAll(wordnet.getBestSynonyms(wordnetpos,att));
+ }
}
if (newwords.isEmpty()) {
newwords.add(slot.getWords().get(0));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
