Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1127] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-08-22 13:15:58
|
Revision: 1127
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1127&view=rev
Author: kurzum
Date: 2008-08-22 13:15:50 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
trunk/src/dl-learner/org/dllearner/cli/QuickStart.java
trunk/src/dl-learner/org/dllearner/cli/Start.java
trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java
trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java
trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/utilities/URLencodeUTF8.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -52,6 +52,8 @@
import org.dllearner.utilities.owl.ConceptTransformation;
import org.dllearner.utilities.owl.EvaluatedDescriptionComparator;
+import com.jamonapi.Monitor;
+
/**
* Implements the example based refinement operator learning approach.
*
@@ -278,7 +280,7 @@
public void start() {
isRunning = true;
runtime = System.currentTimeMillis();
- JamonMonitorLogger.getTimeMonitor(ExampleBasedROLComponent.class, "totalLearningTime")
+ Monitor totalLearningTime = JamonMonitorLogger.getTimeMonitor(ExampleBasedROLComponent.class, "totalLearningTime")
.start();
// TODO: write a JUnit test for this problem (long-lasting or infinite
// loops because
@@ -397,7 +399,9 @@
// we record when a more accurate node is found and log it
if (bestNodeStable.getCovPosMinusCovNeg() < candidatesStable.last()
.getCovPosMinusCovNeg()) {
- logger.info("more accurate node found: " + candidatesStable.last());
+ String acc = (candidatesStable.last().getAccuracy(nrOfPositiveExamples, nrOfNegativeExamples)+"").substring(2,6);
+ acc= acc.substring(0,2)+"."+acc.substring(3)+"%";
+ logger.info("more accurate ("+acc+") node found: " + candidatesStable.last());
bestNodeStable = candidatesStable.last();
}
@@ -507,8 +511,7 @@
else
logger.info("Algorithm terminated succesfully.");
- JamonMonitorLogger.getTimeMonitor(ExampleBasedROLComponent.class, "totalLearningTime")
- .stop();
+ totalLearningTime.stop();
isRunning = false;
}
Modified: trunk/src/dl-learner/org/dllearner/cli/QuickStart.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/QuickStart.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/cli/QuickStart.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -43,6 +43,8 @@
static String pm = ".";// pathmodifier
public static void main(String[] args) {
+
+
String lastused = readit();
String tab = " ";
Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -115,6 +115,8 @@
* @param args
*/
public static void main(String[] args) throws ComponentInitException {
+
+
File file = new File(args[args.length - 1]);
boolean inQueryMode = false;
Modified: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -57,7 +57,7 @@
@Override
public SortedSet<RDFNodeTuple> retrieveTupel(String uri){
-
+
SortedSet<RDFNodeTuple> cachedSet = resources.get(uri);
if(cachedSet!=null) {
return cachedSet;
@@ -134,6 +134,15 @@
}
+
+
+ @Override
+ public SortedSet<RDFNodeTuple> retrieveClassesForInstances(String uri){
+ // getQuery
+ return super.retrieveClassesForInstances(uri);
+
+ }
+
private void addToLocalCache(String uri, RDFNodeTuple tuple){
SortedSet<RDFNodeTuple> set = resources.get(uri);
@@ -148,11 +157,8 @@
}
}
- @Override
- public SortedSet<RDFNodeTuple> retrieveClassesForInstances(String uri){
- // getQuery
- return super.retrieveClassesForInstances(uri);
-
+ public void removeFromCache(String uri){
+ resources.remove(uri);
}
Modified: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -48,6 +48,7 @@
public final SortedSet<RDFNodeTuple> getTupelForResource(String uri){
checkURIforValidity(uri);
+
try{
if (mode == NORMAL) {
return retrieveTupel(uri);
@@ -59,7 +60,7 @@
throw new RuntimeException("undefined mode in aquisitor");
}
}catch(Exception e){
- logger.warn("caught exception in tupleaquisitor, ignoring it"+e.toString());
+ logger.warn("Caught exception in tupleaquisitor, ignoring it: "+e.toString());
return new TreeSet<RDFNodeTuple>();
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -24,12 +24,14 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.dllearner.kb.aquisitors.SparqlTupleAquisitorImproved;
import org.dllearner.kb.aquisitors.TupleAquisitor;
import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.statistics.SimpleClock;
+import com.jamonapi.Monitor;
+
/**
* This class is used to extract the information .
*
@@ -72,8 +74,10 @@
public Node expandNode(String uri, TupleAquisitor tupelAquisitor) {
SimpleClock sc = new SimpleClock();
+ if(tupelAquisitor instanceof SparqlTupleAquisitorImproved){
+ ((SparqlTupleAquisitorImproved)tupelAquisitor).removeFromCache(uri);
+ }
-
Node seedNode = getFirstNode(uri);
List<Node> newNodes = new ArrayList<Node>();
List<Node> collectNodes = new ArrayList<Node>();
@@ -84,7 +88,7 @@
newNodes.add(seedNode);
- JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeBasicExtraction").start();
+ Monitor basic = JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeBasicExtraction").start();
for (int x = 1; x <= configuration.getRecursiondepth(); x++) {
sc.reset();
@@ -106,24 +110,24 @@
logger.info("Recursion counter: " + x + " with " + newNodes.size()
+ " Nodes remaining, " + sc.getAndSet(""));
}
- JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeBasicExtraction").stop();
+ basic.stop();
if(configuration.isCloseAfterRecursion()){
- JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeCloseAfterRecursion").start();
+ Monitor m = JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeCloseAfterRecursion").start();
List<InstanceNode> l = getInstanceNodes(newNodes);
logger.info("Getting classes for remaining instances: "+l.size() + " instances");
tupelAquisitor.setNextTaskToClassesForInstances();
collectNodes.addAll(expandCloseAfterRecursion(l, tupelAquisitor));
- JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeCloseAfterRecursion").stop();
+ m.stop();
}
// gets All Class Nodes and expands them further
if (configuration.isGetAllSuperClasses()) {
- JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeGetAllSuperClasses").start();
+ Monitor m = JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeGetAllSuperClasses").start();
List<ClassNode> allClassNodes = getClassNodes(collectNodes);
tupelAquisitor.setNextTaskToClassInformation();
logger.info("Get all superclasses for "+allClassNodes.size() + " classes");
expandAllSuperClassesOfANode(allClassNodes, tupelAquisitor);
- JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeGetAllSuperClasses").stop();
+ m.stop();
}
return seedNode;
@@ -134,18 +138,21 @@
List<Node> newNodes = new ArrayList<Node>();
tupelAquisitor.setNextTaskToClassesForInstances();
- if (configuration.isCloseAfterRecursion()) {
- while (!instanceNodes.isEmpty()) {
- logger.trace("Getting classes for remaining instances: "
- + instanceNodes.size());
- Node next = instanceNodes.remove(0);
- logger.trace("Getting classes for: " + next);
- newNodes.addAll(next.expand(tupelAquisitor, configuration.getManipulator()));
- if (newNodes.size() >= configuration.getBreakSuperClassesAfter()) {
- break;
- }//endif
- }//endwhile
- }//endif
+ while (!instanceNodes.isEmpty()) {
+ logger.trace("Getting classes for remaining instances: "
+ + instanceNodes.size());
+ Node next = instanceNodes.remove(0);
+ if(next.isExpanded()){
+ JamonMonitorLogger.increaseCount(this.getClass(), "skipped nodes");
+ continue;
+ }
+ logger.trace("Getting classes for: " + next);
+ newNodes.addAll(next.expand(tupelAquisitor, configuration.getManipulator()));
+ if (newNodes.size() >= configuration.getBreakSuperClassesAfter()) {
+ break;
+ }//endif
+ }//endwhile
+
return newNodes;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -95,5 +95,9 @@
public int compareTo(Node n) {
return this.uri.toString().compareTo(n.uri.toString());
}
+
+ public boolean isExpanded(){
+ return expanded;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -32,6 +32,8 @@
import org.dllearner.utilities.datastructures.RDFNodeTuple;
import org.dllearner.utilities.owl.OWLVocabulary;
+import com.jamonapi.Monitor;
+
/**
* Used to manipulate retrieved tupels, identify blanknodes, etc.
*
@@ -58,13 +60,13 @@
* triple
*/
public SortedSet<RDFNodeTuple> manipulate( Node node, SortedSet<RDFNodeTuple> tuples) {
- JamonMonitorLogger.getTimeMonitor(Manipulator.class, "Time for Rules").start();
+ Monitor m = JamonMonitorLogger.getTimeMonitor(Manipulator.class, "Time for Rules").start();
//logger.warn("before: "+tuples.size());
for (Rule rule : rules) {
tuples = rule.applyRule(node, tuples);
}
//logger.warn("after: "+tuples.size());
- JamonMonitorLogger.getTimeMonitor(Manipulator.class, "Time for Rules").stop();
+ m.stop();
return tuples;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -33,6 +33,8 @@
import org.apache.log4j.Logger;
import org.dllearner.utilities.JamonMonitorLogger;
+import com.jamonapi.Monitor;
+
/**
* SPARQL query cache to avoid possibly expensive multiple queries. The queries
* and their results are written to files. A cache has an associated cache
@@ -249,12 +251,12 @@
* @return Jena result set in JSON format
*/
public String executeSparqlQuery(SparqlQuery query) {
- JamonMonitorLogger.getTimeMonitor(Cache.class, "TotalTimeExecuteSparqlQuery").start();
+ Monitor totaltime =JamonMonitorLogger.getTimeMonitor(Cache.class, "TotalTimeExecuteSparqlQuery").start();
JamonMonitorLogger.increaseCount(Cache.class, "TotalQueries");
- JamonMonitorLogger.getTimeMonitor(Cache.class, "ReadTime").start();
+ Monitor readTime = JamonMonitorLogger.getTimeMonitor(Cache.class, "ReadTime").start();
String result = getCacheEntry(query.getSparqlQueryString());
- JamonMonitorLogger.getTimeMonitor(Cache.class, "ReadTime").stop();
+ readTime.stop();
if (result != null) {
query.setJson(result);
@@ -286,7 +288,7 @@
//return json;
}
- JamonMonitorLogger.getTimeMonitor(Cache.class, "TotalTimeExecuteSparqlQuery").stop();
+ totaltime.stop();
return result;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -430,16 +430,17 @@
String jsonString = query(sparqlQueryString);
rsw = SparqlQuery.convertJSONtoResultSet(jsonString);
- } catch (Exception e) {
- logger.warn(e.getMessage());
- }
+
List<ResultBinding> l = ResultSetFormatter.toList(rsw);
for (ResultBinding resultBinding : l) {
returnSet.add(new RDFNodeTuple(resultBinding.get(var1),resultBinding.get(var2)));
}
rsw.reset();
+ } catch (Exception e) {
+ logger.warn("Exception caught in SPARQLTasks, passing emtpy result: "+e.getMessage());
+ }
return returnSet;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -59,9 +59,13 @@
import org.dllearner.reasoning.DIGConverter;
import org.dllearner.reasoning.JenaOWLDIGConverter;
import org.dllearner.scripts.NT2RDF;
+import org.dllearner.utilities.Files;
+import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.datastructures.StringTuple;
import org.dllearner.utilities.statistics.SimpleClock;
+import com.jamonapi.MonitorFactory;
+
/**
* Represents the SPARQL Endpoint Component.
*
@@ -74,7 +78,8 @@
//DEFAULTS
static int recursionDepthDefault = 1;
- static final boolean debug = false;
+ static final boolean debug = false; //switches tupleaquisitor
+ static final boolean debug2 = false; //switches sysex und rdf generation
private boolean useCache=true;
// ConfigOptions
public URL url;
@@ -326,7 +331,7 @@
fw.close();
dumpFile = (new File(basedir + filename)).toURI().toURL();
- if(debug){
+ if(debug2){
NT2RDF.convertNT2RDF(basedir + filename);
//System.exit(0);
}
@@ -346,6 +351,13 @@
e.printStackTrace();
}
logger.info("SparqlModul: ****Finished " + totalTime.getAndSet("") );
+ if(debug2){
+
+ File jamonlog = new File("log/jamon.html");
+ Files.createFile(jamonlog, MonitorFactory.getReport());
+ Files.appendFile(jamonlog, "<xmp>\n"+JamonMonitorLogger.getStringForAllSortedByLabel());
+ System.exit(0);
+ }
}
/*
@@ -445,10 +457,12 @@
public TupleAquisitor getTupleAquisitor()
{
- return (debug)?
- new SparqlTupleAquisitorImproved(getSparqlQueryMaker(), getSPARQLTasks(),recursionDepth)
- :
- new SparqlTupleAquisitor(getSparqlQueryMaker(), getSPARQLTasks());
+ if (debug) {
+ return new SparqlTupleAquisitorImproved(getSparqlQueryMaker(), getSPARQLTasks(),recursionDepth);
+ }
+ else {
+ return new SparqlTupleAquisitor(getSparqlQueryMaker(), getSPARQLTasks());
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -23,7 +23,6 @@
import java.io.ByteArrayOutputStream;
import java.io.FileWriter;
import java.io.UnsupportedEncodingException;
-import java.net.UnknownHostException;
import java.nio.charset.Charset;
import javax.xml.ws.http.HTTPException;
@@ -37,6 +36,7 @@
import com.hp.hpl.jena.query.ResultSetRewindable;
import com.hp.hpl.jena.sparql.engine.http.HttpQuery;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
+import com.jamonapi.Monitor;
/**
* Represents one SPARQL query. It includes support for stopping the SPARQL
@@ -92,8 +92,6 @@
SparqlQuery.writeToSparqlLog("wget -S -O - '\n"+sparqlEndpoint.getHTTPRequest());
writeToSparqlLog(sparqlQueryString);
-
-
logger.trace("making queryExecution Object");
// Jena access to SPARQL endpoint
queryExecution = new QueryEngineHTTP(service, sparqlQueryString);
@@ -108,8 +106,8 @@
}
// TODO remove after overnext Jena release
HttpQuery.urlLimit = 3 * 1024;
- JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime")
- .start();
+ Monitor httpTime = JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").start();
+
//TODO correct Bug: when there is a & in the result like in the
//URL: http://www.discusmedia.com/catalog.php?catID=5.2.2&profile=map
//the XML Parser throws an error, because he thinks &profile is an html entitie
@@ -127,24 +125,24 @@
//writeToSparqlLog("JSON: " + json);
//}catch (ResultSetException e) {
} catch (HTTPException e) {
- logger.warn("Exception in SparqlQuery\n"+ e.toString());
+ logger.warn("HTTPException in SparqlQuery\n"+ e.toString());
logger.warn("query was "+ sparqlQueryString);
writeToSparqlLog("ERROR: HTTPException occured"+ e.toString());
isRunning = false;
throw e;
}catch (RuntimeException e) {
- //if (!(e instanceof HTTPException)) {
- logger.warn("RuntimeException in SparqlQuery"+ e.toString());
- writeToSparqlLog("ERROR: HTTPException occured"+ e.toString());
- //}
+
+ logger.warn("RuntimeException in SparqlQuery (see /log/sparql.txt): "+ e.toString());
+ logger.warn("query was (first 300 chars) "+ sparqlQueryString.substring(0,300).replaceAll("\n", " "));
+ writeToSparqlLog("ERROR: HTTPException occured: "+ e.toString());
isRunning = false;
throw e;
}
// there is a minor issue here: Jamon now also measures ResultsetConversion
// the code would need a second try catch block to handle it correctly
- JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").stop();
+ httpTime.stop();
isRunning = false;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -24,8 +24,6 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.dllearner.utilities.owl.OWLVocabulary;
-
/**
* Can assemble sparql queries. can make queries for subject, predicate, object
* according to the filter settings object SparqlQueryType, which gives the
Modified: trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java 2008-08-22 07:30:58 UTC (rev 1126)
+++ trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -26,6 +26,7 @@
import java.util.TreeSet;
import org.dllearner.algorithms.refexamples.ExampleBasedROLComponent;
+import org.dllearner.kb.extraction.ExtractionAlgorithm;
import org.dllearner.kb.manipulator.Manipulator;
import org.dllearner.kb.sparql.Cache;
import org.dllearner.kb.sparql.SparqlQuery;
@@ -77,7 +78,7 @@
for (int i = 0; i < l.size(); i++) {
Monitor monitor = l.get(i);
- sset.add(convMonitorToString(monitor));
+ sset.add(monitor.toString());
}
for (String onemon : sset) {
sbuf.append(onemon+"\n");
@@ -86,14 +87,17 @@
}
public static String convMonitorToString (Monitor m) {
- String retVal = m.getLabel();
+ String retVal = m.getLabel()+"|\t";
String unit = m.getUnits();
+ retVal+=unit+"|\t";
long content = new Double(m.getTotal()).longValue();
- String contentstr = (unit.equals("ms."))? Helper.prettyPrintNanoSeconds(content ) : content+"" ;
+ content = content / (1000*1000);
+ String contentstr = (unit.equals("ms."))? Helper.prettyPrintNanoSeconds(content ) : m.getHits()+"" ;
retVal+= "total:"+contentstr+"|\t";
long avg = new Double(m.getAvg()).longValue();
- String avgstr = (unit.equals("ms."))? Helper.prettyPrintMilliSeconds(avg ) : avg+"" ;
+ avg = avg / (1000*1000);
+ String avgstr = (unit.equals("ms."))? Helper.prettyPrintNanoSeconds(avg ) : avg+"" ;
retVal+= "avg:"+avgstr+"|\t";
return retVal;
@@ -108,10 +112,10 @@
retval= "Sparql:";
} else if (clazz == Cache.class) {
retval= "Sparql:";
- }else if (clazz == SparqlQuery.class) {
- retval= "sparql:";
+ }else if (clazz == ExtractionAlgorithm.class) {
+ retval= "Extraction:";
} else if (clazz == Manipulator.class) {
- retval= "extraction:";
+ retval= "Extraction:";
} else if (clazz == SparqlQuery.class) {
retval= "sparql:";
} else if (clazz == SparqlQuery.class) {
Added: trunk/src/dl-learner/org/dllearner/utilities/URLencodeUTF8.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/URLencodeUTF8.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/utilities/URLencodeUTF8.java 2008-08-22 13:15:50 UTC (rev 1127)
@@ -0,0 +1,22 @@
+package org.dllearner.utilities;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.apache.log4j.Logger;
+
+public class URLencodeUTF8 {
+
+ public static Logger logger = Logger.getLogger(URLencodeUTF8.class);
+
+ public static String encode(String toEncode) {
+ String retVal = "";
+ try{
+ retVal = URLEncoder.encode(toEncode, "UTF-8");
+ }catch (UnsupportedEncodingException e) {
+ logger.error("This error should never occur, check your java for UTF-8 support");
+ e.printStackTrace();
+ }
+ return retVal;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
