Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1302] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-09-29 16:21:44
|
Revision: 1302
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1302&view=rev
Author: kurzum
Date: 2008-09-29 16:21:33 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
fixed bug
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java 2008-09-29 15:29:52 UTC (rev 1301)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java 2008-09-29 16:21:33 UTC (rev 1302)
@@ -112,7 +112,8 @@
@Override
public void toOWLOntology( OWLAPIOntologyCollector owlAPIOntologyCollector){
- //FIXME
+ logger.error("toOWLOntology called in blanknodes ");
+ //FIXME robably not needed
}
public String getInBoundEdge(){
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-09-29 15:29:52 UTC (rev 1301)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-09-29 16:21:33 UTC (rev 1302)
@@ -30,6 +30,7 @@
import org.dllearner.kb.manipulator.Manipulator;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
import org.dllearner.utilities.owl.OWLVocabulary;
+import org.semanticweb.owl.model.OWLAxiom;
import org.semanticweb.owl.model.OWLClass;
import org.semanticweb.owl.model.OWLDataFactory;
import org.semanticweb.owl.model.OWLDataProperty;
@@ -151,15 +152,24 @@
OWLIndividual me = factory.getOWLIndividual(getURI());
+
for (ClassNode one : classes) {
+ //create Axiom
OWLClass c = factory.getOWLClass(one.getURI());
- owlAPIOntologyCollector.addAxiom(factory.getOWLClassAssertionAxiom(me, c));
+ OWLAxiom ax = factory.getOWLClassAssertionAxiom(me, c);
+ //collect
+ owlAPIOntologyCollector.addAxiom(ax);
+ //handover
one.toOWLOntology(owlAPIOntologyCollector);
}
for (ObjectPropertyNode one : objectProperties) {
+ //create axiom
OWLIndividual o = factory.getOWLIndividual(one.getBPart().getURI());
OWLObjectProperty p = factory.getOWLObjectProperty(one.getURI());
- factory.getOWLObjectPropertyAssertionAxiom(me, p, o);
+ OWLAxiom ax = factory.getOWLObjectPropertyAssertionAxiom(me, p, o);
+ //collect
+ owlAPIOntologyCollector.addAxiom(ax);
+ //handover
one.toOWLOntology(owlAPIOntologyCollector);
one.getBPart().toOWLOntology(owlAPIOntologyCollector);
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java 2008-09-29 15:29:52 UTC (rev 1301)
+++ trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java 2008-09-29 16:21:33 UTC (rev 1302)
@@ -94,7 +94,7 @@
private static String tmpFilename = dir + "tmp.conf";
//static File log = new File(dir+"results+prop.txt");
- private static String tableFile = tableDir+"sembib.table";
+ //private static String tableFile = tableDir+"sembib.table";
private static String tableLatex = tableDir+"sembibLatex.table";
private static Stat accFragment = new Stat();
@@ -187,10 +187,10 @@
//conductExperiment(Experiments.SPARQL_1000_CTESTS);
//EXTRA
- conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP);
- conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSEAFTERRECURSION);
- conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1);
- conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC3);
+ //conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP);
+ //conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSEAFTERRECURSION);
+ //conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1);
+ //conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC3);
conductExperiment(Experiments.NORMAL_10000_CTESTS_FASTINST);
}
@@ -547,8 +547,9 @@
}; //9
TableColumn labels = new TableColumn("Semantic Bible",labString);
t.addColumn(labels);
- Table.serializeColumns(t, tableDir, tableFile);
- Files.createFile(new File(tableLatex), t.getLatexString());
+ Files.mkdir(tableDir);
+ //Table.serializeColumns(t, tableDir, tableFile);
+ //Files.createFile(new File(tableLatex), t.getLatexString());
}
@@ -568,8 +569,9 @@
}; //9
t.removeColumn(exp.toString());
t.addColumn(new TableColumn(exp.toString(),columnString));
- Table.serializeColumns(t, tableDir, tableFile+exp+count);
- Files.createFile(new File(tableLatex), t.getLatexString());
+ String expId = exp.toString()+count;
+ Table.serializeColumns(t, tableDir+expId, tableDir+expId+File.separator+"table");
+ Files.createFile(new File(tableDir+expId+File.separator+"table.tex"), t.getLatexString());
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java 2008-09-29 15:29:52 UTC (rev 1301)
+++ trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java 2008-09-29 16:21:33 UTC (rev 1302)
@@ -56,8 +56,8 @@
boolean production = true;
if(production){
String tablename = "myTable";
- String tableFile = "sembib100/sofar/table";
-
+ //String tableFile = "sembib100/sofar/table";
+ String tableFile = "sembib100/2ndExp/table2nd.table";
Table t = createTableFromSerializedColums(tablename, tableFile);
Files.createFile(new File(tableFile+".tex"), t.getLatexString());
@@ -201,12 +201,12 @@
String content = "";
dir = StringFormatter.checkIfDirEndsOnSlashAndRemove(dir);
Files.mkdir(dir);
- String div = (System.currentTimeMillis() % 10000) + "";
+
try{
int i=0;
for(TableColumn c:t.getColumns()){
String header = URLEncoder.encode(c.getHeader(),"UTF-8");
- String columnFileName = dir+File.separator+t.getTableName()+(i++)+header+div+column;
+ String columnFileName = dir+File.separator+t.getTableName()+(i++)+header+column;
c.serialize(new File(columnFileName));
//Files.writeObjectToFile(c, new File(filename));
content += columnFileName+System.getProperty("line.separator");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
