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

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

Revision: 4266
          http://sourceforge.net/p/dl-learner/code/4266
Author:   lorenz_b
Date:     2014-05-08 18:19:32 +0000 (Thu, 08 May 2014)
Log Message:
-----------
Extended CV script.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/QTL2Disjunctive.java
    trunk/scripts/src/main/java/org/dllearner/scripts/NestedCrossValidation.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/QTL2Disjunctive.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/QTL2Disjunctive.java	2014-05-08 14:40:15 UTC (rev 4265)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/QTL2Disjunctive.java	2014-05-08 18:19:32 UTC (rev 4266)
@@ -110,7 +110,7 @@
 	
 	private double minCoveredPosExamplesFraction = 0.2;
 	// maximum execution time to compute a part of the solution
-	private double maxTreeComputationTimeInSeconds = 60;
+	private double maxTreeComputationTimeInSeconds = 10;
 	// how important not to cover negatives
 	private double posWeight = 2;
 	// minimum score a query tree must have to be part of the solution

Modified: trunk/scripts/src/main/java/org/dllearner/scripts/NestedCrossValidation.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/NestedCrossValidation.java	2014-05-08 14:40:15 UTC (rev 4265)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/NestedCrossValidation.java	2014-05-08 18:19:32 UTC (rev 4266)
@@ -334,9 +334,9 @@
 //					double negErrorRate = 100*(negError.size()/posTest.size());
 					
 					double accuracy = 100*((double)(posCorrect.size()+negCorrect.size())/(posTest.size()+negTest.size()));
-					double precision = 100 * (double) posCorrect.size() / (posCorrect.size() + negError.size());
-					double recall = 100 * (double) posCorrect.size() / (posCorrect.size() + posError.size());
-					double fmeasure = 2 * (precision * recall) / (precision + recall);
+					double precision = 100 * (double) posCorrect.size() / (posCorrect.size() + negError.size()) == 0 ? 0 : (posCorrect.size() + negError.size());
+					double recall = 100 * (double) posCorrect.size() / (posCorrect.size() + posError.size()) == 0 ? 0 : (posCorrect.size() + posError.size());
+					double fmeasure = 2 * (precision * recall) / (precision + recall) == 0 ? 0 : (precision + recall);
 					
 					paraCriterionStat.addNumber(accuracy);
 					

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