[DL-Learner SVN] SF.net SVN: dl-learner:[3999] trunk/interfaces/src/main/java/org/dllearner/ server/Rest.java

[<dc...@us...>]

Revision: 3999
          http://sourceforge.net/p/dl-learner/code/3999
Author:   dcherix
Date:     2013-06-14 12:41:49 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Changed in the Rest api class to use the OWLClassExpressionToSparqlConverter

Modified Paths:
--------------
    trunk/interfaces/src/main/java/org/dllearner/server/Rest.java

Modified: trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/Rest.java	2013-06-14 09:24:13 UTC (rev 3998)
+++ trunk/interfaces/src/main/java/org/dllearner/server/Rest.java	2013-06-14 12:41:49 UTC (rev 3999)
@@ -9,6 +9,8 @@
 import org.dllearner.core.LearningAlgorithm;
 import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
 import org.dllearner.learningproblems.EvaluatedDescriptionPosNeg;
+import org.dllearner.utilities.owl.OWLAPIConverter;
+import org.dllearner.utilities.owl.OWLClassExpressionToSPARQLConverter;
 import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,7 +75,7 @@
                         "} ";
 
                 learningResult.put("success", "1");
-                learningResult.put("manchester", manchester);
+                learningResult.put("manchester", manchester); 
                 learningResult.put("kbsyntax", "other syntax");
                 learningResult.put("sparql", sparql);
                 learningResult.put("accuracy", 1.0);
@@ -87,11 +89,12 @@
 
                 SparqlQueryDescriptionConvertVisitor sqd = new SparqlQueryDescriptionConvertVisitor();
                 sqd.setLimit(limit);
-
-                learningResult.put("success", "1");
+                OWLClassExpressionToSPARQLConverter sparqlConv = new OWLClassExpressionToSPARQLConverter();
+                               learningResult.put("success", "1");
                 learningResult.put("manchester", ed.getDescription().toManchesterSyntaxString(null, null));
                 learningResult.put("kbsyntax", ed.getDescription().toKBSyntaxString());
-                learningResult.put("sparql", sqd.getSparqlQuery(ed.getDescription()));
+//                learningResult.put("sparql", sqd.getSparqlQuery(ed.getDescription()));
+                learningResult.put("sparql",  sparqlConv.asQuery("?subject", OWLAPIConverter.getOWLAPIDescription(ed.getDescription())));
                 learningResult.put("accuracy", ed.getAccuracy());
                 learningResult.put("truePositives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getCoveredPositives()));
                 learningResult.put("falsePositives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getNotCoveredPositives()));

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