Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3664] trunk
|
From: <ku...@us...> - 2012-04-29 12:31:28
|
Revision: 3664
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3664&view=rev
Author: kurzum
Date: 2012-04-29 12:31:22 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
error log improvements
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java
trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-04-28 17:27:17 UTC (rev 3663)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-04-29 12:31:22 UTC (rev 3664)
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.Set;
+import com.hp.hpl.jena.ontology.OntModelSpec;
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.KnowledgeSource;
@@ -57,7 +58,7 @@
private static Logger log = LoggerFactory.getLogger(SparqlSimpleExtractor.class);
public SparqlSimpleExtractor() {
- model = ModelFactory.createOntologyModel();
+ model = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
}
/**
Modified: trunk/interfaces/src/main/java/org/dllearner/server/Rest.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/Rest.java 2012-04-28 17:27:17 UTC (rev 3663)
+++ trunk/interfaces/src/main/java/org/dllearner/server/Rest.java 2012-04-29 12:31:22 UTC (rev 3664)
@@ -1,39 +1,31 @@
package org.dllearner.server;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.lang.exception.ExceptionUtils;
import org.dllearner.configuration.IConfiguration;
import org.dllearner.configuration.spring.ApplicationContextBuilder;
import org.dllearner.configuration.spring.DefaultApplicationContextBuilder;
import org.dllearner.confparser3.ConfParserConfiguration;
import org.dllearner.core.ClassExpressionLearningAlgorithm;
-import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
import org.dllearner.learningproblems.EvaluatedDescriptionPosNeg;
import org.json.simple.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
public class Rest extends HttpServlet {
private static Logger log = LoggerFactory.getLogger(Rest.class);
@@ -66,8 +58,8 @@
throw new IllegalArgumentException("Missing parameter: conf is required. ");
} else {
conf = httpServletRequest.getParameter("conf");
- if(isSet("limit" , httpServletRequest)){
- limit = Integer.parseInt(httpServletRequest.getParameter("limit")) ;
+ if (isSet("limit", httpServletRequest)) {
+ limit = Integer.parseInt(httpServletRequest.getParameter("limit"));
}
}
@@ -108,17 +100,17 @@
} catch (IllegalArgumentException e) {
String msg = e.getMessage();// + printParameterMap(httpServletRequest);
- log.error(msg);
+ log.error("", ExceptionUtils.getRootCause(e));
learningResult.put("success", "0");
learningResult.put("error", msg);
- learningResult.put("stacktrace", ExceptionUtils.getFullStackTrace(e));
+ learningResult.put("stacktrace", ExceptionUtils.getRootCause(e));
} catch (Exception e) {
String msg = "An error occured: " + e.getMessage(); //+ printParameterMap(httpServletRequest);
- log.error(msg, e);
+ log.error("", ExceptionUtils.getRootCause(e));
learningResult.put("success", "0");
learningResult.put("error", msg);
- learningResult.put("stacktrace", ExceptionUtils.getFullStackTrace(e));
+ learningResult.put("stacktrace", ExceptionUtils.getRootCause(e));
}
result.put("learningresult", learningResult);
@@ -136,26 +128,20 @@
* @param conf the content of a conf file
* @return
*/
- public EvaluatedDescriptionPosNeg learn(String conf) {
- try {
- Resource confFile = new InputStreamResource(new ByteArrayInputStream(conf.getBytes()));
-
- IConfiguration configuration = new ConfParserConfiguration(confFile);
+ public EvaluatedDescriptionPosNeg learn(String conf) throws Exception {
+ Resource confFile = new InputStreamResource(new ByteArrayInputStream(conf.getBytes()));
- ApplicationContextBuilder builder = new DefaultApplicationContextBuilder();
- ApplicationContext context = builder.buildApplicationContext(configuration, new ArrayList<Resource>());
-
- LearningAlgorithm algorithm = context.getBean(LearningAlgorithm.class);
- algorithm.start();
- if(algorithm instanceof ClassExpressionLearningAlgorithm){
- return (EvaluatedDescriptionPosNeg)((ClassExpressionLearningAlgorithm) algorithm).getCurrentlyBestEvaluatedDescriptions(1).iterator().next();
- }
- } catch (BeansException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
+ IConfiguration configuration = new ConfParserConfiguration(confFile);
+
+ ApplicationContextBuilder builder = new DefaultApplicationContextBuilder();
+ ApplicationContext context = builder.buildApplicationContext(configuration, new ArrayList<Resource>());
+
+ LearningAlgorithm algorithm = context.getBean(LearningAlgorithm.class);
+ algorithm.start();
+ if (algorithm instanceof ClassExpressionLearningAlgorithm) {
+ return (EvaluatedDescriptionPosNeg) ((ClassExpressionLearningAlgorithm) algorithm).getCurrentlyBestEvaluatedDescriptions(1).iterator().next();
+ }
+ throw new Exception("only ClassExpressionLearningAlgorithm implemented currently");
}
@@ -174,26 +160,29 @@
}
return ret;
}
-
- public static void main(String[] args) throws Exception{
- String filePath = "../examples/father.conf";
- byte[] buffer = new byte[(int) new File(filePath).length()];
+
+ public static void main(String[] args) throws Exception {
+ String filePath = "../examples/father.conf";
+ byte[] buffer = new byte[(int) new File(filePath).length()];
BufferedInputStream f = null;
try {
f = new BufferedInputStream(new FileInputStream(filePath));
f.read(buffer);
} finally {
- if (f != null) try { f.close(); } catch (IOException ignored) { }
+ if (f != null) try {
+ f.close();
+ } catch (IOException ignored) {
+ }
}
String confString = new String(buffer);
-
+
Resource confFile = new InputStreamResource(new ByteArrayInputStream(confString.getBytes()));
-
+
IConfiguration configuration = new ConfParserConfiguration(confFile);
ApplicationContextBuilder builder = new DefaultApplicationContextBuilder();
- ApplicationContext context = builder.buildApplicationContext(configuration, new ArrayList<Resource>());
-
+ ApplicationContext context = builder.buildApplicationContext(configuration, new ArrayList<Resource>());
+
LearningAlgorithm algorithm = context.getBean(LearningAlgorithm.class);
algorithm.start();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
