Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [455] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-01-29 14:36:56
|
Revision: 455
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=455&view=rev
Author: jenslehmann
Date: 2008-01-29 06:36:53 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
- added comment
- fixed warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
trunk/src/dl-learner/org/dllearner/kb/sparql/query/SparqlQuery.java
trunk/src/dl-learner/org/dllearner/kb/sparql/test/TestHTTP.java
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-01-29 14:25:52 UTC (rev 454)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-01-29 14:36:53 UTC (rev 455)
@@ -81,12 +81,14 @@
}
}
+ @Override
protected void showLabel() {
nameLabel = new JLabel(configOption.getName());
nameLabel.setToolTipText(configOption.getDescription());
widgetPanel.add(nameLabel);
}
+ @Override
protected void showThingToChange() {
if (component != null) {
// IntegerConfigOption
@@ -123,6 +125,7 @@
}
}
+ @Override
protected void setEntry() {
BooleanConfigOption specialOption;
if (cb.getSelectedIndex() == 0)
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java 2008-01-29 14:25:52 UTC (rev 454)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java 2008-01-29 14:36:53 UTC (rev 455)
@@ -54,12 +54,14 @@
add(widgetPanel, BorderLayout.CENTER);
}
+ @Override
protected void showLabel() {
nameLabel = new JLabel(configOption.getName());
nameLabel.setToolTipText(configOption.getDescription());
widgetPanel.add(nameLabel);
}
+ @Override
protected void showThingToChange() {
JLabel notImplementedLabel = new JLabel(configOption.getClass()
.getSimpleName()
@@ -69,6 +71,7 @@
widgetPanel.add(notImplementedLabel);
}
+ @Override
protected void setEntry() {
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-01-29 14:25:52 UTC (rev 454)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-01-29 14:36:53 UTC (rev 455)
@@ -81,12 +81,14 @@
}
}
+ @Override
protected void showLabel() {
nameLabel = new JLabel(configOption.getName());
nameLabel.setToolTipText(configOption.getDescription());
widgetPanel.add(nameLabel);
}
+ @Override
protected void showThingToChange() {
if (component != null) {
// IntegerConfigOption
@@ -118,6 +120,7 @@
}
}
+ @Override
protected void setEntry() {
IntegerConfigOption specialOption;
value = Integer.parseInt(integerField.getText()); // get from input
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/query/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/query/SparqlQuery.java 2008-01-29 14:25:52 UTC (rev 454)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/query/SparqlQuery.java 2008-01-29 14:36:53 UTC (rev 455)
@@ -21,12 +21,13 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.net.URL;
import java.nio.charset.Charset;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
+import org.apache.log4j.Logger;
+import org.dllearner.kb.sparql.SparqlKnowledgeSource;
import org.dllearner.kb.sparql.configuration.SparqlEndpoint;
import org.dllearner.utilities.StringTuple;
@@ -45,7 +46,9 @@
*/
public class SparqlQuery {
- private boolean print_flag = false;
+ private static Logger logger = Logger
+ .getLogger(SparqlKnowledgeSource.class);
+
protected boolean isRunning = false;
protected String queryString;
protected QueryEngineHTTP queryExecution;
@@ -53,19 +56,9 @@
protected ResultSet rs=null;
/**
- * simplest contructor, works only with some endpoints,
- * not with DBpedia
+ * Standard constructor.
+ *
* @param queryString
- * @param url
- */
- public SparqlQuery(String queryString, URL url) {
- this.queryString = queryString;
- this.endpoint = new SparqlEndpoint(url);
- }
-
- /**
- * standard constructor
- * @param queryString
* @param endpoint
*/
public SparqlQuery(String queryString, SparqlEndpoint endpoint) {
@@ -82,10 +75,10 @@
* @return jena ResultSet
*/
public void send() {
- p(queryString);
+ logger.info(queryString);
String service = endpoint.getURL().toString();
- p(endpoint.getURL().toString());
+ logger.info(endpoint.getURL().toString());
// Jena access to SPARQL endpoint
queryExecution=new QueryEngineHTTP(service,queryString);
for (String dgu : endpoint.getDefaultGraphURIs()){
@@ -94,12 +87,11 @@
for (String ngu : endpoint.getNamedGraphURIs()){
queryExecution.addNamedGraph(ngu);
}
- p("query SPARQL server");
+ logger.info("query SPARQL server");
rs = queryExecution.execSelect();
- p(rs.getResultVars().toString());
- //p(ResultSetFormatter.asXMLString(rs));
+ logger.info(rs.getResultVars().toString());
}
public void stop() {
@@ -161,26 +153,7 @@
return ResultSetFormatter.toList(rs);
}
-
/**
- * sends a query and returns the results for variable
- * TODO untested and not used, feel free to change
- * varName as Vector<String>
- * @param varName
- * @return Vector<String>
- */
- @SuppressWarnings({"unchecked"})
- @Deprecated
- public Vector<String> getAsVector(String varName) {
- Vector<String> vret = new Vector<String>();
- List<ResultBinding> l = ResultSetFormatter.toList(rs);
- for (ResultBinding resultBinding : l) {
- vret.add(resultBinding.get(varName).toString());
- }
- return vret;
- }
-
- /**
* sends a query and returns the results for two variables
* ex: getAsVectorOfTupels("predicate", "object")
* TODO untested and not used, feel free to change
@@ -205,32 +178,7 @@
return vret;
}
-
/**
- * sends a query and returns the results for n variables
- * TODO not working, finish
- * @param varNames
- * @return Vector<Vector<String>>
- */
- @Deprecated
- public Vector<Vector<String>> getAsVectorOfVectors(Vector<String> varNames) {
- // ResultSet rs = send();
- Vector<Vector<String>> vret = new Vector<Vector<String>>();
- /*
- * Does not work yet List<ResultBinding> l =
- * ResultSetFormatter.toList(rs); for (ResultBinding resultBinding : l) {
- * vret.add(new StringTuple(resultBinding.get(varName1).toString(),
- * resultBinding.get(varName2).toString())); }
- */
- return vret;
- }
-
- // probably not needed
- /*
- * public Model asJenaModel(){ ResultSet rs=send(); return
- * ResultSetFormatter.toModel(rs); }
- */
- /**
* sends a query and returns JSON
* @return a String representation of the Resultset as JSON
*/
@@ -238,11 +186,12 @@
if (rs==null) this.send();
ByteArrayOutputStream baos=new ByteArrayOutputStream();
ResultSetFormatter.outputAsJSON(baos, rs);
+ // possible Jena bug: Jena modifies the result set during
+ // JSON transformation, so we need to get it back
rs=JSONtoResultSet(baos.toString());
return baos.toString();
}
-
/**
* @param json a string representation string object
* @return jena ResultSet
@@ -261,10 +210,4 @@
return queryString;
}
- public void p(String str) {
- if (print_flag) {
- System.out.println(str);
- }
- }
-
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/test/TestHTTP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/test/TestHTTP.java 2008-01-29 14:25:52 UTC (rev 454)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/test/TestHTTP.java 2008-01-29 14:36:53 UTC (rev 455)
@@ -7,7 +7,6 @@
import java.net.Socket;
import java.net.URLEncoder;
-import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
public class TestHTTP {
@@ -23,7 +22,7 @@
if (i!=0) time+=TestHTTP.httpQuery(query);
}
time=time/100;
- System.out.println("Durchschnittliche Zeit f\xFCr eine Anfrage per Http-Methode: "+time);
+ System.out.println("Durchschnittliche Zeit f�r eine Anfrage per Http-Methode: "+time);
time=0;
for (int i=0; i<101; i++)
@@ -31,7 +30,7 @@
if (i!=0) time+=TestHTTP.jenaQuery(query);
}
time=time/100;
- System.out.println("Durchschnittliche Zeit f\xFCr eine Anfrage per Jena-Methode: "+time);
+ System.out.println("Durchschnittliche Zeit f�r eine Anfrage per Jena-Methode: "+time);
}
private static double jenaQuery(String query)
@@ -40,7 +39,8 @@
QueryEngineHTTP queryExecution=new QueryEngineHTTP("http://localhost:8890/sparql",query);
queryExecution.addDefaultGraph("http://dbpedia.org");
// Jena access to DBpedia SPARQL endpoint
- ResultSet rs = queryExecution.execSelect();
+ // ResultSet rs =
+ queryExecution.execSelect();
double end=System.currentTimeMillis();
return ((end-start)/1000);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
