From: <ku...@us...> - 2008-09-29 19:22:19
|
Revision: 1310 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1310&view=rev Author: kurzum Date: 2008-09-29 19:21:58 +0000 (Mon, 29 Sep 2008) Log Message: ----------- server commit Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java =================================================================== --- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-09-29 18:44:31 UTC (rev 1309) +++ trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-09-29 19:21:58 UTC (rev 1310) @@ -30,11 +30,14 @@ import org.dllearner.kb.manipulator.Manipulator; import org.dllearner.utilities.datastructures.RDFNodeTuple; import org.dllearner.utilities.owl.OWLVocabulary; +import org.semanticweb.owl.model.OWLAnnotationAxiom; import org.semanticweb.owl.model.OWLAxiom; import org.semanticweb.owl.model.OWLClass; +import org.semanticweb.owl.model.OWLCommentAnnotation; import org.semanticweb.owl.model.OWLDataFactory; import org.semanticweb.owl.model.OWLDataProperty; import org.semanticweb.owl.model.OWLIndividual; +import org.semanticweb.owl.model.OWLLabelAnnotation; import org.semanticweb.owl.model.OWLObjectProperty; import com.hp.hpl.jena.rdf.model.Literal; @@ -189,6 +192,15 @@ OWLDataProperty p = factory.getOWLDataProperty(one.getURI()); Literal ln = one.getBPart().getLiteral(); + if(one.getURIString().equals(OWLVocabulary.RDFS_COMMENT)){ + //skip + //OWLCommentAnnotation comment = factory.getOWL(one.b.toString()); + //owlAPIOntologyCollector.addAxiom(factory.getOWLEntityAnnotationAxiom(me, label)); + }else if(one.getURIString().equals(OWLVocabulary.RDFS_LABEL)){ + OWLLabelAnnotation label = factory.getOWLLabelAnnotation(one.b.toString()); + owlAPIOntologyCollector.addAxiom(factory.getOWLEntityAnnotationAxiom(me, label)); + }else{ + try{ if(one.getBPart().isFloat()){ @@ -216,12 +228,12 @@ //handover one.toOWLOntology(owlAPIOntologyCollector); - + }catch (Exception e) { e.printStackTrace(); System.exit(0); } - + } //factory.getOWLDataPropertyAssertionAxiom() //returnSet.add("<" + uri + "><" + one.getURI() + "> " + one.getNTripleFormOfB() // + " ."); Modified: trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java =================================================================== --- trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java 2008-09-29 18:44:31 UTC (rev 1309) +++ trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java 2008-09-29 19:21:58 UTC (rev 1310) @@ -77,9 +77,9 @@ public class SemanticBibleComparison { - private static boolean onJensMachine = false; - private static int nrOfFilesInExperiment = (onJensMachine)?1:200; + private static int nrOfFilesInExperiment = 200; + private static ReasoningService reasoningService; private static Logger logger = Logger.getRootLogger(); @@ -132,10 +132,19 @@ NORMAL_10000_CTESTS, NORMAL_10000_CTESTS_FASTINST, + SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP, - SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSEAFTERRECURSION, + SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP, SPARQL_10000_CTESTS_SPECIAL_REC1, - SPARQL_10000_CTESTS_SPECIAL_REC3}; + SPARQL_10000_CTESTS_SPECIAL_REC3, + + SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP_HASVALUE, + SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP_HASVALUE, + SPARQL_10000_CTESTS_SPECIAL_REC1_HASVALUE, + SPARQL_10000_CTESTS_SPECIAL_REC3_HASVALUE, + SPARQL_10000_CTESTS_HASVALUE + + }; //private static Class usedReasoner = FastInstanceChecker.class; @@ -156,45 +165,62 @@ List<String> l = getFiles(); analyzeFiles(l); - if(onJensMachine){ - conductExperiment(Experiments.NORMAL_10s); - conductExperiment(Experiments.NORMAL_100s); - conductExperiment(Experiments.NORMAL_1000_CTESTS); - conductExperiment(Experiments.NORMAL_10000_CTESTS); - - - - }else{ + /*finished experiments: - * SPARQL_10s - * SPARQL_1000_CONCEPT_TESTS + * NORMAL_1000_CONCEPT_TESTS * SPARQL_10000_CONCEPT_TESTS * NORMAL_10000_CONCEPT_TESTS - * missing: + * to be repeated: * NORMAL_10s * SPARQL_100s * NORMAL_100s + * SPARQL_10s + * SPARQL_1000_CONCEPT_TESTS + * SPARQL_10000_CONCEPT_TESTS + * NORMAL_100s * - * extra: * */ + + boolean jens=false; + if(jens){ + + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP_HASVALUE); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP); + + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP_HASVALUE); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP); + + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1_HASVALUE); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1); + + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC3_HASVALUE); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC3); + + conductExperiment(Experiments.SPARQL_10000_CTESTS_HASVALUE); + conductExperiment(Experiments.SPARQL_10000_CTESTS); + + }else{ - //conductExperiment(Experiments.NORMAL_10s); - //conductExperiment(Experiments.SPARQL_100s); - //conductExperiment(Experiments.NORMAL_100s); + conductExperiment(Experiments.SPARQL_10s); + conductExperiment(Experiments.SPARQL_1000_CTESTS); + conductExperiment(Experiments.NORMAL_10s); + conductExperiment(Experiments.SPARQL_100s); + conductExperiment(Experiments.NORMAL_100s); + + + conductExperiment(Experiments.SPARQL_10000_CTESTS); + + + //EXTRA + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1); + conductExperiment(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC3); + conductExperiment(Experiments.SPARQL_10000_CTESTS); - //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.NORMAL_10000_CTESTS_FASTINST); - - } - + } // write JaMON report in HTML file @@ -370,6 +396,16 @@ ExampleBasedROLComponentConfigurator c = la.getConfigurator(); + //defaultSettings: + c.setUseHasValueConstructor(false); + c.setUseBooleanDatatypes(true); + c.setUseDoubleDatatypes(false); + + if(exp.toString().contains("HASVALUE")){ + c.setUseHasValueConstructor(true); + } + + if(exp.toString().contains("10s")){ c.setMaxExecutionTimeInSeconds(10); c.setMinExecutionTimeInSeconds(10); @@ -417,7 +453,7 @@ if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP)){ c.setGetPropertyInformation(false); - }else if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSEAFTERRECURSION)){ + }else if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP)){ c.setCloseAfterRecursion(false); c.setGetPropertyInformation(false); }else if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1)){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |