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

[<ji...@us...>]

Revision: 3418
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3418&view=rev
Author:   jialva
Date:     2011-11-18 15:35:17 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Going on deleting "positive" and "negative" examples references for DL-Learner fuzzy extension.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java
    trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java
    trunk/test/fuzzydll/fuzzytrains.conf

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java	2011-11-18 10:26:51 UTC (rev 3417)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java	2011-11-18 15:35:17 UTC (rev 3418)
@@ -384,9 +384,11 @@
 		// changed by Josue
 		} else if (learningProblem instanceof PosNegLP) {
 			examples = Helper.union(((PosNegLP)learningProblem).getPositiveExamples(),((PosNegLP)learningProblem).getNegativeExamples());
-		} else if (learningProblem instanceof FuzzyPosNegLP) {
-			examples = Helper.union(((FuzzyPosNegLP)learningProblem).getPositiveExamples(),((FuzzyPosNegLP)learningProblem).getNegativeExamples());
-		}
+		} 
+		// commented by Josue as now there's no need of + and - examples (more code need to be deleted in this sense)
+		// else if (learningProblem instanceof FuzzyPosNegLP) {
+			//examples = Helper.union(((FuzzyPosNegLP)learningProblem).getPositiveExamples(),((FuzzyPosNegLP)learningProblem).getNegativeExamples());
+		// }
 	}
 
 	@Override

Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java	2011-11-18 10:26:51 UTC (rev 3417)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/FuzzyPosNegLP.java	2011-11-18 15:35:17 UTC (rev 3418)
@@ -176,7 +176,8 @@
 	 */
 	@Override
 	public void init() {
-		allExamples = Helper.union(positiveExamples, negativeExamples);
+		// commented by Josue as now there's no need of + and - examples (more code need to be deleted in this sense)
+		// allExamples = Helper.union(positiveExamples, negativeExamples);
 	}
 	
 	public SortedSet<Individual> getNegativeExamples() {

Modified: trunk/test/fuzzydll/fuzzytrains.conf
===================================================================
--- trunk/test/fuzzydll/fuzzytrains.conf	2011-11-18 10:26:51 UTC (rev 3417)
+++ trunk/test/fuzzydll/fuzzytrains.conf	2011-11-18 15:35:17 UTC (rev 3418)
@@ -19,7 +19,7 @@
 lp.type = "fuzzyPosNeg"
 lp.positiveExamples = { "ex:east1", "ex:east2" }
 lp.negativeExamples = { "ex:west6", "ex:west7" }
-lp.fuzzyEx = [("ex:west6",0.0),("ex:west7",0.0)]
+lp.fuzzyEx = [("ex:east1",1.0),("ex:east2",1.0),("ex:west6",0.0),("ex:west7",0.0)]
 
 // create learning algorithm to run
 alg.type = "Fuzzy CELOE"

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