Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2018] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2010-02-12 07:23:40
|
Revision: 2018
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2018&view=rev
Author: kurzum
Date: 2010-02-12 07:23:34 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
added ValueKBParserTest hasValue can not be parsed...
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
trunk/src/dl-learner/org/dllearner/utilities/examples/Examples.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/test/ValueKBParserTest.java
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java 2010-02-11 13:53:47 UTC (rev 2017)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java 2010-02-12 07:23:34 UTC (rev 2018)
@@ -150,6 +150,10 @@
public void setLimit(int limit) {
this.limit = limit;
}
+
+ public void noLimit() {
+ this.limit = -1;
+ }
public void setLabels(boolean labels) {
this.labels = labels;
@@ -224,7 +228,8 @@
s.add("(\"http://dbpedia.org/class/yago/HeadOfState110164747\" AND (\"http://dbpedia.org/class/yago/Negotiator110351874\" AND \"http://dbpedia.org/class/yago/Representative110522035\"))");
s.clear();
- s.add("(\"http://nlp2rdf.org/ontology/Sentence\" AND (EXISTS \"http://nlp2rdf.org/ontology/syntaxTreeHasPart\".\"http://nachhalt.sfb632.uni-potsdam.de/owl/stts.owl#Pronoun\" AND EXISTS \"http://nlp2rdf.org/ontology/syntaxTreeHasPart\".\"http://nlp2rdf.org/ontology/sentencefinalpunctuation_tag\"))");
+// s.add("(\"http://nlp2rdf.org/ontology/Sentence\" AND (EXISTS \"http://nlp2rdf.org/ontology/syntaxTreeHasPart\".\"http://nachhalt.sfb632.uni-potsdam.de/owl/stts.owl#Pronoun\" AND EXISTS \"http://nlp2rdf.org/ontology/syntaxTreeHasPart\".\"http://nlp2rdf.org/ontology/sentencefinalpunctuation_tag\"))");
+ s.add("(\"http://nlp2rdf.org/ontology/Sentence\" AND (\"http://nlp2rdf.org/ontology/hasLemma\" VALUE \"test\" )");
// <http://nlp2rdf.org/ontology/sentencefinalpunctuation_tag>
String query = "";
Added: trunk/src/dl-learner/org/dllearner/test/ValueKBParserTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/ValueKBParserTest.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/test/ValueKBParserTest.java 2010-02-12 07:23:34 UTC (rev 2018)
@@ -0,0 +1,22 @@
+package org.dllearner.test;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.dllearner.parser.KBParser;
+import org.dllearner.parser.ParseException;
+
+public class ValueKBParserTest {
+ public static void main(String[] args) {
+ SortedSet<String> s = new TreeSet<String>();
+ s.add("(\"http://nlp2rdf.org/ontology/Sentence\" AND (\"http://nlp2rdf.org/ontology/hasLemma\" value test )");
+
+ for (String kbsyntax : s) {
+ try {
+ KBParser.parseConcept(kbsyntax);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/Examples.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/Examples.java 2010-02-11 13:53:47 UTC (rev 2017)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/Examples.java 2010-02-12 07:23:34 UTC (rev 2018)
@@ -22,7 +22,6 @@
import java.io.FileWriter;
import java.text.DecimalFormat;
import java.util.Collection;
-import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -37,8 +36,8 @@
public class Examples {
private static final Logger logger = Logger.getLogger(Examples.class);
- private final SortedSet<String> positiveExamples = new TreeSet<String>();
- private final SortedSet<String> negativeExamples = new TreeSet<String>();
+// private final SortedSet<String> positiveExamples = new TreeSet<String>();
+// private final SortedSet<String> negativeExamples = new TreeSet<String>();
private final SortedSet<String> posTrain = new TreeSet<String>();
private final SortedSet<String> negTrain = new TreeSet<String>();
private final SortedSet<String> posTest = new TreeSet<String>();
@@ -53,56 +52,64 @@
this.addNegTest(negTest);
}
- public void remove(Set<String> remove) {
- for (String string : remove) {
- positiveExamples.remove(string);
- negativeExamples.remove(string);
- }
+// public void remove(Set<String> remove) {
+// for (String string : remove) {
+// positiveExamples.remove(string);
+// negativeExamples.remove(string);
+// }
+// }
+
+ private void _remove(String toBeRemoved ){
+ posTrain.remove(toBeRemoved);
+ negTrain.remove(toBeRemoved);
+ posTest.remove(toBeRemoved);
+ negTest.remove(toBeRemoved);
}
-
+ private void _removeAll(Collection<String> toBeRemoved){
+ posTrain.removeAll(toBeRemoved);
+ negTrain.removeAll(toBeRemoved);
+ posTest.removeAll(toBeRemoved);
+ negTest.removeAll(toBeRemoved);
+ }
+
public void addPosTrain(Collection<String> pos) {
- positiveExamples.addAll(pos);
+ _removeAll(pos);
posTrain.addAll(pos);
}
-
+ public void addPosTest(Collection<String> pos) {
+ _removeAll(pos);
+ posTest.addAll(pos);
+ }
+ public void addNegTrain(Collection<String> neg) {
+ _removeAll(neg);
+ negTrain.addAll(neg);
+ }
+ public void addNegTest(Collection<String> neg) {
+ _removeAll(neg);
+ negTest.addAll(neg);
+ }
+
+
public void addPosTrain(String pos) {
- positiveExamples.add(pos);
+ _remove(pos);
posTrain.add(pos);
}
-
- public void addPosTest(Collection<String> pos) {
- positiveExamples.addAll(pos);
- posTest.addAll(pos);
- }
-
public void addPosTest(String pos) {
- positiveExamples.add(pos);
+ _remove(pos);
posTest.add(pos);
}
-
- public void addNegTrain(Collection<String> neg) {
- negativeExamples.addAll(neg);
- negTrain.addAll(neg);
- }
-
public void addNegTrain(String neg) {
- negativeExamples.add(neg);
+ _remove(neg);
negTrain.add(neg);
}
-
- public void addNegTest(Collection<String> neg) {
- negativeExamples.addAll(neg);
- negTest.addAll(neg);
- }
-
public void addNegTest(String neg) {
- negativeExamples.add(neg);
+ _remove(neg);
negTest.add(neg);
}
public boolean checkConsistency() {
- for (String one : positiveExamples) {
- if (negativeExamples.contains(one)) {
+ for (String one : posTrain) {
+ if (negTrain.contains(one)) {
logger.error("positve and negative example overlap " + one);
return false;
}
@@ -112,8 +119,18 @@
@Override
public String toString() {
+ String ret = "Total: " + size();
+ double posPercent = posTrain.size() / (double) posSize();
+ double negPercent = negTrain.size() / (double) negSize();
+ ret += "\nPositive: " + posTrain.size() + " | " + posTest.size() + " ("
+ + DecimalFormat.getPercentInstance().format(posPercent) + ")";
+ ret += "\nNegative: " + negTrain.size() + " | " + negTest.size() + " ("
+ + DecimalFormat.getPercentInstance().format(negPercent) + ")";
- int total = (positiveExamples.size() + negativeExamples.size());
+ return ret;
+ }
+
+ public String toFullString() {
String ret = "Training:\n";
for (String one : posTrain) {
@@ -130,15 +147,8 @@
ret += "-" + one + "\n";
}
- ret += "\nTotal: " + total;
- double posPercent = posTrain.size() / (double) positiveExamples.size();
- double negPercent = negTrain.size() / (double) negativeExamples.size();
- ret += "\nPositive: " + posTrain.size() + " | " + posTest.size() + " ("
- + DecimalFormat.getPercentInstance().format(posPercent) + ")";
- ret += "\nNegative: " + negTrain.size() + " | " + negTest.size() + " ("
- + DecimalFormat.getPercentInstance().format(negPercent) + ")";
-
- return ret;
+ return ret+this.toString();
+
}
public void writeExamples(String filename) {
@@ -158,12 +168,28 @@
}
}
+ public int size(){
+ return posTrain.size()+negTrain.size()+posTest.size()+negTest.size();
+ }
+ public int posSize(){
+ return posTrain.size()+posTest.size();
+ }
+ public int negSize(){
+ return negTrain.size()+negTest.size();
+ }
+
public SortedSet<String> getPositiveExamples() {
- return positiveExamples;
+ SortedSet<String> total = new TreeSet<String>();
+ total.addAll(posTrain);
+ total.addAll(posTest);
+ return total;
}
public SortedSet<String> getNegativeExamples() {
- return negativeExamples;
+ SortedSet<String> total = new TreeSet<String>();
+ total.addAll(negTrain);
+ total.addAll(negTest);
+ return total;
}
public SortedSet<String> getPosTrain() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
