[DL-Learner SVN] SF.net SVN: dl-learner:[3110] trunk/components-core/src/main/java/org/ dllearner

[<sha...@us...>]

Revision: 3110
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3110&view=rev
Author:   shadowtm
Date:     2011-08-24 11:12:08 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Added back constructors that were in use by the Start program.  Also added default initialization in case teh OWLAPIReasoner wasn't working.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLP.java
    trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java
    trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java

Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLP.java	2011-08-24 10:48:36 UTC (rev 3109)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLP.java	2011-08-24 11:12:08 UTC (rev 3110)
@@ -20,6 +20,7 @@
 package org.dllearner.learningproblems;
 
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.dllearner.core.AbstractLearningProblem;
 import org.dllearner.core.AbstractReasonerComponent;
@@ -36,9 +37,9 @@
  */
 public abstract class PosNegLP extends AbstractLearningProblem {
 	
-	protected Set<Individual> positiveExamples;
-	protected Set<Individual> negativeExamples;
-	protected Set<Individual> allExamples;
+	protected Set<Individual> positiveExamples = new TreeSet<Individual>();
+	protected Set<Individual> negativeExamples = new TreeSet<Individual>();
+	protected Set<Individual> allExamples = new TreeSet<Individual>();
 
     @org.dllearner.core.config.ConfigOption(name = "useRetrievalForClassification", description = "\"Specifies whether to use retrieval or instance checks for testing a concept. - NO LONGER FULLY SUPPORTED.",defaultValue = "false", propertyEditorClass = BoolEditor.class)
     private boolean useRetrievalForClassification = false;

Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java	2011-08-24 10:48:36 UTC (rev 3109)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java	2011-08-24 11:12:08 UTC (rev 3110)
@@ -72,6 +72,10 @@
 	public PosNegLPStandard() {
 	}
 
+    public PosNegLPStandard(AbstractReasonerComponent reasoningService){
+        super(reasoningService);
+    }
+
 	public PosNegLPStandard(AbstractReasonerComponent reasoningService, SortedSet<Individual> positiveExamples, SortedSet<Individual> negativeExamples) {
 		this.setReasoner(reasoningService);
 		this.positiveExamples = positiveExamples;

Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java	2011-08-24 10:48:36 UTC (rev 3109)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java	2011-08-24 11:12:08 UTC (rev 3110)
@@ -152,6 +152,10 @@
 	@Override
 	public void init() throws ComponentInitException {
 
+        if(rc == null){
+            rc = new OWLAPIReasoner(sources);
+            rc.init();
+        }
 //		try {
 			atomicConcepts = rc.getNamedClasses();
 			datatypeProperties = rc.getDatatypeProperties();

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