Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2899] trunk/interfaces
|
From: <ku...@us...> - 2011-06-17 07:25:28
|
Revision: 2899
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2899&view=rev
Author: kurzum
Date: 2011-06-17 07:25:21 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
geizhals
Modified Paths:
--------------
trunk/interfaces/pom.xml
trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java
trunk/interfaces/src/main/java/org/dllearner/server/nke/Geizhals2OWL.java
Added Paths:
-----------
trunk/interfaces/src/main/resources/log4j.properties
Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml 2011-06-16 13:18:28 UTC (rev 2898)
+++ trunk/interfaces/pom.xml 2011-06-17 07:25:21 UTC (rev 2899)
@@ -33,7 +33,7 @@
<filename>log/yyyy_mm_dd.request.log</filename>
<retainDays>90</retainDays>
<append>true</append>
- <extended>false</extended>
+ <extended>true</extended>
<logTimeZone>GMT</logTimeZone>
</requestLog>
</configuration>
Modified: trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java 2011-06-16 13:18:28 UTC (rev 2898)
+++ trunk/interfaces/src/main/java/org/dllearner/server/NKEGeizhals.java 2011-06-17 07:25:21 UTC (rev 2899)
@@ -3,6 +3,7 @@
import com.hp.hpl.jena.ontology.OntClass;
import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
+import org.apache.log4j.Logger;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.NamedClass;
@@ -11,8 +12,6 @@
import org.dllearner.server.nke.Learner;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -22,12 +21,12 @@
import java.io.PrintWriter;
import java.net.URLEncoder;
import java.security.InvalidParameterException;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
public class NKEGeizhals extends HttpServlet {
- private static Logger log = LoggerFactory.getLogger(NKEGeizhals.class);
+ private static Logger log = Logger.getLogger(NKEGeizhals.class);
@Override
@@ -52,6 +51,7 @@
private void handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
ComponentManager cm = ComponentManager.getInstance();
cm.freeAllComponents();
+
Monitor mon = MonitorFactory.getTimeMonitor("NIFParameters.getInstance").start();
String result = "";
try {
@@ -74,7 +74,7 @@
json = httpServletRequest.getParameter("data");
Geizhals2OWL.Result r = Geizhals2OWL.getInstance().handleJson(json);
EvaluatedDescriptionPosNeg ed = new Learner().learn(r.pos, r.neg, r.getModel(), 20);
- JSONObject concept = jsonForEd(ed);
+ JSONObject concept = jsonForEd(ed, httpServletRequest.getRequestURL().toString());
JSONObject j = new JSONObject();
j.put("learned", concept);
JSONArray up = new JSONArray();
@@ -130,27 +130,43 @@
}
- public static JSONObject jsonForEd(EvaluatedDescriptionPosNeg ed) {
- Set<NamedClass> n = getNamedClasses(ed.getDescription(), new HashSet<NamedClass>());
+ public static JSONObject jsonForEd(EvaluatedDescriptionPosNeg ed, String requestUrl) {
+ SortedSet<NamedClass> namedClasses = getNamedClasses(ed.getDescription(), new TreeSet<NamedClass>());
- //prepare retrieval string
+ String xf = getID(ed.getDescription(), namedClasses);
+ String link = "http://geizhals.at/?cat=nb15w&xf="+xf;
+
+ JSONObject j = new JSONObject();
+ j.put("link", link);
+ j.put("label", getLabel(ed.getDescription(), namedClasses));
+ j.put("truePositives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getCoveredPositives()));
+ j.put("falsePositives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getNotCoveredPositives()));
+ j.put("trueNegatives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getNotCoveredNegatives()));
+ j.put("falseNegatives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getCoveredNegatives()));
+ j.put("kbsyntax", ed.getDescription().toKBSyntaxString());
+
+ log.info(link);
+ log.info(ed.toString());
+ return j;
+ }
+
+ public static String getID(Description d, SortedSet<NamedClass> namedClasses) {
+ //prepare retrieval string
StringBuilder sb = new StringBuilder();
int x = 0;
- for (NamedClass nc : n) {
+ for (NamedClass nc : namedClasses) {
sb.append(nc.getName().replace(Geizhals2OWL.prefix, ""));
- if (x < (n.size() - 1)) {
+ if (x < (namedClasses.size() - 1)) {
sb.append("~");
}
x++;
}
- sb.insert(0, "http://geizhals.at/?cat=nb15w&xf=");
+ return sb.toString();
+ }
- JSONObject j = new JSONObject();
- j.put("link", sb.toString());
-
- j.put("kbsyntax", ed.getDescription().toKBSyntaxString());
- String mos = ed.getDescription().toManchesterSyntaxString(null, null);
- for (NamedClass nc : n) {
+ public static String getLabel(Description d, SortedSet<NamedClass> namedClasses) {
+ String mos = d.toManchesterSyntaxString(null, null);
+ for (NamedClass nc : namedClasses) {
String label = null;
OntClass c = null;
if ((c = Geizhals2OWL.labels.getOntClass(nc.getName())) != null && (label = c.getLabel(null)) != null) {
@@ -159,16 +175,11 @@
mos = mos.replace(nc.getName(), nc.getName().replace(Geizhals2OWL.prefix, ""));
}
}
- j.put("label", mos);
- j.put("falsePositives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getNotCoveredPositives()));
- j.put("falseNegatives", EvaluatedDescriptionPosNeg.getJSONArray(ed.getCoveredNegatives()));
+ return mos;
- log.info(sb.toString());
- log.info(ed.toString());
- return j;
}
- public static Set<NamedClass> getNamedClasses(Description d, Set<NamedClass> ret) {
+ public static SortedSet<NamedClass> getNamedClasses(Description d, SortedSet<NamedClass> ret) {
if (d instanceof NamedClass) {
ret.add((NamedClass) d);
}
Modified: trunk/interfaces/src/main/java/org/dllearner/server/nke/Geizhals2OWL.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/nke/Geizhals2OWL.java 2011-06-16 13:18:28 UTC (rev 2898)
+++ trunk/interfaces/src/main/java/org/dllearner/server/nke/Geizhals2OWL.java 2011-06-17 07:25:21 UTC (rev 2899)
@@ -173,8 +173,6 @@
JSONArray pos = (JSONArray) j.get("pos");
JSONArray neg = (JSONArray) j.get("neg");
- System.out.println(j);
-
fill(pos, r.pos, model);
fill(neg, r.neg, model);
return r;
Added: trunk/interfaces/src/main/resources/log4j.properties
===================================================================
--- trunk/interfaces/src/main/resources/log4j.properties (rev 0)
+++ trunk/interfaces/src/main/resources/log4j.properties 2011-06-17 07:25:21 UTC (rev 2899)
@@ -0,0 +1,25 @@
+log4j.rootLogger=INFO, stdout, file
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-20c{1} :: %m%n
+
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=log/interfaces.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern= %-4r [%t] %-5p %c %x - %m%n
+
+# Joseki server logging
+log4j.logger.org.dllearner=INFO
+
+## log4j.logger.org.joseki.server.http.LocatorServletContext=ALL
+
+# Jena, including the Joseki client
+#log4j.logger.com.hp.hpl.jena=WARN
+
+## log4j.logger.com.hp.hpl.jena.util.FileManager=ALL
+## log4j.logger.com.hp.hpl.jena.util.LocatorURL=ALL
+## log4j.logger.com.hp.hpl.jena.util.LocatorClassLoader=ALL
+## log4j.logger.com.hp.hpl.jena.util.LocatorFile=ALL
+## log4j.logger.com.hp.hpl.jena.util.LocationMapper=ALL
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
