[DL-Learner SVN] SF.net SVN: dl-learner: [541] trunk/src/dl-learner/org/dllearner

[<jen...@us...>]

Revision: 541
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=541&view=rev
Author:   jenslehmann
Date:     2008-02-11 09:41:10 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
start moving core structures from mixed DL/OWL to OWL only

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
    trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
    trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java
    trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java
    trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java
    trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java
    trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java
    trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java
    trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java
    trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java
    trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
    trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
    trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java
    trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
    trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java
    trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java
    trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java
    trunk/src/dl-learner/org/dllearner/cli/Start.java
    trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
    trunk/src/dl-learner/org/dllearner/core/LearningProblem.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/Score.java
    trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java
    trunk/src/dl-learner/org/dllearner/core/owl/All.java
    trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java
    trunk/src/dl-learner/org/dllearner/core/owl/Concept.java
    trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java
    trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java
    trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java
    trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java
    trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java
    trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java
    trunk/src/dl-learner/org/dllearner/core/owl/Equality.java
    trunk/src/dl-learner/org/dllearner/core/owl/Exists.java
    trunk/src/dl-learner/org/dllearner/core/owl/FlatABox.java
    trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java
    trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java
    trunk/src/dl-learner/org/dllearner/core/owl/Individual.java
    trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/KB.java
    trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java
    trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java
    trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java
    trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java
    trunk/src/dl-learner/org/dllearner/core/owl/Negation.java
    trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java
    trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java
    trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java
    trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java
    trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java
    trunk/src/dl-learner/org/dllearner/core/owl/Property.java
    trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java
    trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java
    trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java
    trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java
    trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java
    trunk/src/dl-learner/org/dllearner/core/owl/Top.java
    trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java
    trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java
    trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java
    trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java
    trunk/src/dl-learner/org/dllearner/kb/KBFile.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/PosNegDefinitionLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyDefinitionLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java
    trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java
    trunk/src/dl-learner/org/dllearner/learningproblems/ScoreThreeValued.java
    trunk/src/dl-learner/org/dllearner/learningproblems/ScoreTwoValued.java
    trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
    trunk/src/dl-learner/org/dllearner/parser/ConfParserTokenManager.java
    trunk/src/dl-learner/org/dllearner/parser/KBParser.java
    trunk/src/dl-learner/org/dllearner/parser/KBParserTokenManager.java
    trunk/src/dl-learner/org/dllearner/parser/conf.jj
    trunk/src/dl-learner/org/dllearner/parser/kb.jj
    trunk/src/dl-learner/org/dllearner/reasoning/DIGConverter.java
    trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.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/reasoning/OWLAPIReasoner.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
    trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java
    trunk/src/dl-learner/org/dllearner/utilities/ConceptTransformation.java
    trunk/src/dl-learner/org/dllearner/utilities/CrossValidation.java
    trunk/src/dl-learner/org/dllearner/utilities/Datastructures.java
    trunk/src/dl-learner/org/dllearner/utilities/Helper.java
    trunk/src/dl-learner/org/dllearner/utilities/OntologyClassRewriter.java
    trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java

Added Paths:
-----------
    trunk/src/dl-learner/org/dllearner/core/owl/
    trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java

Removed Paths:
-------------
    trunk/src/dl-learner/org/dllearner/core/dl/
    trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java

Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -35,16 +35,16 @@
 import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.config.IntegerConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.dl.All;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Bottom;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Conjunction;
-import org.dllearner.core.dl.Disjunction;
-import org.dllearner.core.dl.Exists;
-import org.dllearner.core.dl.Negation;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.All;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Bottom;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Conjunction;
+import org.dllearner.core.owl.Disjunction;
+import org.dllearner.core.owl.Exists;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.Top;
 
 /**
  * A brute force learning algorithm.

Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -33,7 +33,7 @@
 import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.config.IntegerConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 public class RandomGuesser extends LearningAlgorithm {
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 public class ADC extends Concept {
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -41,8 +41,8 @@
 import org.dllearner.core.config.IntegerConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
 import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Top;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.utilities.Helper;
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -10,18 +10,18 @@
 import org.dllearner.core.LearningProblem;
 import org.dllearner.core.ReasoningMethodUnsupportedException;
 import org.dllearner.core.Score;
-import org.dllearner.core.dl.All;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Bottom;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Exists;
-import org.dllearner.core.dl.FlatABox;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
-import org.dllearner.core.dl.Negation;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.All;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Bottom;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Exists;
+import org.dllearner.core.owl.FlatABox;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.Top;
 import org.dllearner.learningproblems.PosNegDefinitionLPStrict;
 import org.dllearner.learningproblems.ScoreThreeValued;
 import org.dllearner.reasoning.FastRetrieval;

Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -21,7 +21,7 @@
 package org.dllearner.algorithms.gp;
 
 import org.dllearner.core.Score;
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 /**
  * This class represents a program, i.e. an individual.

Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -7,7 +7,7 @@
 
 import org.dllearner.algorithms.gp.Program;
 import org.dllearner.core.Score;
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.utilities.ConceptComparator;
 import org.dllearner.utilities.ConceptTransformation;

Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -9,17 +9,17 @@
 
 import org.dllearner.algorithms.refinement.RefinementOperator;
 import org.dllearner.core.ReasoningService;
-import org.dllearner.core.dl.All;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Bottom;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Exists;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
-import org.dllearner.core.dl.Negation;
-import org.dllearner.core.dl.Quantification;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.All;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Bottom;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Exists;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.Quantification;
+import org.dllearner.core.owl.Top;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.utilities.ConceptComparator;
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -9,17 +9,17 @@
 
 import org.dllearner.algorithms.refinement.RefinementOperator;
 import org.dllearner.core.ReasoningService;
-import org.dllearner.core.dl.All;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Bottom;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Exists;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
-import org.dllearner.core.dl.Negation;
-import org.dllearner.core.dl.Quantification;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.All;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Bottom;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Exists;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.Quantification;
+import org.dllearner.core.owl.Top;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.utilities.ConceptComparator;
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -23,8 +23,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
 import org.dllearner.utilities.ConceptComparator;
 
 /**

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -39,9 +39,9 @@
 import org.dllearner.core.config.DoubleConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
 import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.ObjectProperty;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.learningproblems.PosOnlyDefinitionLP;
 import org.dllearner.utilities.Files;

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -36,11 +36,11 @@
 import org.dllearner.core.LearningProblem;
 import org.dllearner.core.ReasoningService;
 import org.dllearner.core.Score;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
+import org.dllearner.core.owl.Top;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.learningproblems.PosOnlyDefinitionLP;
 import org.dllearner.utilities.ConceptComparator;

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -3,7 +3,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 import org.dllearner.utilities.ConceptComparator;
 
 public class Node {

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -24,12 +24,12 @@
 import org.dllearner.core.config.DoubleConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
 import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.Top;
 import org.dllearner.learningproblems.PosNegLP;
 import org.dllearner.learningproblems.PosOnlyDefinitionLP;
 import org.dllearner.utilities.ConceptComparator;

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 public interface RefinementOperator {
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -30,20 +30,20 @@
 import java.util.TreeSet;
 
 import org.dllearner.core.ReasoningService;
-import org.dllearner.core.dl.All;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Bottom;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Conjunction;
-import org.dllearner.core.dl.Disjunction;
-import org.dllearner.core.dl.Exists;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
-import org.dllearner.core.dl.Negation;
-import org.dllearner.core.dl.Quantification;
-import org.dllearner.core.dl.ObjectPropertyExpression;
-import org.dllearner.core.dl.Top;
+import org.dllearner.core.owl.All;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Bottom;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Conjunction;
+import org.dllearner.core.owl.Disjunction;
+import org.dllearner.core.owl.Exists;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
+import org.dllearner.core.owl.Negation;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.ObjectPropertyExpression;
+import org.dllearner.core.owl.Quantification;
+import org.dllearner.core.owl.Top;
 import org.dllearner.utilities.ConceptComparator;
 import org.dllearner.utilities.ConceptTransformation;
 

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,6 +1,6 @@
 package org.dllearner.algorithms.refinement;
 
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 /**
  * Soll hauptsächlich dazu dienen zu testen, ob ein Konzept im

Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -61,10 +61,10 @@
 import org.dllearner.core.config.StringConfigOption;
 import org.dllearner.core.config.StringSetConfigOption;
 import org.dllearner.core.config.StringTupleListConfigOption;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
 import org.dllearner.kb.KBFile;
 import org.dllearner.kb.OWLFile;
 import org.dllearner.kb.sparql.SparqlKnowledgeSource;

Modified: trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -23,7 +23,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 /**
  * @author Jens Lehmann

Modified: trunk/src/dl-learner/org/dllearner/core/LearningProblem.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/LearningProblem.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/LearningProblem.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -19,7 +19,7 @@
  */
 package org.dllearner.core;
 
-import org.dllearner.core.dl.Concept;
+import org.dllearner.core.owl.Concept;
 
 /**
  * Base class for all learning problems.

Modified: trunk/src/dl-learner/org/dllearner/core/Reasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/Reasoner.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/Reasoner.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -24,12 +24,12 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.RoleHierarchy;
-import org.dllearner.core.dl.SubsumptionHierarchy;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.RoleHierarchy;
+import org.dllearner.core.owl.SubsumptionHierarchy;
 import org.dllearner.reasoning.ReasonerType;
 import org.dllearner.utilities.SortedSetTuple;
 

Modified: trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -25,12 +25,12 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.RoleHierarchy;
-import org.dllearner.core.dl.SubsumptionHierarchy;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.RoleHierarchy;
+import org.dllearner.core.owl.SubsumptionHierarchy;
 import org.dllearner.utilities.SortedSetTuple;
 
 /**

Modified: trunk/src/dl-learner/org/dllearner/core/ReasoningService.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ReasoningService.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/ReasoningService.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -27,12 +27,12 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.RoleHierarchy;
-import org.dllearner.core.dl.SubsumptionHierarchy;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.RoleHierarchy;
+import org.dllearner.core.owl.SubsumptionHierarchy;
 import org.dllearner.reasoning.ReasonerType;
 import org.dllearner.utilities.SortedSetTuple;
 

Modified: trunk/src/dl-learner/org/dllearner/core/Score.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/Score.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/Score.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-import org.dllearner.core.dl.Individual;
+import org.dllearner.core.owl.Individual;
 
 public abstract class Score {
 	public abstract double getScore();

Modified: trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -23,9 +23,9 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Individual;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
 import org.dllearner.utilities.ConceptComparator;
 
 /**

Copied: trunk/src/dl-learner/org/dllearner/core/owl (from rev 540, trunk/src/dl-learner/org/dllearner/core/dl)

Modified: trunk/src/dl-learner/org/dllearner/core/owl/All.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/All.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/All.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/AssertionalAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 public abstract class AssertionalAxiom extends Axiom {
 

Deleted: trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/AtomicConcept.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,63 +0,0 @@
-/**
- * Copyright (C) 2007, Jens Lehmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.core.dl;
-
-import java.util.Map;
-
-import org.dllearner.utilities.Helper;
-
-/**
- * Represents an atomic concept in a knowledge base / ontology, 
- * e.g. "car", "person".
- * 
- * @author Jens Lehmann
- *
- */
-public class AtomicConcept extends Concept {
-
-    String name;
-    
-	public AtomicConcept(String name) {
-        this.name = name;
-    }    
-    
-    public String getName() {
-		return name;
-	}
-    
-	public int getLength() {
-		return 1;
-	}
-
-	@Override
-	public int getArity() {
-		return 0;
-	}
-
-    @Override
-    public String toString() {
-    	    return name;
-    }	
-	
-    public String toString(String baseURI, Map<String,String> prefixes) {
-    	return Helper.getAbbreviatedString(name, baseURI, prefixes);
-    }
-	
-}

Added: trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -0,0 +1,63 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.core.owl;
+
+import java.util.Map;
+
+import org.dllearner.utilities.Helper;
+
+/**
+ * Represents an atomic concept in a knowledge base / ontology, 
+ * e.g. "car", "person".
+ * 
+ * @author Jens Lehmann
+ *
+ */
+public class AtomicConcept extends Concept {
+
+    String name;
+    
+	public AtomicConcept(String name) {
+        this.name = name;
+    }    
+    
+    public String getName() {
+		return name;
+	}
+    
+	public int getLength() {
+		return 1;
+	}
+
+	@Override
+	public int getArity() {
+		return 0;
+	}
+
+    @Override
+    public String toString() {
+    	    return name;
+    }	
+	
+    public String toString(String baseURI, Map<String,String> prefixes) {
+    	return Helper.getAbbreviatedString(name, baseURI, prefixes);
+    }
+	
+}

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Axiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 public abstract class Axiom implements KBElement {
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Bottom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Concept.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Concept.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Concept.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.LinkedList;
 import java.util.List;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/ConceptAssertion.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Conjunction.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/DatatypeProperty.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/DatatypePropertyAssertion.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 /**
  * A datatype property assertion.

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Disjunction.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/DoubleDatatypePropertyAssertion.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Equality.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Equality.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Equality.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Exists.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Exists.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Exists.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/FlatABox.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/FlatABox.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/FlatABox.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/FunctionalRoleAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/GreaterEqual.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Inclusion.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Individual.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Individual.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Individual.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/InverseRoleAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/KB.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/KB.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/KB.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.HashSet;
 import java.util.Map;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/KBElement.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/LessEqual.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/MultiConjunction.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.List;
 import java.util.Map;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/MultiDisjunction.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.List;
 import java.util.Map;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Negation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Negation.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Negation.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/NumberRestriction.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 public abstract class NumberRestriction extends Concept {
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/ObjectProperty.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyAssertion.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyExpression.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 /**
  * An object property expression is an object property construct, which

Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyInverse.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -18,7 +18,7 @@
  *
  */
 
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Property.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Property.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Property.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 /**
  * @author Jens Lehmann

Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/PropertyAssertion.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 /**
  * @author Jens Lehmann

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Quantification.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 public abstract class Quantification extends Concept {
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/RBoxAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 public abstract class RBoxAxiom extends Axiom {
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/RoleHierarchy.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Set;
 import java.util.SortedSet;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/SubRoleAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/SubsumptionHierarchy.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Set;
 import java.util.SortedSet;

Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/SymmetricRoleAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/TerminologicalAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 public abstract class TerminologicalAxiom extends Axiom {
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/Top.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/Top.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Top.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/dl/TransitiveRoleAxiom.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -1,4 +1,4 @@
-package org.dllearner.core.dl;
+package org.dllearner.core.owl;
 
 import java.util.Map;
 

Modified: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -29,16 +29,16 @@
 import java.util.List;
 import java.util.Map;
 
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.DatatypeProperty;
-import org.dllearner.core.dl.DatatypePropertyAssertion;
-import org.dllearner.core.dl.DoubleDatatypePropertyAssertion;
-import org.dllearner.core.dl.ObjectProperty;
-import org.dllearner.core.dl.Axiom;
-import org.dllearner.core.dl.ConceptAssertion;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.KB;
-import org.dllearner.core.dl.ObjectPropertyAssertion;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Axiom;
+import org.dllearner.core.owl.ConceptAssertion;
+import org.dllearner.core.owl.DatatypeProperty;
+import org.dllearner.core.owl.DatatypePropertyAssertion;
+import org.dllearner.core.owl.DoubleDatatypePropertyAssertion;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.KB;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.ObjectPropertyAssertion;
 import org.dllearner.parser.ParseException;
 import org.dllearner.parser.PrologParser;
 import org.dllearner.prolog.Atom;

Modified: trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -45,8 +45,8 @@
 import org.dllearner.core.LearningProblem;
 import org.dllearner.core.ReasonerComponent;
 import org.dllearner.core.ReasoningService;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
 import org.dllearner.kb.OWLFile;
 import org.dllearner.learningproblems.PosOnlyDefinitionLP;
 import org.dllearner.reasoning.DIGReasoner;

Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -42,9 +42,9 @@
 import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.config.StringSetConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.ObjectProperty;
+import org.dllearner.core.owl.AtomicConcept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
 
 /**
  * WidgetPanelStringSet

Modified: trunk/src/dl-learner/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/KBFile.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/kb/KBFile.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -32,7 +32,7 @@
 import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
 import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.dl.KB;
+import org.dllearner.core.owl.KB;
 import org.dllearner.parser.KBParser;
 import org.dllearner.parser.ParseException;
 import org.dllearner.reasoning.DIGConverter;

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -43,7 +43,7 @@
 import org.dllearner.core.config.StringConfigOption;
 import org.dllearner.core.config.StringSetConfigOption;
 import org.dllearner.core.config.StringTupleListConfigOption;
-import org.dllearner.core.dl.KB;
+import org.dllearner.core.owl.KB;
 import org.dllearner.kb.sparql.configuration.SparqlEndpoint;
 import org.dllearner.kb.sparql.configuration.SparqlQueryType;
 import org.dllearner.parser.KBParser;

Modified: trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java	2008-02-11 17:41:10 UTC (rev 541)
@@ -23,10 +23,10 @@
 import java.util.SortedSet;
 import java.util.TreeMap;
 
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.core.dl.MultiConjunction;
-import org.dllearner.core.dl.MultiDisjunction;
+import org.dllearner.core.owl.Concept;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.MultiConjunction;
+import org.dllearner.core.owl.MultiDisjunction;
 import org.dllearner.utilities.ConceptComparator;
 import org.dllearner.utilities.Helper;
 import org.dllearner.utilities.SortedSetTuple;

Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java	2008-02-11 15:24:02 UTC (rev 540)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinit...
 
[truncated message content]