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

[<ku...@us...>]

Revision: 2072
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2072&view=rev
Author:   kurzum
Date:     2010-02-19 19:49:23 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java
    trunk/src/dl-learner/org/dllearner/utilities/experiments/ExMakerRandomizer.java

Modified: trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java	2010-02-19 19:20:13 UTC (rev 2071)
+++ trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java	2010-02-19 19:49:23 UTC (rev 2072)
@@ -136,6 +136,8 @@
 		SortedSet<String> positives = read(passiveNoZU);
 		SortedSet<String> negatives = read(active);
 
+		
+		
 		// removing overlap
 		positives.removeAll(negatives);
 		negatives.removeAll(positives);
@@ -180,10 +182,14 @@
 	public static void passiveWithZu() {
 		SortedSet<String> positives = read(passiveWithZu);
 		SortedSet<String> negatives = read(active);
+		negatives.addAll(read(passiveNoZU));
 
+		SortedSet<String> positivesTMP = new TreeSet<String>();
+		positivesTMP.addAll(positives);
+		
 		// removing overlap
 		positives.removeAll(negatives);
-		negatives.removeAll(positives);
+		negatives.removeAll(positivesTMP);
 
 		Examples allExamples = new Examples();
 		allExamples.addPosTrain(positives);
@@ -205,6 +211,7 @@
 //		
 		/*CLEANUP*/
 		positives = null;
+		positivesTMP = null;
 		negatives = null;
 		allExamples = null;
 

Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/ExMakerRandomizer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/ExMakerRandomizer.java	2010-02-19 19:20:13 UTC (rev 2071)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/ExMakerRandomizer.java	2010-02-19 19:49:23 UTC (rev 2072)
@@ -67,6 +67,11 @@
 		int sizeOfPosTestSet = examples.sizeTotalOfPositives()-sizeOfPosTrainingSet;
 		int sizeOfNegTestSet = examples.sizeTotalOfNegatives()-sizeOfNegTrainingSet;
 		
+//		System.out.println(sizeOfPosTrainingSet);
+//		System.out.println(sizeOfNegTrainingSet);
+//		System.out.println(sizeOfPosTestSet);
+//		System.out.println(sizeOfNegTestSet);
+		
 		List<String> posRemaining =  new ArrayList<String>(examples.getPositiveExamples());
 		List<String> negRemaining  = new ArrayList<String>(examples.getNegativeExamples());
 	
@@ -75,11 +80,11 @@
 		for (int i = 0; i < posRemaining.size(); i++) {
 			String one = posRemaining.get(i);
 			if(ret.getPosTrain().size()>sizeOfPosTrainingSet){
-				ret.addPosTrain(one);
+				ret.addPosTest(one);
 				continue;
 			}
 			if(ret.getPosTest().size()>sizeOfPosTestSet){
-				ret.addPosTest(one);
+				ret.addPosTrain(one);
 				continue;
 			}
 			
@@ -93,11 +98,11 @@
 		for (int i = 0; i < negRemaining.size(); i++) {
 			String one = negRemaining.get(i);
 			if(ret.getNegTrain().size()>sizeOfNegTrainingSet){
-				ret.addNegTrain(one);
+				ret.addNegTest(one);
 				continue;
 			}
 			if(ret.getNegTest().size()>sizeOfNegTestSet){
-				ret.addNegTest(one);
+				ret.addNegTrain(one);
 				continue;
 			}
 			


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