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

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

Revision: 3410
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3410&view=rev
Author:   jenslehmann
Date:     2011-11-16 18:36:22 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
some fixes for fuzzy learning

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
    trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java
    trunk/components-core/src/main/java/org/dllearner/core/LearningAlgorithm.java
    trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLPStandard.java

Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java	2011-11-16 17:42:42 UTC (rev 3409)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java	2011-11-16 18:36:22 UTC (rev 3410)
@@ -42,6 +42,7 @@
 import org.dllearner.utilities.owl.AxiomComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
@@ -53,6 +54,7 @@
  */
 public abstract class AbstractAxiomLearningAlgorithm extends AbstractComponent implements AxiomLearningAlgorithm{
 	
+	protected LearningProblem learningProblem;
 	private static final Logger logger = LoggerFactory.getLogger(AbstractAxiomLearningAlgorithm.class);
 	
 	@ConfigOption(name="maxExecutionTimeInSeconds", defaultValue="10", description="", propertyEditorClass=IntegerEditor.class)
@@ -75,6 +77,16 @@
 		existingAxioms = new TreeSet<Axiom>(new AxiomComparator());
 	}
 	
+	@Override
+    public LearningProblem getLearningProblem() {
+        return learningProblem;
+    }
+
+    @Autowired
+    @Override
+    public void setLearningProblem(LearningProblem learningProblem) {
+        this.learningProblem = learningProblem;
+    }	
 	
 	ExtendedQueryEngineHTTP queryExecution;
 	

Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java	2011-11-16 17:42:42 UTC (rev 3409)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java	2011-11-16 18:36:22 UTC (rev 3410)
@@ -283,13 +283,15 @@
      * The learning problem variable, which must be used by
      * all learning algorithm implementations.
      */
+	@Override
     public AbstractLearningProblem getLearningProblem() {
         return learningProblem;
     }
 
     @Autowired
-    public void setLearningProblem(AbstractLearningProblem learningProblem) {
-        this.learningProblem = learningProblem;
+    @Override
+    public void setLearningProblem(LearningProblem learningProblem) {
+        this.learningProblem = (AbstractLearningProblem) learningProblem;
     }
 
     /**

Modified: trunk/components-core/src/main/java/org/dllearner/core/LearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/LearningAlgorithm.java	2011-11-16 17:42:42 UTC (rev 3409)
+++ trunk/components-core/src/main/java/org/dllearner/core/LearningAlgorithm.java	2011-11-16 18:36:22 UTC (rev 3410)
@@ -19,7 +19,9 @@
 
 package org.dllearner.core;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+
 /**
  * Basic interface for all DL-Learner learning algorithms.
  * 
@@ -34,4 +36,17 @@
 	 */
 	public abstract void start();	
 	
+	/**
+	 * Get underlying learning problem.
+	 * @return Underlying learning problem.
+	 */
+    public LearningProblem getLearningProblem();
+
+    /**
+     * Set the learning problem, which the algorithm should solve.
+     * @param learningProblem The learning problem to solve.
+     */
+    @Autowired
+    public void setLearningProblem(LearningProblem learningProblem);
+	
 }

Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLPStandard.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLPStandard.java	2011-11-16 17:42:42 UTC (rev 3409)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLPStandard.java	2011-11-16 18:36:22 UTC (rev 3410)
@@ -91,7 +91,9 @@
 //		approxDelta = configurator.getApproxAccuracy();
 		
 		String accM = getAccuracyMethod();
-		if(accM.equals("standard")) {
+		if(accM == null) {
+			heuristic = HeuristicType.FMEASURE; // use F-Measure by default
+		} else if(accM.equals("standard")) {
 			heuristic = HeuristicType.AMEASURE;
 		} else if(accM.equals("fmeasure")) {
 			heuristic = HeuristicType.FMEASURE;

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