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

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

Revision: 585
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=585&view=rev
Author:   jenslehmann
Date:     2008-02-17 01:48:24 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
maybe fix of #1888650

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
    trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java

Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java	2008-02-17 09:37:42 UTC (rev 584)
+++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java	2008-02-17 09:48:24 UTC (rev 585)
@@ -65,6 +65,8 @@
     private Integer maxLength = 7;
     private String returnType;
     
+    private boolean stop = false;
+    
     // list of all generated concepts sorted by length
     private Map<Integer,List<Description>> generatedDefinitions = new HashMap<Integer,List<Description>>();
     
@@ -126,6 +128,9 @@
         for(int i=1; i<=maxLength; i++)
             generatePrograms(i);
         
+        if(stop)
+        	return;
+        	
         long generationTime = System.currentTimeMillis() - generationStartTime;
         System.out.println("OK (" + generationTime + " ms)");
         
@@ -155,11 +160,15 @@
         Score tmp;
         double score;
         
-        for(int i=1; i<=maxLength; i++) {
+        for(int i=1; i<=maxLength && !stop; i++) {
             long startTime = System.currentTimeMillis();
             System.out.print("Testing definitions of length " + i + " ... ");
             count = 0;
             for(Description program : generatedDefinitions.get(i)) {
+            	// stop testing further when algorithm is stopped
+            	if(stop)
+            		break;
+            	
             	// if a return type is already given an appropriate tree is 
             	// generated here
             	Description newRoot;
@@ -274,6 +283,7 @@
 
 	@Override
 	public void stop() {
+		stop = true;
 	}
 
 }

Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java	2008-02-17 09:37:42 UTC (rev 584)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java	2008-02-17 09:48:24 UTC (rev 585)
@@ -25,55 +25,49 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.Vector;
 
-import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.apache.log4j.spi.LoggerRepository;
 import org.dllearner.core.KnowledgeSource;
 import org.dllearner.core.ReasonerComponent;
 import org.dllearner.core.config.ConfigEntry;
 import org.dllearner.core.config.ConfigOption;
 import org.dllearner.core.config.InvalidConfigOptionValueException;
 import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.owl.ObjectAllRestriction;
 import org.dllearner.core.owl.AssertionalAxiom;
-import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Nothing;
-import org.dllearner.core.owl.Description;
 import org.dllearner.core.owl.ClassAssertionAxiom;
+import org.dllearner.core.owl.Description;
 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.InverseObjectPropertyAxiom;
 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.PropertyAxiom;
 import org.dllearner.core.owl.ObjectPropertyHierarchy;
+import org.dllearner.core.owl.ObjectSomeRestriction;
+import org.dllearner.core.owl.PropertyAxiom;
+import org.dllearner.core.owl.SubClassAxiom;
 import org.dllearner.core.owl.SubObjectPropertyAxiom;
 import org.dllearner.core.owl.SubsumptionHierarchy;
 import org.dllearner.core.owl.SymmetricObjectPropertyAxiom;
 import org.dllearner.core.owl.TerminologicalAxiom;
 import org.dllearner.core.owl.Thing;
 import org.dllearner.core.owl.TransitiveObjectPropertyAxiom;
+import org.dllearner.core.owl.Union;
 import org.dllearner.kb.OWLFile;
 import org.dllearner.utilities.ConceptComparator;
-import org.dllearner.utilities.Logging;
 import org.dllearner.utilities.RoleComparator;
 import org.semanticweb.owl.apibinding.OWLManager;
 import org.semanticweb.owl.inference.OWLReasoner;


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