[DL-Learner SVN] SF.net SVN: dl-learner:[3103] trunk

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

Revision: 3103
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3103&view=rev
Author:   jenslehmann
Date:     2011-08-23 16:10:09 +0000 (Tue, 23 Aug 2011)

Log Message:
-----------
further changes related to the previous commit

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/QTL.java
    trunk/interfaces/src/main/java/org/dllearner/cli/Start.java
    trunk/interfaces/src/main/java/org/dllearner/server/nke/Learner.java
    trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
    trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/OntologyEngineering.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java	2011-08-23 16:05:46 UTC (rev 3102)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java	2011-08-23 16:10:09 UTC (rev 3103)
@@ -257,6 +257,14 @@
 		return bestEvaluatedDescriptions.getSet().last();
 	}	
 	
+	public boolean isInstanceBasedDisjoints() {
+		return instanceBasedDisjoints;
+	}
+
+	public void setInstanceBasedDisjoints(boolean instanceBasedDisjoints) {
+		this.instanceBasedDisjoints = instanceBasedDisjoints;
+	}
+
 	@Override
 	public TreeSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
 		return bestEvaluatedDescriptions.getSet();

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/QTL.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/QTL.java	2011-08-23 16:05:46 UTC (rev 3102)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/QTL.java	2011-08-23 16:10:09 UTC (rev 3103)
@@ -115,7 +115,6 @@
 		return options;
 	}
 	
-	@Override
 	public Configurator getConfigurator() {
 		return null;
 	}

Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Start.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Start.java	2011-08-23 16:05:46 UTC (rev 3102)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Start.java	2011-08-23 16:10:09 UTC (rev 3103)
@@ -695,7 +695,7 @@
 		// components
 		String message = "OK";
 		if (component instanceof KBFile)
-			message = ((KBFile) component).getURL().toString() + " read";
+			message = ((KBFile) component).getUrl().toString() + " read";
 		else if (component instanceof DIGReasoner) {
 			DIGReasoner reasoner = (DIGReasoner) component;
 			message = "using " + reasoner.getIdentifier() + " connected via DIG 1.1 at "

Modified: trunk/interfaces/src/main/java/org/dllearner/server/nke/Learner.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/server/nke/Learner.java	2011-08-23 16:05:46 UTC (rev 3102)
+++ trunk/interfaces/src/main/java/org/dllearner/server/nke/Learner.java	2011-08-23 16:10:09 UTC (rev 3103)
@@ -92,7 +92,7 @@
 
             ELLearningAlgorithm la = cm.learningAlgorithm(ELLearningAlgorithm.class, lp, rc);
 
-            la.getConfigurator().setInstanceBasedDisjoints(false);
+            la.setInstanceBasedDisjoints(false);
 //        CELOE la = cm.learningAlgorithm(CELOE.class, lp, rc);
             la.init();
             log.debug("Running learning algorithm");

Modified: trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EvaluationComputingScript.java	2011-08-23 16:05:46 UTC (rev 3102)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EvaluationComputingScript.java	2011-08-23 16:10:09 UTC (rev 3103)
@@ -163,7 +163,7 @@
 		ComponentManager cm = ComponentManager.getInstance();
 		// initialize KnowledgeSource
 		ks = cm.knowledgeSource(OWLFile.class);
-		ks.getConfigurator().setUrl(ontologyURI.toURL());
+		ks.setURL(ontologyURI.toURL());
 		ks.init();
 			
 		System.out.println("Loaded ontology " + ontologyURI + ".");

Modified: trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/OntologyEngineering.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/OntologyEngineering.java	2011-08-23 16:05:46 UTC (rev 3102)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/OntologyEngineering.java	2011-08-23 16:10:09 UTC (rev 3103)
@@ -103,10 +103,10 @@
 		// load OWL in reasoner
 		OWLFile ks = cm.knowledgeSource(OWLFile.class);
 		if(args[0].startsWith("http")) {
-			ks.getConfigurator().setUrl(new URL(args[0]));
+			ks.setURL(new URL(args[0]));
 		} else {
 			File owlFile = new File(args[0]);
-			ks.getConfigurator().setUrl(owlFile.toURI().toURL());
+			ks.setURL(owlFile.toURI().toURL());
 		}
 		ks.init();
 		AbstractReasonerComponent reasoner = null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.