[DL-Learner SVN] SF.net SVN: dl-learner:[1215] trunk/src/dl-learner/org/dllearner

[<sk...@us...>]

Revision: 1215
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1215&view=rev
Author:   sknappe
Date:     2008-09-16 07:08:33 +0000 (Tue, 16 Sep 2008)

Log Message:
-----------
Changed the Evaluated Description, so that the NaturalDescription is not automatically generated with it, instead a seperate webservice is now used to generate it.

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java

Modified: trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java	2008-09-15 17:28:02 UTC (rev 1214)
+++ trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java	2008-09-16 07:08:33 UTC (rev 1215)
@@ -23,6 +23,7 @@
 
 import org.dllearner.core.owl.Description;
 import org.dllearner.core.owl.Individual;
+import org.dllearner.kb.sparql.NaturalLanguageDescriptionConvertVisitor;
 import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
 import org.dllearner.learningproblems.ScoreTwoValued;
 import org.dllearner.reasoning.OWLAPIDescriptionConvertVisitor;
@@ -162,12 +163,6 @@
 		return SparqlQueryDescriptionConvertVisitor.getSparqlQuery(description, limit);
 	}
 	
-	public String getNaturalDescription(){
-		// TODO only works for DBpedia !! (no DBpedia SPARQL queries should be made to convert the description)
-//		return NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(description);
-		return "";
-	}
-	
 	/**
 	 * This convenience method can be used to store and exchange evaluated
 	 * descriptions by transforming them to a JSON string.
@@ -179,8 +174,8 @@
 			object.put("descriptionManchesterSyntax", description.toManchesterSyntaxString(null, null));
 			OWLDescription d = OWLAPIDescriptionConvertVisitor.getOWLDescription(description);
 			object.put("descriptionOWLXML", OWLAPIRenderers.toOWLXMLSyntax(d));
+			object.put("descriptionKBSyntax", description.toKBSyntaxString());
 			object.put("accuracy", score.getAccuracy());
-			object.put("NaturalLanguage", getNaturalDescription());
 			object.put("coveredPositives", getJSONArray(score.getCoveredPositives()));
 			object.put("coveredNegatives", getJSONArray(score.getCoveredNegatives()));
 			object.put("notCoveredPositives", getJSONArray(score.getNotCoveredPositives()));

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java	2008-09-15 17:28:02 UTC (rev 1214)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java	2008-09-16 07:08:33 UTC (rev 1215)
@@ -68,7 +68,7 @@
 		return ret;
 	}
 	
-	public static String getSparqlQuery(String descriptionKBSyntax) throws ParseException
+	public static String getNaturalLanguageDescription(String descriptionKBSyntax) throws ParseException
 	{	
 		Description d = KBParser.parseConcept(descriptionKBSyntax);
 		NaturalLanguageDescriptionConvertVisitor visitor=new NaturalLanguageDescriptionConvertVisitor();
@@ -98,7 +98,7 @@
 			s.add("NOT \"http://dbpedia.org/class/yago/Person100007846\"");
 			s.add("(\"http://dbpedia.org/class/yago/HeadOfState110164747\" AND (\"http://dbpedia.org/class/yago/Negotiator110351874\" AND \"http://dbpedia.org/class/yago/Representative110522035\"))");
 			for (String kbsyntax : s) {
-				result.put(kbsyntax,NaturalLanguageDescriptionConvertVisitor.getSparqlQuery(kbsyntax));
+				result.put(kbsyntax,NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(kbsyntax));
 			}
 			System.out.println("************************");
 			for (String string : result.keySet()) {

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-09-15 17:28:02 UTC (rev 1214)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-09-16 07:08:33 UTC (rev 1215)
@@ -61,6 +61,7 @@
 import org.dllearner.core.owl.ObjectProperty;
 import org.dllearner.kb.OWLFile;
 import org.dllearner.kb.sparql.Cache;
+import org.dllearner.kb.sparql.NaturalLanguageDescriptionConvertVisitor;
 import org.dllearner.kb.sparql.SPARQLTasks;
 import org.dllearner.kb.sparql.SparqlKnowledgeSource;
 import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
@@ -707,6 +708,12 @@
 	}
 	
 	@WebMethod
+	public String getNaturalDescription(String conceptString) throws ParseException {
+		// call parser to parse concept
+		return NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(conceptString);
+	}
+	
+	@WebMethod
 	public String[] getNegativeExamples(int sessionID, int componentID,String[] positives, int results, String namespace) throws ClientNotKnownException
 	{
 		int sparqlResultSetLimit = 500;


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