Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [898] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-05-19 10:26:15
|
Revision: 898
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=898&view=rev
Author: kurzum
Date: 2008-05-19 03:26:10 -0700 (Mon, 19 May 2008)
Log Message:
-----------
new utility structure
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java
trunk/src/dl-learner/org/dllearner/cli/ConfFileOption.java
trunk/src/dl-learner/org/dllearner/cli/Start.java
trunk/src/dl-learner/org/dllearner/core/Reasoner.java
trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java
trunk/src/dl-learner/org/dllearner/core/ReasoningService.java
trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java
trunk/src/dl-learner/org/dllearner/examples/KRK.java
trunk/src/dl-learner/org/dllearner/examples/KRKModular.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java
trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
trunk/src/dl-learner/org/dllearner/kb/extraction/Manipulator.java
trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java
trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java
trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java
trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/src/dl-learner/org/dllearner/scripts/CloseOntology.java
trunk/src/dl-learner/org/dllearner/scripts/CrossValidation.java
trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java
trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java
trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java
trunk/src/dl-learner/org/dllearner/utilities/Helper.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/utilities/datastructures/
trunk/src/dl-learner/org/dllearner/utilities/datastructures/Datastructures.java
trunk/src/dl-learner/org/dllearner/utilities/datastructures/SetManipulation.java
trunk/src/dl-learner/org/dllearner/utilities/datastructures/SortedSetTuple.java
trunk/src/dl-learner/org/dllearner/utilities/datastructures/StringTuple.java
trunk/src/dl-learner/org/dllearner/utilities/examples/
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderSKOSSPARQL.java
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderSPARQL.java
trunk/src/dl-learner/org/dllearner/utilities/learn/
trunk/src/dl-learner/org/dllearner/utilities/learn/ConfWriter.java
trunk/src/dl-learner/org/dllearner/utilities/learn/LearnSparql.java
trunk/src/dl-learner/org/dllearner/utilities/owl/
trunk/src/dl-learner/org/dllearner/utilities/owl/OntologyClassRewriter.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OntologyCloser.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OntologyCloserOWLAPI.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/
trunk/src/dl-learner/org/dllearner/utilities/statistics/Logging.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/PaperStatistics.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/SimpleClock.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/Stat.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/Statistics.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/TestValidation.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderRolesSPARQL.java
trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSKOSSPARQL.java
trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSPARQL.java
trunk/src/dl-learner/org/dllearner/utilities/ConfWriter.java
trunk/src/dl-learner/org/dllearner/utilities/Datastructures.java
trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java
trunk/src/dl-learner/org/dllearner/utilities/Logging.java
trunk/src/dl-learner/org/dllearner/utilities/OntologyClassRewriter.java
trunk/src/dl-learner/org/dllearner/utilities/OntologyCloser.java
trunk/src/dl-learner/org/dllearner/utilities/OntologyCloserOWLAPI.java
trunk/src/dl-learner/org/dllearner/utilities/PaperStatistics.java
trunk/src/dl-learner/org/dllearner/utilities/SetManipulation.java
trunk/src/dl-learner/org/dllearner/utilities/SimpleClock.java
trunk/src/dl-learner/org/dllearner/utilities/SortedSetTuple.java
trunk/src/dl-learner/org/dllearner/utilities/Stat.java
trunk/src/dl-learner/org/dllearner/utilities/Statistics.java
trunk/src/dl-learner/org/dllearner/utilities/StringTuple.java
trunk/src/dl-learner/org/dllearner/utilities/TestValidation.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -27,7 +27,7 @@
import org.dllearner.reasoning.FastRetrieval;
import org.dllearner.reasoning.ReasonerType;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
/**
Modified: trunk/src/dl-learner/org/dllearner/cli/ConfFileOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/ConfFileOption.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/cli/ConfFileOption.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Set;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Represents one configuration option in a conf file, e.g.
Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -84,10 +84,10 @@
import org.dllearner.reasoning.FastRetrievalReasoner;
import org.dllearner.reasoning.OWLAPIReasoner;
import org.dllearner.utilities.ConceptComparator;
-import org.dllearner.utilities.Datastructures;
import org.dllearner.utilities.Helper;
import org.dllearner.utilities.RoleComparator;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.Datastructures;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Startup file for Command Line Interface.
Modified: trunk/src/dl-learner/org/dllearner/core/Reasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/Reasoner.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/core/Reasoner.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -35,7 +35,7 @@
import org.dllearner.core.owl.ObjectPropertyHierarchy;
import org.dllearner.core.owl.SubsumptionHierarchy;
import org.dllearner.reasoning.ReasonerType;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
/**
* Reasoner Interface. Lists all available reasoning methods.
Modified: trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -37,7 +37,7 @@
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
import org.dllearner.core.owl.SubsumptionHierarchy;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
/**
* @author Jens Lehmann
Modified: trunk/src/dl-learner/org/dllearner/core/ReasoningService.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ReasoningService.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/core/ReasoningService.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -37,7 +37,7 @@
import org.dllearner.core.owl.ObjectPropertyHierarchy;
import org.dllearner.core.owl.SubsumptionHierarchy;
import org.dllearner.reasoning.ReasonerType;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
/**
* The reasoning service is the interface to the used reasoner. Basically,
Modified: trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -21,7 +21,7 @@
import java.util.List;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* A list if string tuples, for instance for specifying several parameters or
Modified: trunk/src/dl-learner/org/dllearner/examples/KRK.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/KRK.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/examples/KRK.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -31,7 +31,7 @@
import org.dllearner.core.owl.SymmetricObjectPropertyAxiom;
import org.dllearner.core.owl.TransitiveObjectPropertyAxiom;
import org.dllearner.reasoning.OWLAPIReasoner;
-import org.dllearner.utilities.OntologyCloser;
+import org.dllearner.utilities.owl.OntologyCloser;
/*
* Structure
Modified: trunk/src/dl-learner/org/dllearner/examples/KRKModular.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/KRKModular.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/examples/KRKModular.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -35,7 +35,7 @@
import org.dllearner.parser.KBParser;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.reasoning.OWLAPIReasoner;
-import org.dllearner.utilities.SimpleClock;
+import org.dllearner.utilities.statistics.SimpleClock;
/*
* Structure
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -45,7 +45,7 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.StringTupleListConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Panel for option StringTupleList, defined in
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -25,7 +25,7 @@
import java.util.Set;
import java.util.Vector;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Is a node in the graph, that is a class.
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -25,7 +25,7 @@
import java.util.Set;
import java.util.Vector;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* A node in the graph that is an instance.
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -28,7 +28,7 @@
import org.dllearner.core.KnowledgeSource;
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlQueryType;
-import org.dllearner.utilities.Statistics;
+import org.dllearner.utilities.statistics.Statistics;
/**
* An object of this class encapsulates everything.
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Manipulator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Manipulator.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Manipulator.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -27,7 +27,7 @@
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.utilities.JenaResultSetConvenience;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.ResultSetFormatter;
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/PropertyNode.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -25,7 +25,7 @@
import java.util.Set;
import java.util.Vector;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Property node, has connection to a and b part
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -29,8 +29,8 @@
import org.dllearner.kb.sparql.Cache;
import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.kb.sparql.SparqlQueryMaker;
-import org.dllearner.utilities.SimpleClock;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
+import org.dllearner.utilities.statistics.SimpleClock;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.ResultSetFormatter;
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -25,7 +25,7 @@
import java.util.Set;
import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.ResultSetFormatter;
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryInterface.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -22,7 +22,7 @@
import java.net.URI;
import java.util.Set;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
*
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -32,8 +32,8 @@
import org.apache.log4j.Logger;
import org.dllearner.core.KnowledgeSource;
-import org.dllearner.utilities.SimpleClock;
-import org.dllearner.utilities.Statistics;
+import org.dllearner.utilities.statistics.SimpleClock;
+import org.dllearner.utilities.statistics.Statistics;
/**
* SPARQL query cache to avoid possibly expensive multiple queries. The queries
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -49,8 +49,8 @@
import org.dllearner.parser.KBParser;
import org.dllearner.reasoning.DIGConverter;
import org.dllearner.reasoning.JenaOWLDIGConverter;
-import org.dllearner.utilities.SimpleClock;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
+import org.dllearner.utilities.statistics.SimpleClock;
/**
* Represents the SPARQL Endpoint Component.
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -29,7 +29,7 @@
import org.dllearner.core.owl.Union;
import org.dllearner.utilities.ConceptComparator;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
/**
* Caches results of previous concept evaluation to speed up
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -35,7 +35,7 @@
import org.dllearner.core.owl.Negation;
import org.dllearner.reasoning.ReasonerType;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
/**
* @author Jens Lehmann
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -27,7 +27,7 @@
import org.dllearner.core.Score;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Here are just some code snippets, which can be used The basic algorithm is
Modified: trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/ConfParser.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/parser/ConfParser.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -21,6 +21,7 @@
import org.dllearner.cli.*;
import org.dllearner.utilities.*;
+import org.dllearner.utilities.datastructures.StringTuple;
public @SuppressWarnings("all") class ConfParser implements ConfParserConstants {
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -15,7 +15,7 @@
import org.dllearner.core.owl.Negation;
import org.dllearner.core.owl.Thing;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
public class FastRetrieval {
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -21,7 +21,7 @@
import org.dllearner.core.owl.ObjectPropertyHierarchy;
import org.dllearner.core.owl.SubsumptionHierarchy;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.SortedSetTuple;
+import org.dllearner.utilities.datastructures.SortedSetTuple;
public class FastRetrievalReasoner extends ReasonerComponent {
Modified: trunk/src/dl-learner/org/dllearner/scripts/CloseOntology.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/CloseOntology.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/scripts/CloseOntology.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -8,7 +8,7 @@
import org.dllearner.core.KnowledgeSource;
import org.dllearner.kb.OWLFile;
import org.dllearner.reasoning.OWLAPIReasoner;
-import org.dllearner.utilities.OntologyCloserOWLAPI;
+import org.dllearner.utilities.owl.OntologyCloserOWLAPI;
/**
* Script for closing an ontology OWLAPI produces extensive filesizes, when
Modified: trunk/src/dl-learner/org/dllearner/scripts/CrossValidation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/CrossValidation.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/scripts/CrossValidation.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -42,9 +42,9 @@
import org.dllearner.core.owl.Individual;
import org.dllearner.learningproblems.PosNegLP;
import org.dllearner.learningproblems.PosOnlyLP;
-import org.dllearner.utilities.Datastructures;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.Stat;
+import org.dllearner.utilities.datastructures.Datastructures;
+import org.dllearner.utilities.statistics.Stat;
/**
* Performs cross validation for the given problem. Supports
Modified: trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -17,11 +17,11 @@
import org.dllearner.kb.sparql.Cache;
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.utilities.AutomaticExampleFinderSKOSSPARQL;
import org.dllearner.utilities.JenaResultSetConvenience;
-import org.dllearner.utilities.LearnSparql;
-import org.dllearner.utilities.SetManipulation;
-import org.dllearner.utilities.SimpleClock;
+import org.dllearner.utilities.datastructures.SetManipulation;
+import org.dllearner.utilities.examples.AutomaticExampleFinderSKOSSPARQL;
+import org.dllearner.utilities.learn.LearnSparql;
+import org.dllearner.utilities.statistics.SimpleClock;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.ResultSetFormatter;
Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -14,12 +14,12 @@
import org.dllearner.kb.sparql.Cache;
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.utilities.AutomaticExampleFinderSPARQL;
import org.dllearner.utilities.JenaResultSetConvenience;
-import org.dllearner.utilities.LearnSparql;
-import org.dllearner.utilities.SetManipulation;
-import org.dllearner.utilities.SimpleClock;
-import org.dllearner.utilities.Statistics;
+import org.dllearner.utilities.datastructures.SetManipulation;
+import org.dllearner.utilities.examples.AutomaticExampleFinderSPARQL;
+import org.dllearner.utilities.learn.LearnSparql;
+import org.dllearner.utilities.statistics.SimpleClock;
+import org.dllearner.utilities.statistics.Statistics;
import com.hp.hpl.jena.query.ResultSet;
Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -13,14 +13,14 @@
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.utilities.AutomaticExampleFinderRolesSPARQL;
-import org.dllearner.utilities.AutomaticExampleFinderSPARQL;
-import org.dllearner.utilities.ConfWriter;
import org.dllearner.utilities.JenaResultSetConvenience;
-import org.dllearner.utilities.LearnSparql;
-import org.dllearner.utilities.SetManipulation;
-import org.dllearner.utilities.SimpleClock;
-import org.dllearner.utilities.Statistics;
+import org.dllearner.utilities.datastructures.SetManipulation;
+import org.dllearner.utilities.examples.AutomaticExampleFinderRolesSPARQL;
+import org.dllearner.utilities.examples.AutomaticExampleFinderSPARQL;
+import org.dllearner.utilities.learn.ConfWriter;
+import org.dllearner.utilities.learn.LearnSparql;
+import org.dllearner.utilities.statistics.SimpleClock;
+import org.dllearner.utilities.statistics.Statistics;
import com.hp.hpl.jena.query.ResultSet;
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -67,8 +67,8 @@
import org.dllearner.parser.ParseException;
import org.dllearner.reasoning.DIGReasoner;
import org.dllearner.reasoning.OWLAPIReasoner;
-import org.dllearner.utilities.Datastructures;
import org.dllearner.utilities.Helper;
+import org.dllearner.utilities.datastructures.Datastructures;
import com.hp.hpl.jena.query.ResultSet;
Modified: trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -13,7 +13,7 @@
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.utilities.JenaResultSetConvenience;
-import org.dllearner.utilities.SimpleClock;
+import org.dllearner.utilities.statistics.SimpleClock;
import com.hp.hpl.jena.query.ResultSet;
Modified: trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -28,7 +28,7 @@
import org.dllearner.kb.extraction.Manipulator;
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlQueryType;
-import org.dllearner.utilities.StringTuple;
+import org.dllearner.utilities.datastructures.StringTuple;
/**
* Test class, uses the whole thing
Deleted: trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderRolesSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderRolesSPARQL.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderRolesSPARQL.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -1,123 +0,0 @@
-package org.dllearner.utilities;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.log4j.Logger;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.kb.sparql.Cache;
-import org.dllearner.kb.sparql.SparqlEndpoint;
-import org.dllearner.kb.sparql.SparqlQuery;
-
-import com.hp.hpl.jena.query.ResultSet;
-
-public class AutomaticExampleFinderRolesSPARQL {
-
- private static Logger logger = Logger
- .getLogger(ComponentManager.class);
-
- private Cache c;
- private SparqlEndpoint se;
- private SortedSet<String> posExamples;
- private SortedSet<String> negExamples;
- private int roleLimit=1000;
-
-
- public AutomaticExampleFinderRolesSPARQL(SparqlEndpoint se){
- this.c=new Cache("cachetemp");
- this.se=se;
- posExamples = new TreeSet<String>();
- negExamples = new TreeSet<String>();
- }
-
- public void initDomainRange(String role, int poslimit, int neglimit) {
- makePositiveExamplesAsDomain( role);
- SortedSet<String> keepForClean = new TreeSet<String>();
- keepForClean.addAll(this.posExamples);
- this.posExamples = SetManipulation.fuzzyShrink(this.posExamples, poslimit);
- logger.trace("shrinking: pos Example size: "+posExamples.size());
-
- makeNegativeExamplesAsRange( role);
-
-
- //clean
- negExamples.removeAll(keepForClean);
- logger.trace("neg Example size after cleaning: "+negExamples.size());
- this.negExamples = SetManipulation.fuzzyShrink(negExamples, neglimit);
- logger.debug("pos Example size after shrinking: "+posExamples.size());
- logger.debug("neg Example size after shrinking: "+negExamples.size());
- logger.debug("Finished examples for role: "+role);
- }
-
-
-
-
- private void makePositiveExamplesAsDomain(String role){
- logger.debug("making Positive Examples from Role as Domain: "+role);
- this.posExamples.addAll(getDomain( role, roleLimit));
- logger.debug(" pos Example size: "+posExamples.size());
- }
-
- private void makeNegativeExamplesAsRange(String role){
- logger.debug("making Negative Examples from Role as Range: "+role);
- this.negExamples.addAll(getRange( role, roleLimit));
- logger.debug(" neg Example size: "+negExamples.size());
- }
-
- private SortedSet<String> getDomain(String role,int limit){
-
- String query = "" +
- "SELECT DISTINCT ?domain " +
- "WHERE { \n" +
- "?domain <" + role + "> " + " ?o. \n" +
- "?domain a []\n." +
- "FILTER (!isLiteral(?domain))." +
- "}\n" +
- "LIMIT "+limit;
-
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
- return rsc.getStringListForVariable("domain");
-
- }
-
- private SortedSet<String> getRange(String role,int limit){
-
- String query = "" +
- "SELECT DISTINCT ?range " +
- "WHERE { \n" +
- "?s <" + role + "> " + " ?range. \n" +
- "?range a [].\n" +
- "FILTER (!isLiteral(?range))." +
- "}\n" +
- "LIMIT "+limit;
-
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
- return rsc.getStringListForVariable("range");
-
- }
-
-
-
-
-
-
- public SortedSet<String> getPosExamples() {
- return posExamples;
- }
-
- public SortedSet<String> getNegExamples() {
- return negExamples;
- }
-
-
-
-
-
-
-}
Deleted: trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSKOSSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSKOSSPARQL.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSKOSSPARQL.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -1,412 +0,0 @@
-package org.dllearner.utilities;
-
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.log4j.Logger;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.kb.sparql.Cache;
-import org.dllearner.kb.sparql.SparqlEndpoint;
-import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
-import org.dllearner.kb.sparql.SparqlQueryThreaded;
-
-import com.hp.hpl.jena.query.ResultSet;
-
-public class AutomaticExampleFinderSKOSSPARQL {
-
- private static Logger logger = Logger
- .getLogger(ComponentManager.class);
-
- private Cache c;
- private SparqlEndpoint se;
- private SortedSet<String> posExamples= new TreeSet<String>();;
- private SortedSet<String> negExamples= new TreeSet<String>();;
- public SortedSet<String> totalSKOSset= new TreeSet<String>();;
- public SortedSet<String> rest= new TreeSet<String>();;
- private int limit=2000;
-
-
- public AutomaticExampleFinderSKOSSPARQL(SparqlEndpoint se){
- this.c=new Cache("cacheExamplesValidation");
- this.se=se;
- posExamples = new TreeSet<String>();
- negExamples = new TreeSet<String>();
- }
-
- public void initDBpediaSKOS(String concept, double percent, boolean useRelated,boolean useParallelClasses) {
- dbpediaMakePositiveExamplesFromConcept( concept);
- SortedSet<String> keepForClean = new TreeSet<String>();
- keepForClean.addAll(this.posExamples);
- totalSKOSset.addAll(this.posExamples);
- rest.addAll(totalSKOSset);
- int poslimit=(int)Math.round(percent*totalSKOSset.size());
- int neglimit=(int)Math.round(poslimit);
- /*while (this.posExamples.size()>poslimit) {
- this.posExamples.remove(posExamples.last());
- }*/
- this.posExamples = SetManipulation.fuzzyShrink(this.posExamples, poslimit);
-
- rest.removeAll(this.posExamples);
-
- logger.debug("pos Example size: "+posExamples.size());
- logger.debug("totalSKOSset: "+totalSKOSset.size());
- logger.debug("rest: "+rest.size());
-
- if(useRelated) {
- dbpediaMakeNegativeExamplesFromRelatedInstances(this.posExamples);
- }
-
- if(useParallelClasses) {
- int limit = this.posExamples.size();
- makeNegativeExamplesFromClassesOfInstances(limit);
- }
- //clean
- negExamples.removeAll(keepForClean);
- logger.debug("neg Example size after cleaning: "+negExamples.size());
- this.negExamples = SetManipulation.fuzzyShrink(negExamples, neglimit);
- logger.debug("pos Example size after shrinking: "+posExamples.size());
- logger.debug("neg Example size after shrinking: "+negExamples.size());
- logger.debug("Finished examples for concept: "+concept);
- }
-
-/* public void init(String concept, String namespace, boolean useRelated, boolean useSuperclasses,boolean useParallelClasses, int poslimit, int neglimit) {
- makePositiveExamplesFromConcept( concept);
- SortedSet<String> keepForClean = new TreeSet<String>();
- keepForClean.addAll(this.posExamples);
- this.posExamples = SetManipulation.fuzzyShrink(this.posExamples, poslimit);
- logger.trace("shrinking: pos Example size: "+posExamples.size());
-
- if(useRelated) {
- makeNegativeExamplesFromRelatedInstances(this.posExamples,namespace);
- }
- if(useSuperclasses) {
- makeNegativeExamplesFromSuperClasses(concept);
- }
- if(useParallelClasses) {
- makeNegativeExamplesFromClassesOfInstances();
- }
- //clean
- negExamples.removeAll(keepForClean);
- logger.debug("neg Example size after cleaning: "+negExamples.size());
- this.negExamples = SetManipulation.fuzzyShrink(negExamples, neglimit);
- logger.debug("pos Example size after shrinking: "+posExamples.size());
- logger.debug("neg Example size after shrinking: "+negExamples.size());
- logger.debug("Finished examples for concept: "+concept);
- }*/
-
-
-
- public SortedSet<String> dbpediaGetPosOnly(String concept, int limit){
- dbpediaMakePositiveExamplesFromConcept( concept);
- return SetManipulation.fuzzyShrink(this.posExamples, limit);
- }
-
- public SortedSet<String> getPosOnly(String concept, int limit){
- makePositiveExamplesFromConcept( concept);
- return SetManipulation.fuzzyShrink(this.posExamples, limit);
- }
-
- private void dbpediaMakePositiveExamplesFromConcept(String concept){
- logger.debug("making Positive Examples from Concept: "+concept);
- if(concept.contains("http://dbpedia.org/resource/Category:")) {
- this.posExamples = new JenaResultSetConvenience(dbpediaQuerySKOSConcept(concept,limit))
- .getStringListForVariable("subject");
- }else {
- this.posExamples = new JenaResultSetConvenience(queryConcept(concept,limit))
- .getStringListForVariable("subject");
- }
- logger.debug("pos Example size: "+posExamples.size());
- }
-
- private void makePositiveExamplesFromConcept(String concept){
- logger.debug("making Positive Examples from Concept: "+concept);
- this.posExamples = new JenaResultSetConvenience(queryConcept(concept,0))
- .getStringListForVariable("subject");
- logger.debug(" pos Example size: "+posExamples.size());
- }
-
-
-
- /*private void makePositiveExamplesFromConcept(String concept){
- logger.debug("making Positive Examples from Concept: "+concept);
- if(concept.contains("http://dbpedia.org/resource/Category:")) {
- this.posExamples = new JenaResultSetConvenience(querySKOSConcept(concept,0))
- .getStringListForVariable("subject");
- }else {
- this.posExamples = new JenaResultSetConvenience(queryConcept(concept,0))
- .getStringListForVariable("subject");
- }
- logger.debug(" pos Example size: "+posExamples.size());
- }*/
-
-
-
-
-
- private void dbpediaMakeNegativeExamplesFromRelatedInstances(SortedSet<String> subject) {
- logger.debug("making examples from related instances");
- for (String string : subject) {
- dbpediaMakeNegativeExamplesFromRelatedInstances(string);
- }
- logger.debug(" negExample size: "+negExamples.size());
- }
-
- private void makeNegativeExamplesFromRelatedInstances(SortedSet<String> subject, String namespace) {
- logger.debug("making examples from related instances");
- for (String string : subject) {
- makeNegativeExamplesFromRelatedInstances(string,namespace);
- }
- logger.debug(" negExample size: "+negExamples.size());
- }
-
-
- /**
- *
- * @param subject
- * @return
- */
- private void dbpediaMakeNegativeExamplesFromRelatedInstances(String subject) {
- // SortedSet<String> result = new TreeSet<String>();
-
- String query = "SELECT * WHERE { \n" + "<" + subject + "> " + "?p ?o. \n"
- + "FILTER (REGEX(str(?o), 'http://dbpedia.org/resource/')).\n"
- + "FILTER (!REGEX(str(?p), 'http://www.w3.org/2004/02/skos'))\n"
- + "}";
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
- this.negExamples.addAll(rsc.getStringListForVariable("o"));
-
-
- }
-
- private void makeNegativeExamplesFromRelatedInstances(String subject, String namespace) {
- // SortedSet<String> result = new TreeSet<String>();
-
- String query = "SELECT * WHERE { \n" + "<" + subject + "> " + "?p ?o. \n"
- + "FILTER (REGEX(str(?o), '"+namespace+"')).\n"
- + "}";
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
- this.negExamples.addAll(rsc.getStringListForVariable("o"));
-
-
- }
-
-
- private void makeNegativeExamplesFromSuperClasses(String concept) {
-
- SortedSet<String> superClasses = new TreeSet<String>();
- superClasses.add(concept.replace("\"", ""));
- //logger.debug("before"+superClasses);
- superClasses = getSuperClasses( superClasses, 4);
- logger.debug("making neg Examples from "+superClasses.size()+" superclasses");
- JenaResultSetConvenience rsc;
- for (String oneSuperClass : superClasses) {
- logger.debug(oneSuperClass);
- rsc = new JenaResultSetConvenience(queryConcept("\""+oneSuperClass+"\"", limit));
- this.negExamples.addAll(rsc.getStringListForVariable("subject"));
- }
- logger.debug(" neg Example size: "+negExamples.size());
- }
-
-
-
- private void makeNegativeExamplesFromClassesOfInstances(int limit) {
- logger.debug("making neg Examples from parallel classes");
- SortedSet<String> classes = new TreeSet<String>();
- //superClasses.add(concept.replace("\"", ""));
- //logger.debug("before"+superClasses);
- //superClasses = dbpediaGetSuperClasses( superClasses, 4);
- //logger.debug("getting negExamples from "+superClasses.size()+" superclasses");
- JenaResultSetConvenience rsc;
- ResultSet rs=null;
- for (String instance : posExamples) {
- //System.out.println(instance);
- rs = getClassesForInstance(instance);
- //System.out.println(ResultSetFormatter.asXMLString(rs));
- rsc = new JenaResultSetConvenience(rs);
- classes.addAll(rsc.getStringListForVariable("subject"));
- //System.out.println(classes);
- }
- logger.debug("getting negExamples from "+classes.size()+" parallel classes");
- for (String oneClass : classes) {
- logger.debug(oneClass);
- rsc = new JenaResultSetConvenience(queryConcept("\""+oneClass+"\"",limit));
- this.negExamples.addAll(rsc.getStringListForVariable("subject"));
- }
- logger.debug("neg Example size: "+negExamples.size());
-
- }
-
- private SortedSet<String> getSuperClasses(SortedSet<String> superClasses, int depth) {
- SortedSet<String> ret = new TreeSet<String>();
- SortedSet<String> tmpset = new TreeSet<String>();
- ret.addAll(superClasses);
- //logger.debug(superClasses);
- JenaResultSetConvenience rsc;
-
- String query = "";
- for (; depth != 0 ; depth--) {
- for (String oneSuperClass : superClasses) {
-
- //tmp = oneSuperClass.replace("\"", "");
- query = "SELECT * WHERE { \n" + "<" + oneSuperClass + "> "
- + "<http://www.w3.org/2000/01/rdf-schema#subClassOf> ?superclass. \n"
- + "}";
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- rsc = new JenaResultSetConvenience(rs);
- tmpset.addAll(rsc.getStringListForVariable("superclass"));
-
- }
- ret.addAll(tmpset);
- //logger.debug(ret);
- superClasses.clear();
- superClasses.addAll(tmpset);
- tmpset.clear();
- }
- //logger.debug(concept);
- //logger.debug(query);
- return ret;
- }
-
-
-
- public ResultSet queryConcept(String concept,int limit) {
- ResultSet rs = null;
- try {
- String query = SparqlQueryDescriptionConvertVisitor
- .getSparqlQuery(concept,limit);
-
- SparqlQuery sq = new SparqlQuery(query, se);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println("JSON:\n"+JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return rs;
- }
-
- public SortedSet<String> queryConceptAsStringSet(String concept,int limit) {
- ResultSet rs = null;
- try {
- String query = SparqlQueryDescriptionConvertVisitor
- .getSparqlQuery(concept,limit);
-
- SparqlQuery sq = new SparqlQuery(query, se);
- //System.out.println(query);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println("JSON:\n"+JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- return new JenaResultSetConvenience(rs).getStringListForVariable("subject");
-
- }
-
- public ResultSet dbpediaQuerySKOSConcept(String SKOSconcept,int limit) {
- if(limit==0)limit=99999;
- //
- ResultSet rs = null;
- try {
-
- String query = "SELECT * WHERE { \n " +
- "?subject " +
- "<http://www.w3.org/2004/02/skos/core#subject> " +
- "<" + SKOSconcept + "> \n" +
- "} LIMIT "+limit;
- SparqlQuery sq = new SparqlQuery(query, se);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println(JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return rs;
- }
-
- public ResultSet getClassesForInstance(String instance) {
- ResultSet rs = null;
- try {
-
- String query = "SELECT ?subject WHERE { \n " +
- "<" + instance + ">"+
- " a " +
- "?subject " +
- "\n" +
- "} LIMIT 200";
- SparqlQuery sq = new SparqlQuery(query, se);
- //System.out.println(query);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println(JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return rs;
- }
-
- public SortedSet<String> getPosExamples() {
- return posExamples;
- }
-
- public SortedSet<String> getNegExamples() {
- return negExamples;
- }
-
-
- /**
- * NOT WORKING
- * @param description
- */
- public void getSubClasses(String description) {
- ResultSet rs = null;
- try {
- String query = SparqlQueryDescriptionConvertVisitor
- .getSparqlSubclassQuery(description.replace("\"", ""));
-
- rs = new SparqlQuery(query, se).send();
- System.out.println(query);
- //System.out.println(SparqlQuery.getAsXMLString(rs));
- System.out.println(rs.getResultVars());
- SortedSet<String> remainingClasses = new JenaResultSetConvenience(rs).getStringListForVariable("subject");
- SortedSet<String> alreadyQueried = new TreeSet<String>();
- alreadyQueried.add(description);
- while (remainingClasses.size()!=0){
- String tmp = remainingClasses.first();
- remainingClasses.remove(tmp);
- query = SparqlQueryDescriptionConvertVisitor
- .getSparqlSubclassQuery(tmp);
- alreadyQueried.add(tmp);
- rs = new SparqlQuery(query, se).send();
- remainingClasses.addAll(new JenaResultSetConvenience(rs).getStringListForVariable("subject"));
- }
- //System.out.println(JSON);
- System.out.println(alreadyQueried);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
-
-
-}
Deleted: trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSPARQL.java 2008-05-19 10:20:14 UTC (rev 897)
+++ trunk/src/dl-learner/org/dllearner/utilities/AutomaticExampleFinderSPARQL.java 2008-05-19 10:26:10 UTC (rev 898)
@@ -1,381 +0,0 @@
-package org.dllearner.utilities;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.log4j.Logger;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.kb.sparql.Cache;
-import org.dllearner.kb.sparql.SparqlEndpoint;
-import org.dllearner.kb.sparql.SparqlQuery;
-import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
-
-import com.hp.hpl.jena.query.ResultSet;
-
-public class AutomaticExampleFinderSPARQL {
-
- private static Logger logger = Logger
- .getLogger(ComponentManager.class);
-
- private Cache c;
- private SparqlEndpoint se;
- private SortedSet<String> posExamples;
- private SortedSet<String> negExamples;
- public SortedSet<String> totalSKOSset;
- private int limit=1000;
-
-
- public AutomaticExampleFinderSPARQL(SparqlEndpoint se){
- this.c=new Cache("cachetemp");
- this.se=se;
- posExamples = new TreeSet<String>();
- negExamples = new TreeSet<String>();
- }
-
- public void initDBpedia(String concept, boolean useRelated, boolean useSuperclasses,boolean useParallelClasses, int poslimit, int neglimit) {
- dbpediaMakePositiveExamplesFromConcept( concept);
- SortedSet<String> keepForClean = new TreeSet<String>();
- keepForClean.addAll(this.posExamples);
-
- this.posExamples = SetManipulation.fuzzyShrink(this.posExamples, poslimit);
-
-
- logger.trace("shrinking: pos Example size: "+posExamples.size());
-
- if(useRelated) {
- dbpediaMakeNegativeExamplesFromRelatedInstances(this.posExamples);
- }
- if(useSuperclasses) {
- makeNegativeExamplesFromSuperClasses(concept);
- }
- if(useParallelClasses) {
- makeNegativeExamplesFromClassesOfInstances();
- }
- //clean
- negExamples.removeAll(keepForClean);
- logger.trace("neg Example size after cleaning: "+negExamples.size());
- this.negExamples = SetManipulation.fuzzyShrink(negExamples, neglimit);
- logger.debug("pos Example size after shrinking: "+posExamples.size());
- logger.debug("neg Example size after shrinking: "+negExamples.size());
- logger.debug("Finished examples for concept: "+concept);
- }
-
- public void init(String concept, String namespace, boolean useRelated, boolean useSuperclasses,boolean useParallelClasses, int poslimit, int neglimit) {
- makePositiveExamplesFromConcept( concept);
- SortedSet<String> keepForClean = new TreeSet<String>();
- keepForClean.addAll(this.posExamples);
- this.posExamples = SetManipulation.fuzzyShrink(this.posExamples, poslimit);
- logger.trace("shrinking: pos Example size: "+posExamples.size());
-
- if(useRelated) {
- makeNegativeExamplesFromRelatedInstances(this.posExamples,namespace);
- }
- if(useSuperclasses) {
- makeNegativeExamplesFromSuperClasses(concept);
- }
- if(useParallelClasses) {
- makeNegativeExamplesFromClassesOfInstances();
- }
- //clean
- negExamples.removeAll(keepForClean);
- logger.trace("neg Example size after cleaning: "+negExamples.size());
- this.negExamples = SetManipulation.fuzzyShrink(negExamples, neglimit);
- logger.debug("pos Example size after shrinking: "+posExamples.size());
- logger.debug("neg Example size after shrinking: "+negExamples.size());
- logger.debug("Finished examples for concept: "+concept);
- }
-
-
-
- public SortedSet<String> dbpediaGetPosOnly(String concept, int limit){
- dbpediaMakePositiveExamplesFromConcept( concept);
- return SetManipulation.fuzzyShrink(this.posExamples, limit);
- }
-
- public SortedSet<String> getPosOnly(String concept, int limit){
- makePositiveExamplesFromConcept( concept);
- return SetManipulation.fuzzyShrink(this.posExamples, limit);
- }
-
- private void dbpediaMakePositiveExamplesFromConcept(String concept){
- logger.debug("making Positive Examples from Concept: "+concept);
- if(concept.contains("http://dbpedia.org/resource/Category:")) {
- this.posExamples = new JenaResultSetConvenience(dbpediaQuerySKOSConcept(concept,limit))
- .getStringListForVariable("subject");
- }else {
- this.posExamples = new JenaResultSetConvenience(queryConcept(concept,limit))
- .getStringListForVariable("subject");
- }
- logger.debug(" pos Example size: "+posExamples.size());
- }
-
- private void makePositiveExamplesFromConcept(String concept){
- logger.debug("making Positive Examples from Concept: "+concept);
- this.posExamples = new JenaResultSetConvenience(queryConcept(concept,0))
- .getStringListForVariable("subject");
- logger.debug(" pos Example size: "+posExamples.size());
- }
-
-
-
- /*private void makePositiveExamplesFromConcept(String concept){
- logger.debug("making Positive Examples from Concept: "+concept);
- if(concept.contains("http://dbpedia.org/resource/Category:")) {
- this.posExamples = new JenaResultSetConvenience(querySKOSConcept(concept,0))
- .getStringListForVariable("subject");
- }else {
- this.posExamples = new JenaResultSetConvenience(queryConcept(concept,0))
- .getStringListForVariable("subject");
- }
- logger.debug(" pos Example size: "+posExamples.size());
- }*/
-
-
-
-
-
- private void dbpediaMakeNegativeExamplesFromRelatedInstances(SortedSet<String> subject) {
- logger.debug("making examples from related instances");
- for (String string : subject) {
- dbpediaMakeNegativeExamplesFromRelatedInstances(string);
- }
- logger.debug(" negExample size: "+negExamples.size());
- }
-
- private void makeNegativeExamplesFromRelatedInstances(SortedSet<String> subject, String namespace) {
- logger.debug("making examples from related instances");
- for (String string : subject) {
- makeNegativeExamplesFromRelatedInstances(string,namespace);
- }
- logger.debug(" negExample size: "+negExamples.size());
- }
-
-
- /**
- *
- * @param subject
- * @return
- */
- private void dbpediaMakeNegativeExamplesFromRelatedInstances(String subject) {
- // SortedSet<String> result = new TreeSet<String>();
-
- String query = "SELECT * WHERE { \n" + "<" + subject + "> " + "?p ?o. \n"
- + "FILTER (REGEX(str(?o), 'http://dbpedia.org/resource/')).\n"
- + "FILTER (!REGEX(str(?p), 'http://www.w3.org/2004/02/skos'))\n"
- + "}";
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
- this.negExamples.addAll(rsc.getStringListForVariable("o"));
-
-
- }
-
- private void makeNegativeExamplesFromRelatedInstances(String subject, String namespace) {
- // SortedSet<String> result = new TreeSet<String>();
-
- String query = "SELECT * WHERE { \n" + "<" + subject + "> " + "?p ?o. \n"
- + "FILTER (REGEX(str(?o), '"+namespace+"')).\n"
- + "}";
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
- this.negExamples.addAll(rsc.getStringListForVariable("o"));
-
-
- }
-
-
- private void makeNegativeExamplesFromSuperClasses(String concept) {
-
- SortedSet<String> superClasses = new TreeSet<String>();
- superClasses.add(concept.replace("\"", ""));
- //logger.debug("before"+superClasses);
- superClasses = getSuperClasses( superClasses, 4);
- logger.debug("making neg Examples from "+superClasses.size()+" superclasses");
- JenaResultSetConvenience rsc;
- for (String oneSuperClass : superClasses) {
- logger.debug(oneSuperClass);
- rsc = new JenaResultSetConvenience(queryConcept("\""+oneSuperClass+"\"", limit));
- this.negExamples.addAll(rsc.getStringListForVariable("subject"));
- }
- logger.debug(" neg Example size: "+negExamples.size());
- }
-
-
-
- private void makeNegativeExamplesFromClassesOfInstances() {
- logger.debug("making neg Examples from parallel classes");
- SortedSet<String> classes = new TreeSet<String>();
- //superClasses.add(concept.replace("\"", ""));
- //logger.debug("before"+superClasses);
- //superClasses = dbpediaGetSuperClasses( superClasses, 4);
- //logger.debug("getting negExamples from "+superClasses.size()+" superclasses");
- JenaResultSetConvenience rsc;
- ResultSet rs=null;
- for (String instance : posExamples) {
- //System.out.println(instance);
- rs = getClassesForInstance(instance);
- //System.out.println(ResultSetFormatter.asXMLString(rs));
- rsc = new JenaResultSetConvenience(rs);
- classes.addAll(rsc.getStringListForVariable("subject"));
- //System.out.println(classes);
- }
- logger.debug("getting negExamples from "+classes.size()+" parallel classes");
- for (String oneClass : classes) {
- logger.debug(oneClass);
- rsc = new JenaResultSetConvenience(queryConcept("\""+oneClass+"\"",limit));
- this.negExamples.addAll(rsc.getStringListForVariable("subject"));
- }
- logger.debug("neg Example size: "+negExamples.size());
-
- }
-
- private SortedSet<String> getSuperClasses(SortedSet<String> superClasses, int depth) {
- SortedSet<String> ret = new TreeSet<String>();
- SortedSet<String> tmpset = new TreeSet<String>();
- ret.addAll(superClasses);
- //logger.debug(superClasses);
- JenaResultSetConvenience rsc;
-
- String query = "";
- for (; depth != 0 ; depth--) {
- for (String oneSuperClass : superClasses) {
-
- //tmp = oneSuperClass.replace("\"", "");
- query = "SELECT * WHERE { \n" + "<" + oneSuperClass + "> "
- + "<http://www.w3.org/2000/01/rdf-schema#subClassOf> ?superclass. \n"
- + "}";
-
- String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
- rsc = new JenaResultSetConvenience(rs);
- tmpset.addAll(rsc.getStringListForVariable("superclass"));
-
- }
- ret.addAll(tmpset);
- //logger.debug(ret);
- superClasses.clear();
- superClasses.addAll(tmpset);
- tmpset.clear();
- }
- //logger.debug(concept);
- //logger.debug(query);
- return ret;
- }
-
-
-
- public ResultSet queryConcept(String concept,int limit) {
- ResultSet rs = null;
- try {
- String query = SparqlQueryDescriptionConvertVisitor
- .getSparqlQuery(concept,limit);
-
- SparqlQuery sq = new SparqlQuery(query, se);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println("JSON:\n"+JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return rs;
- }
-
- public ResultSet dbpediaQuerySKOSConcept(String SKOSconcept,int limit) {
- if(limit==0)limit=99999;
- //
- ResultSet rs = null;
- try {
-
- String query = "SELECT * WHERE { \n " +
- "?subject " +
- "<http://www.w3.org/2004/02/skos/core#subject> " +
- "<" + SKOSconcept + "> \n" +
- "} LIMIT "+limit;
- SparqlQuery sq = new SparqlQuery(query, se);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println(JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return rs;
- }
-
- public ResultSet getClassesForInstance(String instance) {
- ResultSet rs = null;
- try {
-
- String query = "SELECT ?subject WHERE { \n " +
- "<" + instance + ">"+
- " a " +
- "?subject " +
- "\n" +
- "} LIMIT "+limit;
- SparqlQuery sq = new SparqlQuery(query, se);
- //System.out.println(query);
- String JSON = c.executeSparqlQuery(sq);
- //System.out.println(JSON);
- rs = SparqlQuery.JSONtoResultSet(JSON);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return rs;
- }
-
- public SortedSet<String> getPosExamples() {
- return posExamples;
- }
-
- public SortedSet<String> getNegExamples() {
- return negExamples;
- }
-
-
- /**
- * NOT WORKING
- * @param description
- */
- public void getSubClasses(String description) {
- ResultSet rs = null;
- try {
- String query = SparqlQueryDescriptionConvertVisitor
- .getSparqlSubclassQuery(description.replace("\"", ""));
-
- rs = new ...
[truncated message content] |
