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

[<lor...@us...>]

Revision: 3839
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3839&view=rev
Author:   lorenz_b
Date:     2012-08-30 13:47:49 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Fixed bug. Storing metrics to explain accuracy score.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
    trunk/components-core/src/main/java/org/dllearner/learningproblems/AxiomScore.java
    trunk/components-core/src/main/java/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java

Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java	2012-08-27 12:13:42 UTC (rev 3838)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java	2012-08-30 13:47:49 UTC (rev 3839)
@@ -414,7 +414,7 @@
 	
 		double confidence = confidenceInterval[1] - confidenceInterval[0];
 		
-		return new AxiomScore(accuracy, confidence);
+		return new AxiomScore(accuracy, confidence, total, success, total-success);
 	}
 	
 	protected double accuracy(int total, int success){

Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/AxiomScore.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/AxiomScore.java	2012-08-27 12:13:42 UTC (rev 3838)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/AxiomScore.java	2012-08-30 13:47:49 UTC (rev 3839)
@@ -27,13 +27,26 @@
 	private double accuracy;
 	private double confidence;
 	
+	private int totalNrOfExamples;
+	private int nrOfpositiveExamples;
+	private int nrOfnegativeExamples;
+	
 	public AxiomScore(double accuracy) {
 		this.accuracy = accuracy;
 	}
 	
 	public AxiomScore(double accuracy, double confidence) {
 		this.accuracy = accuracy;
+		this.confidence = confidence;
 	}
+	
+	public AxiomScore(double accuracy, double confidence, int totalNrOfExamples, int nrOfpositiveExamples, int nrOfnegativeExamples) {
+		this.accuracy = accuracy;
+		this.confidence = confidence;
+		this.totalNrOfExamples = totalNrOfExamples;
+		this.nrOfpositiveExamples = nrOfpositiveExamples;
+		this.nrOfnegativeExamples = nrOfnegativeExamples;
+	}
 
 	@Override
 	public double getAccuracy() {
@@ -43,5 +56,17 @@
 	public double getConfidence(){
 		return confidence;
 	}
+	
+	public int getTotalNrOfExamples() {
+		return totalNrOfExamples;
+	}
+	
+	public int getNrOfpositiveExamples() {
+		return nrOfpositiveExamples;
+	}
+	
+	public int getNrOfnegativeExamples() {
+		return nrOfnegativeExamples;
+	}
 
 }

Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java	2012-08-27 12:13:42 UTC (rev 3838)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java	2012-08-30 13:47:49 UTC (rev 3839)
@@ -35,6 +35,7 @@
 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.ObjectExactCardinalityRestriction;
 import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
 import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
@@ -134,7 +135,7 @@
 				getIRI().toString());
 		description.getFiller().accept(this);
 		Description d = stack.pop();
-		stack.push(new ObjectSomeRestriction(role, d));		
+		stack.push(new ObjectAllRestriction(role, d));		
 	}
 
 	@Override

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