Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1274] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-09-26 18:35:09
|
Revision: 1274
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1274&view=rev
Author: kurzum
Date: 2008-09-26 18:35:02 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java 2008-09-26 17:25:48 UTC (rev 1273)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java 2008-09-26 18:35:02 UTC (rev 1274)
@@ -57,9 +57,9 @@
public Node extractOneURI(String uri) {
- logger.info("Start extracting: "+uri);
+ //logger.info("Start extracting: "+uri);
Node n = extractionAlgorithm.expandNode(uri, configuration.getTupelAquisitor());
- logger.info("Finished extracting: "+uri );
+ //logger.info("Finished extracting: "+uri );
seedNodes.add(n);
return n;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-26 17:25:48 UTC (rev 1273)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-26 18:35:02 UTC (rev 1274)
@@ -27,6 +27,8 @@
import java.util.LinkedList;
import java.util.List;
import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
import org.apache.log4j.Logger;
import org.dllearner.core.KnowledgeSource;
@@ -61,6 +63,7 @@
import org.dllearner.utilities.statistics.SimpleClock;
import org.semanticweb.owl.model.OWLOntology;
+import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
/**
@@ -72,13 +75,16 @@
*/
public class SparqlKnowledgeSource extends KnowledgeSource {
+ //RBC
+ private static final boolean debug = true;
- private static final boolean debug = false;
+ private static final boolean threaded = debug && true ;
+
// tupleaquisitor
//private static final boolean debugUseImprovedTupleAquisitor = debug && false; // switches
// sysex
- private static final boolean debugExitAfterExtraction = debug && false; // switches
+ private static final boolean debugExitAfterExtraction = debug && true; // switches
private SparqlKnowledgeSourceConfigurator configurator;
@@ -227,7 +233,7 @@
public void init() {
logger.info("SparqlModul: Collecting Ontology");
SimpleClock totalTime = new SimpleClock();
- SimpleClock extractionTime = new SimpleClock();
+ //SimpleClock extractionTime = new SimpleClock();
logger.trace(getURL());
logger.trace(getSparqlEndpoint());
@@ -253,14 +259,23 @@
try {
// the actual extraction is started here
-
- extractionTime.setTime();
- List<Node> seedNodes = m.extract(configurator.getInstances());
+ Monitor extractionTime = JamonMonitorLogger.getTimeMonitor(SparqlKnowledgeSource.class, "total extraction time").start();
+ List<Node> seedNodes=new ArrayList<Node>();
+ if(!threaded){
+ seedNodes = m.extract(configurator.getInstances());
+ }else{
+ for (String uri : configurator.getInstances()) {
+ FutureTask<Node> f = new FutureTask<Node>(new ExtractOneInstance(m,uri));
+ seedNodes.add(f.get());
+ }
+ }
+ extractionTime.stop();
+
fragment = m.getOWLAPIOntologyForNodes(seedNodes, configurator.getSaveExtractedFragment());
- extractionTime.printAndSet("extraction needed");
- logger.info("Finished collecting Fragment");
+ logger.info("Finished collecting fragment. needed "+extractionTime.getLastValue()+" ms");
+
ontologyFragmentURL = m.getPhysicalOntologyURL();
nrOfExtractedAxioms = configuration.getOwlAPIOntologyCollector().getNrOfExtractedAxioms();
@@ -280,6 +295,31 @@
System.exit(0);
}
}
+
+ public List<Node> extractParallel(){
+ return null;
+ }
+
+ private class ExtractOneInstance extends Thread implements Callable{
+ Manager m;
+ Node n;
+ String uri;
+
+ private ExtractOneInstance(Manager m, String uri){
+ super();
+ this.m = m;
+ this.uri = uri;
+ }
+
+ @Override
+ public void run(){
+ n = m.extractOneURI(uri);
+ }
+
+ public Node call(){
+ return n;
+ }
+ }
/*
* (non-Javadoc)
Modified: trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java 2008-09-26 17:25:48 UTC (rev 1273)
+++ trunk/src/dl-learner/org/dllearner/scripts/SemanticBibleComparison.java 2008-09-26 18:35:02 UTC (rev 1274)
@@ -73,6 +73,9 @@
public class SemanticBibleComparison {
+ private static boolean onJensMachine = false;
+ private static int nrOfFilesInExperiment = (onJensMachine)?1:1;
+
private static ReasoningService reasoningService;
private static Logger logger = Logger.getRootLogger();
@@ -143,13 +146,22 @@
List<String> l = getFiles();
analyzeFiles(l);
+ if(onJensMachine){
+ conductExperiment(Experiments.NORMAL_10s);
+ conductExperiment(Experiments.NORMAL_100s);
+ conductExperiment(Experiments.NORMAL_1000_CONCEPT_TESTS);
+ conductExperiment(Experiments.NORMAL_10000_CONCEPT_TESTS);
+
+
+
+ }
+
for (Experiments exp : Experiments.values()) {
//if(exp.equals(Experiments.SPARQL_10000_CONCEPT_TESTS))continue;
//if(exp.equals(Experiments.NORMAL_10000_CONCEPT_TESTS))continue;
//if(exp.equals(Experiments.SPARQL_100s))continue;
- //if(exp.equals(Experiments.NORMAL_100s))continue;
+ //if(exp.toString().contains("SPARQL"))continue;
conductExperiment(exp);
- reinitStat();
//System.exit(0);
}
//conductExperiment(0);
@@ -175,12 +187,12 @@
List<String> confs = getFiles();
ComponentManager cm =ComponentManager.getInstance();
- int count = 1;
+ int count = 0;
for (String filename : confs) {
SimpleClock oneExperiment = new SimpleClock();
- if (count == 2){break;}
+ if (count == nrOfFilesInExperiment){break;}
- logger.warn("****"+exp+" "+count +" from file "+filename);
+ logger.warn("****"+exp+" "+(count+1) +" from file "+filename);
// read the file and get the examples
File f = new File(exampleDir+filename);
@@ -246,17 +258,17 @@
cm.freeAllComponents();
- fillTable(exp, count);
+ fillTable(exp, (count+1));
- logger.warn(exp+" "+count+ " " +oneExperiment.getAndSet("")+"****" );
+ logger.warn(exp+" "+(count+1)+ " " +oneExperiment.getAndSet("")+"****" );
count++;
}//end for
}catch (Exception e) {
e.printStackTrace();
flawInExperiment = true;
}
-
- }
+ reinitStat();
+ }//endconduct
public static void analyzeFiles(List<String> l){
int countDoublettes = 0;
Modified: trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java 2008-09-26 17:25:48 UTC (rev 1273)
+++ trunk/src/dl-learner/org/dllearner/utilities/statistics/Table.java 2008-09-26 18:35:02 UTC (rev 1274)
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.Serializable;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
@@ -177,17 +178,18 @@
}
public static void serializeColumns(Table t, String dir, String tableFile){
- String column = "column";
+ String column = ".column";
String content = "";
dir = StringFormatter.checkIfDirEndsOnSlashAndRemove(dir);
Files.mkdir(dir);
try{
int i=0;
for(TableColumn c:t.getColumns()){
- String filename = dir+File.separator+t.getTableName()+column+(i++);
- c.serialize(new File(filename));
+ String header = URLEncoder.encode(c.getHeader(),"UTF-8");
+ String columnFileName = dir+File.separator+t.getTableName()+header+(i++)+column;
+ c.serialize(new File(columnFileName));
//Files.writeObjectToFile(c, new File(filename));
- content += filename+System.getProperty("line.separator");
+ content += columnFileName+System.getProperty("line.separator");
}
Files.createFile(new File(tableFile), content);
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
