Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[4240] trunk/components-core/src
|
From: <jen...@us...> - 2014-02-25 11:30:59
|
Revision: 4240
http://sourceforge.net/p/dl-learner/code/4240
Author: jenslehmann
Date: 2014-02-25 11:30:53 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java
trunk/components-core/src/main/java/org/dllearner/core/ReasonerOld.java
trunk/components-core/src/main/java/org/dllearner/core/SchemaReasoner.java
trunk/components-core/src/main/java/org/dllearner/core/config/ClassExpressionPropertyEditor.java
trunk/components-core/src/main/java/org/dllearner/core/config/ObjectPropertyEditor.java
trunk/components-core/src/main/java/org/dllearner/core/options/CommonConfigMappings.java
trunk/components-core/src/main/java/org/dllearner/core/owl/ClassHierarchy.java
trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java
trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java
trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java
trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/RDFBlankNode.java
trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java
trunk/components-core/src/main/java/org/dllearner/kb/repository/bioportal/BioPortalRepository.java
trunk/components-core/src/main/java/org/dllearner/kb/repository/tones/TONESRepository.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/SymmetricConciseBoundedDescriptionGeneratorImpl.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ClassIndexer.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/JenaToOwlapiConverter.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java
trunk/components-core/src/main/java/org/dllearner/parser/KBParser.java
trunk/components-core/src/main/java/org/dllearner/parser/KBParserTokenManager.java
trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParser.java
trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParserTokenManager.java
trunk/components-core/src/main/java/org/dllearner/reasoning/DIGConverter.java
trunk/components-core/src/main/java/org/dllearner/reasoning/DIGHTTPConnector.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrieval.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown2008.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java
trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2.java
trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2toFuzzyDL.java
trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java
trunk/components-core/src/main/java/org/dllearner/utilities/components/ComponentCombo.java
trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java
trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/Datastructures.java
trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java
trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/MapToStringTupleListConverter.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderOWL.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/LearnConfiguration.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/LearnOWLFileConfiguration.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/LearnSPARQLConfiguration.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/UsedEntitiesDetection.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/AxiomComparator.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/ConceptComparator.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/ConceptTransformation.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/EvaluatedDescriptionSet.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/ManchesterOWLSyntaxParser.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAxiomToSPARQLConverter.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/SimpleOntologyToByteConverter.java
trunk/components-core/src/test/java/org/dllearner/algorithms/isle/FixDBpediaOntology.java
trunk/components-core/src/test/java/org/dllearner/algorithms/pattern/OWLAxiomRenamerTest.java
trunk/components-core/src/test/java/org/dllearner/algorithms/pattern/OWLPatternDetectionTest.java
trunk/components-core/src/test/java/org/dllearner/core/AnnComponentManagerTest.java
trunk/components-core/src/test/java/org/dllearner/kb/OWLAPIOntologyTest.java
trunk/components-core/src/test/java/org/dllearner/kb/sparql/SparqlKnowledgeSourceTest.java
trunk/components-core/src/test/java/org/dllearner/test/ClassCastExceptionTest.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains_noFuzzyIndividuals.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_noFuzzyTrains.java
trunk/components-core/src/test/java/org/dllearner/test/SworeTest.java
trunk/components-core/src/test/java/org/dllearner/test/TestOneQueryForMusicRecommender.java
trunk/components-core/src/test/java/org/dllearner/test/TripleTypeTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ClassExpressionTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ComponentTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ConfigOptionTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ELDescriptionTreeTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/HeuristicTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/LearningProblemTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ParserTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/PropertyLearningTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ReasonerTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/RefinementOperatorTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/SimulationTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/SomeOnlyReasonerTest.java
trunk/components-core/src/test/java/org/dllearner/utilities/owl/OntologyToByteConverterTest.java
Modified: trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -37,30 +36,12 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.apache.log4j.Logger;
-import org.dllearner.algorithms.DisjointClassesLearner;
-import org.dllearner.algorithms.SimpleSubclassLearner;
-import org.dllearner.algorithms.celoe.CELOE;
-import org.dllearner.algorithms.properties.DataPropertyDomainAxiomLearner;
-import org.dllearner.algorithms.properties.DataPropertyRangeAxiomLearner;
-import org.dllearner.algorithms.properties.DisjointDataPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.DisjointObjectPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.EquivalentDataPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.EquivalentObjectPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.FunctionalDataPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.FunctionalObjectPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.InverseFunctionalObjectPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.ObjectPropertyDomainAxiomLearner;
-import org.dllearner.algorithms.properties.ObjectPropertyRangeAxiomLearner;
-import org.dllearner.algorithms.properties.SubDataPropertyOfAxiomLearner;
-import org.dllearner.algorithms.properties.SubObjectPropertyOfAxiomLearner;
-import org.dllearner.algorithms.properties.SymmetricObjectPropertyAxiomLearner;
-import org.dllearner.algorithms.properties.TransitiveObjectPropertyAxiomLearner;
import org.dllearner.core.options.ConfigEntry;
import org.dllearner.core.options.ConfigOption;
import org.dllearner.core.options.InvalidConfigOptionValueException;
Modified: trunk/components-core/src/main/java/org/dllearner/core/ReasonerOld.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/ReasonerOld.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/ReasonerOld.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -23,17 +23,17 @@
import java.util.Set;
import java.util.SortedSet;
+import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Constant;
import org.dllearner.core.owl.DataRange;
import org.dllearner.core.owl.DatatypeProperty;
import org.dllearner.core.owl.DatatypePropertyHierarchy;
+import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Entity;
+import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
-import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.reasoning.ReasonerType;
import org.dllearner.utilities.datastructures.SortedSetTuple;
Modified: trunk/components-core/src/main/java/org/dllearner/core/SchemaReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/SchemaReasoner.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/SchemaReasoner.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -23,11 +23,11 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.DataRange;
import org.dllearner.core.owl.DatatypeProperty;
import org.dllearner.core.owl.DatatypePropertyHierarchy;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
Modified: trunk/components-core/src/main/java/org/dllearner/core/config/ClassExpressionPropertyEditor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/config/ClassExpressionPropertyEditor.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/config/ClassExpressionPropertyEditor.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -9,8 +9,6 @@
import org.dllearner.core.owl.Description;
import org.dllearner.parser.ManchesterSyntaxParser;
import org.dllearner.parser.ParseException;
-import org.dllearner.utilities.owl.ManchesterOWLSyntaxParser;
-import org.semanticweb.owlapi.expression.ParserException;
public class ClassExpressionPropertyEditor implements PropertyEditor {
Modified: trunk/components-core/src/main/java/org/dllearner/core/config/ObjectPropertyEditor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/config/ObjectPropertyEditor.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/config/ObjectPropertyEditor.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -19,12 +19,14 @@
package org.dllearner.core.config;
-import org.dllearner.core.owl.ObjectProperty;
-
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Rectangle;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
+import org.dllearner.core.owl.ObjectProperty;
+
/**
* Created by IntelliJ IDEA.
* User: Chris
Modified: trunk/components-core/src/main/java/org/dllearner/core/options/CommonConfigMappings.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/options/CommonConfigMappings.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/options/CommonConfigMappings.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -24,8 +24,8 @@
import java.util.TreeSet;
import org.dllearner.core.options.fuzzydll.FuzzyExample;
+import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.fuzzydll.FuzzyIndividual;
import org.dllearner.utilities.owl.ConceptComparator;
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/ClassHierarchy.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/ClassHierarchy.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/ClassHierarchy.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -20,11 +20,11 @@
package org.dllearner.core.owl;
import java.util.HashSet;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.apache.log4j.Logger;
import org.dllearner.utilities.owl.ConceptComparator;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -27,9 +27,9 @@
import java.util.LinkedList;
import org.apache.log4j.Logger;
+import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.options.URLConfigOption;
import org.dllearner.core.owl.KB;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -30,7 +30,10 @@
import org.dllearner.core.owl.KB;
import org.dllearner.utilities.owl.OntologyToByteConverter;
import org.dllearner.utilities.owl.SimpleOntologyToByteConverter;
-import org.semanticweb.owlapi.model.*;
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntology;
+import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
/**
* This class provides a wrapper around a single OWL Ontology. However, due to threading issues it is not safe
Modified: trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.aksw.jena_sparql_api.cache.core.QueryExecutionFactoryCacheEx;
import org.aksw.jena_sparql_api.cache.extra.CacheCoreEx;
import org.aksw.jena_sparql_api.cache.extra.CacheCoreH2;
import org.aksw.jena_sparql_api.cache.extra.CacheEx;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/RDFBlankNode.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/RDFBlankNode.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/RDFBlankNode.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -20,7 +20,11 @@
package org.dllearner.kb.aquisitors;
import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.rdf.model.*;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.RDFVisitor;
+import com.hp.hpl.jena.rdf.model.Resource;
/**
* This class is used to save disambiguated information for a blankNode in an RDF
Modified: trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -25,15 +25,14 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import com.hp.hpl.jena.query.QuerySolution;
import org.apache.log4j.Logger;
import org.dllearner.kb.sparql.SPARQLTasks;
import org.dllearner.kb.sparql.SparqlQueryMaker;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
+import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSetFormatter;
import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.sparql.core.ResultBinding;
import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable;
/**
Modified: trunk/components-core/src/main/java/org/dllearner/kb/repository/bioportal/BioPortalRepository.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/repository/bioportal/BioPortalRepository.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/repository/bioportal/BioPortalRepository.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -12,9 +12,6 @@
import org.apache.log4j.Logger;
import org.dllearner.kb.repository.OntologyRepository;
import org.dllearner.kb.repository.OntologyRepositoryEntry;
-import org.semanticweb.owlapi.apibinding.OWLManager;
-import org.semanticweb.owlapi.model.IRI;
-import org.semanticweb.owlapi.model.OWLOntology;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.KXml2Driver;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/repository/tones/TONESRepository.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/repository/tones/TONESRepository.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/repository/tones/TONESRepository.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -13,7 +13,6 @@
import org.apache.log4j.Logger;
import org.dllearner.kb.repository.OntologyRepository;
import org.dllearner.kb.repository.OntologyRepositoryEntry;
-import org.dllearner.kb.repository.bioportal.BioPortalRepository;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyIRIMapper;
import org.semanticweb.owlapi.util.OntologyIRIShortFormProvider;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -23,8 +23,8 @@
import org.apache.log4j.Logger;
import org.dllearner.algorithms.gp.ADC;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.Constant;
import org.dllearner.core.owl.DatatypeExactCardinalityRestriction;
import org.dllearner.core.owl.DatatypeMaxCardinalityRestriction;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -65,10 +65,10 @@
import org.dllearner.utilities.owl.SimpleOntologyToByteConverter;
import org.dllearner.utilities.statistics.SimpleClock;
import org.semanticweb.owlapi.model.OWLOntology;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
-import org.semanticweb.owlapi.model.OWLOntologyManager;
/**
* Represents the SPARQL Endpoint Component.
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/SymmetricConciseBoundedDescriptionGeneratorImpl.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/SymmetricConciseBoundedDescriptionGeneratorImpl.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/SymmetricConciseBoundedDescriptionGeneratorImpl.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -3,13 +3,10 @@
import java.io.UnsupportedEncodingException;
import java.sql.SQLException;
import java.util.List;
-import java.util.Set;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryFactory;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -3,11 +3,8 @@
*/
package org.dllearner.kb.sparql.simple;
-import java.util.*;
+import java.util.Set;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ClassIndexer.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ClassIndexer.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ClassIndexer.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -21,6 +21,16 @@
package org.dllearner.kb.sparql.simple;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.hp.hpl.jena.ontology.OntClass;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec;
@@ -28,13 +38,8 @@
import com.hp.hpl.jena.util.iterator.ExtendedIterator;
import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.naming.ldap.ExtendedRequest;
-import java.util.*;
-
/**
* Indexes an Ontology
* skips complex classes per default, this does not affect the hierarchy outcome
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/JenaToOwlapiConverter.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/JenaToOwlapiConverter.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/JenaToOwlapiConverter.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -3,7 +3,6 @@
import java.io.StringReader;
import java.io.StringWriter;
-import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.ReaderDocumentSource;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -1,20 +1,16 @@
package org.dllearner.kb.sparql.simple;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.jamonapi.Monitor;
-import com.jamonapi.MonitorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
public class SchemaIndexer {
private static Logger log = LoggerFactory.getLogger(SchemaIndexer.class);
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -3,9 +3,7 @@
*/
package org.dllearner.kb.sparql.simple;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import com.hp.hpl.jena.ontology.OntModel;
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -42,7 +42,6 @@
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.fuzzydll.FuzzyIndividual;
-import org.dllearner.utilities.Helper;
/**
* @author Jens Lehmann
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -19,7 +19,6 @@
package org.dllearner.learningproblems;
-import java.util.Collection;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -29,9 +28,7 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.ConfigEntry;
-import org.dllearner.core.options.DoubleConfigOption;
import org.dllearner.core.options.InvalidConfigOptionValueException;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
Modified: trunk/components-core/src/main/java/org/dllearner/parser/KBParser.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/parser/KBParser.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/parser/KBParser.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -20,9 +20,47 @@
/* Generated By:JavaCC: Do not edit this line. KBParser.java */
package org.dllearner.parser;
-import org.dllearner.core.owl.*;
-import java.io.*;
-import java.net.URL;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URL;
+
+import org.dllearner.core.owl.BooleanValueRestriction;
+import org.dllearner.core.owl.ClassAssertionAxiom;
+import org.dllearner.core.owl.DataRange;
+import org.dllearner.core.owl.DatatypeProperty;
+import org.dllearner.core.owl.DatatypePropertyDomainAxiom;
+import org.dllearner.core.owl.DatatypePropertyRangeAxiom;
+import org.dllearner.core.owl.Description;
+import org.dllearner.core.owl.EquivalentClassesAxiom;
+import org.dllearner.core.owl.FunctionalObjectPropertyAxiom;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.Intersection;
+import org.dllearner.core.owl.InverseObjectPropertyAxiom;
+import org.dllearner.core.owl.KB;
+import org.dllearner.core.owl.NamedClass;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.OWL2Datatype;
+import org.dllearner.core.owl.ObjectAllRestriction;
+import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
+import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.ObjectPropertyAssertion;
+import org.dllearner.core.owl.ObjectPropertyDomainAxiom;
+import org.dllearner.core.owl.ObjectPropertyRangeAxiom;
+import org.dllearner.core.owl.ObjectSomeRestriction;
+import org.dllearner.core.owl.ObjectValueRestriction;
+import org.dllearner.core.owl.PropertyAxiom;
+import org.dllearner.core.owl.StringValueRestriction;
+import org.dllearner.core.owl.SubClassAxiom;
+import org.dllearner.core.owl.SubObjectPropertyAxiom;
+import org.dllearner.core.owl.SymmetricObjectPropertyAxiom;
+import org.dllearner.core.owl.Thing;
+import org.dllearner.core.owl.TransitiveObjectPropertyAxiom;
+import org.dllearner.core.owl.Union;
@SuppressWarnings("all")
public class KBParser implements KBParserConstants {
Modified: trunk/components-core/src/main/java/org/dllearner/parser/KBParserTokenManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/parser/KBParserTokenManager.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/parser/KBParserTokenManager.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -19,9 +19,6 @@
/* Generated By:JavaCC: Do not edit this line. KBParserTokenManager.java */
package org.dllearner.parser;
-import org.dllearner.core.owl.*;
-import java.io.*;
-import java.net.URL;
/** Token Manager. */
@SuppressWarnings("all")
Modified: trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParser.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParser.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParser.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -1,10 +1,25 @@
/* Generated By:JavaCC: Do not edit this line. ManchesterSyntaxParser.java */
package org.dllearner.parser;
-import org.dllearner.core.owl.*;
-import java.io.*;
-import java.net.URL;
+import java.io.StringReader;
+import org.dllearner.core.owl.DatatypeProperty;
+import org.dllearner.core.owl.Description;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.Intersection;
+import org.dllearner.core.owl.NamedClass;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ObjectAllRestriction;
+import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
+import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.ObjectSomeRestriction;
+import org.dllearner.core.owl.ObjectValueRestriction;
+import org.dllearner.core.owl.StringValueRestriction;
+import org.dllearner.core.owl.Thing;
+import org.dllearner.core.owl.Union;
+
public class ManchesterSyntaxParser implements ManchesterSyntaxParserConstants {
public static Description parseClassExpression(String classExpression) throws ParseException {
Modified: trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParserTokenManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParserTokenManager.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/parser/ManchesterSyntaxParserTokenManager.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -1,8 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ManchesterSyntaxParserTokenManager.java */
package org.dllearner.parser;
-import org.dllearner.core.owl.*;
-import java.io.*;
-import java.net.URL;
/** Token Manager. */
public class ManchesterSyntaxParserTokenManager implements ManchesterSyntaxParserConstants
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/DIGConverter.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/DIGConverter.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/DIGConverter.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -22,30 +22,30 @@
import java.net.URI;
import java.util.Set;
-import org.dllearner.core.owl.ObjectAllRestriction;
-import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Axiom;
-import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.EquivalentClassesAxiom;
-import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.FunctionalObjectPropertyAxiom;
-import org.dllearner.core.owl.SubClassAxiom;
import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.KB;
-import org.dllearner.core.owl.Intersection;
-import org.dllearner.core.owl.Union;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ObjectAllRestriction;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyAssertion;
import org.dllearner.core.owl.ObjectPropertyExpression;
import org.dllearner.core.owl.ObjectPropertyInverse;
import org.dllearner.core.owl.ObjectQuantorRestriction;
+import org.dllearner.core.owl.ObjectSomeRestriction;
+import org.dllearner.core.owl.SubClassAxiom;
import org.dllearner.core.owl.SubObjectPropertyAxiom;
import org.dllearner.core.owl.SymmetricObjectPropertyAxiom;
import org.dllearner.core.owl.Thing;
import org.dllearner.core.owl.TransitiveObjectPropertyAxiom;
+import org.dllearner.core.owl.Union;
/**
* Methods for converting internal representation to DIG and
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/DIGHTTPConnector.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/DIGHTTPConnector.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/DIGHTTPConnector.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -36,11 +36,11 @@
import org.kr.dl.dig.v1_1.GetIdentifierDocument;
import org.kr.dl.dig.v1_1.IdRespType;
import org.kr.dl.dig.v1_1.IdentifierDocument;
+import org.kr.dl.dig.v1_1.KbDocument.Kb;
import org.kr.dl.dig.v1_1.NewKBDocument;
import org.kr.dl.dig.v1_1.ReleaseKBDocument;
import org.kr.dl.dig.v1_1.ResponseDocument;
import org.kr.dl.dig.v1_1.ResponsesDocument;
-import org.kr.dl.dig.v1_1.KbDocument.Kb;
/**
* Methods for sending messages to a DIG-capable reasoner and receiving answers
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -20,19 +20,18 @@
package org.dllearner.reasoning;
import java.io.File;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Arrays;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.log4j.Logger;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.ComponentInitException;
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrieval.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrieval.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrieval.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -23,16 +23,16 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.dllearner.core.owl.ObjectAllRestriction;
-import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Nothing;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.FlatABox;
import org.dllearner.core.owl.Intersection;
-import org.dllearner.core.owl.Union;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ObjectAllRestriction;
+import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Thing;
+import org.dllearner.core.owl.Union;
import org.dllearner.utilities.Helper;
import org.dllearner.utilities.datastructures.SortedSetTuple;
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -25,7 +25,6 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.KnowledgeSource;
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -20,7 +20,6 @@
package org.dllearner.reasoning.fuzzydll;
import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -71,7 +70,6 @@
import com.clarkparsia.pellet.owlapiv3.PelletReasoner;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
-import edu.stanford.nlp.io.StringOutputStream;
import fuzzydl.AllInstancesQuery;
import fuzzydl.Concept;
import fuzzydl.ConfigReader;
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -22,8 +22,6 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
@@ -36,12 +34,12 @@
import org.dllearner.algorithms.el.ELDescriptionTree;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
-import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Thing;
/**
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -19,7 +19,6 @@
package org.dllearner.refinementoperators;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,7 +28,6 @@
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
-import java.util.Stack;
import java.util.TreeMap;
import java.util.TreeSet;
@@ -43,14 +41,13 @@
import org.dllearner.algorithms.el.TreeAndRoleSetComparator;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
-import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Thing;
-import org.dllearner.utilities.Helper;
//import com.jamonapi.Monitor;
//import com.jamonapi.MonitorFactory;
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -28,17 +28,17 @@
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.owl.ObjectAllRestriction;
-import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Nothing;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Intersection;
-import org.dllearner.core.owl.Union;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ObjectAllRestriction;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectQuantorRestriction;
+import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Thing;
+import org.dllearner.core.owl.Union;
import org.dllearner.learningproblems.PosNegLP;
import org.dllearner.utilities.owl.ConceptComparator;
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -28,17 +28,17 @@
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.owl.ObjectAllRestriction;
-import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Nothing;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Intersection;
-import org.dllearner.core.owl.Union;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ObjectAllRestriction;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectQuantorRestriction;
+import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Thing;
+import org.dllearner.core.owl.Union;
import org.dllearner.learningproblems.PosNegLP;
import org.dllearner.utilities.owl.ConceptComparator;
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -19,7 +19,6 @@
package org.dllearner.refinementoperators;
-import java.util.List;
import java.util.Set;
import org.dllearner.core.Component;
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown2008.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown2008.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown2008.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -27,11 +27,11 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.apache.log4j.Logger;
import org.dllearner.core.AbstractReasonerComponent;
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -33,18 +33,18 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.owl.BooleanValueRestriction;
import org.dllearner.core.owl.DatatypeProperty;
-import org.dllearner.core.owl.ObjectAllRestriction;
-import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Nothing;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Intersection;
-import org.dllearner.core.owl.Union;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.Nothing;
+import org.dllearner.core.owl.ObjectAllRestriction;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyExpression;
import org.dllearner.core.owl.ObjectQuantorRestriction;
+import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.Thing;
+import org.dllearner.core.owl.Union;
import org.dllearner.core.owl.ValueRestriction;
import org.dllearner.utilities.owl.ConceptComparator;
import org.dllearner.utilities.owl.ConceptTransformation;
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -2,7 +2,6 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.io.OutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.HashSet;
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2toFuzzyDL.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2toFuzzyDL.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/FuzzyOwl2toFuzzyDL.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -1,14 +1,53 @@
package org.dllearner.utilities;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.semanticweb.owlapi.model.ClassExpressionType;
+import org.semanticweb.owlapi.model.DataRangeType;
+import org.semanticweb.owlapi.model.OWLClass;
+import org.semanticweb.owlapi.model.OWLClassExpression;
+import org.semanticweb.owlapi.model.OWLDataIntersectionOf;
+import org.semanticweb.owlapi.model.OWLDataOneOf;
+import org.semanticweb.owlapi.model.OWLDataProperty;
+import org.semanticweb.owlapi.model.OWLDataPropertyExpression;
+import org.semanticweb.owlapi.model.OWLDataRange;
+import org.semanticweb.owlapi.model.OWLDatatype;
+import org.semanticweb.owlapi.model.OWLDatatypeRestriction;
+import org.semanticweb.owlapi.model.OWLEntity;
+import org.semanticweb.owlapi.model.OWLFacetRestriction;
+import org.semanticweb.owlapi.model.OWLIndividual;
+import org.semanticweb.owlapi.model.OWLLiteral;
+import org.semanticweb.owlapi.model.OWLObjectProperty;
+import org.semanticweb.owlapi.model.OWLObjectPropertyExpression;
+import org.semanticweb.owlapi.vocab.OWLFacet;
+
import fuzzydl.Concept;
-import fuzzyowl2.*;
+import fuzzyowl2.ChoquetConcept;
+import fuzzyowl2.FuzzyLogic;
+import fuzzyowl2.FuzzyNominalConcept;
+import fuzzyowl2.LeftShoulderFunction;
+import fuzzyowl2.LinearFunction;
+import fuzzyowl2.LinearModifier;
+import fuzzyowl2.ModifiedConcept;
+import fuzzyowl2.ModifiedFunction;
+import fuzzyowl2.ModifiedProperty;
+import fuzzyowl2.OwaConcept;
+import fuzzyowl2.QowaConcept;
+import fuzzyowl2.QuasiSugenoConcept;
+import fuzzyowl2.RightShoulderFunction;
+import fuzzyowl2.SugenoConcept;
+import fuzzyowl2.TrapezoidalFunction;
+import fuzzyowl2.TriangularFunction;
+import fuzzyowl2.TriangularModifier;
+import fuzzyowl2.WeightedConcept;
+import fuzzyowl2.WeightedMaxConcept;
+import fuzzyowl2.WeightedMinConcept;
+import fuzzyowl2.WeightedSumConcept;
-import org.semanticweb.owlapi.model.*;
-import org.semanticweb.owlapi.vocab.*;
-
/**
* Class translating from OWL 2 into fuzzyDL syntax.
*
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -24,22 +24,22 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import org.apache.log4j.Logger;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ReasoningMethodUnsupportedException;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.AssertionalAxiom;
-import org.dllearner.core.owl.NamedClass;
+import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.FlatABox;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.KB;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Negation;
import org.dllearner.core.owl.ObjectCardinalityRestriction;
import org.dllearner.core.owl.ObjectProperty;
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/components/ComponentCombo.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/components/ComponentCombo.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/components/ComponentCombo.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -24,13 +24,13 @@
import java.util.Set;
import org.dllearner.algorithms.ocel.OCEL;
+import org.dllearner.core.AbstractCELA;
+import org.dllearner.core.AbstractKnowledgeSource;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractKnowledgeSource;
-import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.AbstractLearningProblem;
import org.dllearner.core.LearningProblemUnsupportedException;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.kb.OWLFile;
import org.dllearner.learningproblems.PosNegLPStandard;
import org.dllearner.reasoning.FastInstanceChecker;
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -23,9 +23,9 @@
import java.net.MalformedURLException;
import java.net.URL;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.kb.OWLFile;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.reasoning.OWLAPIReasoner;
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/Datastructures.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/Datastructures.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/Datastructures.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -25,8 +25,8 @@
import java.util.Set;
import java.util.TreeSet;
+import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.ObjectProperty;
/**
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -28,8 +28,8 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.EvaluatedDescription;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.Description;
import org.dllearner.learningproblems.EvaluatedDescriptionPosNeg;
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/MapToStringTupleListConverter.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/MapToStringTupleListConverter.java 2014-02-21 12:13:47 UTC (rev 4239)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/MapToStringTupleListConverter.java 2014-02-25 11:30:53 UTC (rev 4240)
@@ -1,13 +1,12 @@
package org.dllearner.utilities.datastructures;
-import org.dllearner.utilities.datastructures.StringTuple;
-import org.springframework.core.convert.converter.Converter;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.springframework.core.convert.converter.Converter;
+
/**
* Created by IntelliJ IDEA.
* User: Chris
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderOWL.java
========...
[truncated message content] |
