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

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

Revision: 903
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=903&view=rev
Author:   kurzum
Date:     2008-05-19 07:12:01 -0700 (Mon, 19 May 2008)

Log Message:
-----------
some more claenup

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
    trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java	2008-05-19 14:03:09 UTC (rev 902)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java	2008-05-19 14:12:01 UTC (rev 903)
@@ -290,10 +290,7 @@
 			Helper.checkConcepts(rs, allowedConcepts);
 			usedConcepts = allowedConcepts;
 		} else if(ignoredConcepts != null) {
-			//System.out.println(ignoredConcepts);
 			usedConcepts = Helper.computeConceptsUsingIgnoreList(rs, ignoredConcepts);
-			//RBC
-			//System.out.println(usedConcepts);
 		} else {
 			usedConcepts = Helper.computeConcepts(rs);
 		}

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java	2008-05-19 14:03:09 UTC (rev 902)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java	2008-05-19 14:12:01 UTC (rev 903)
@@ -279,8 +279,6 @@
 	
 	public void start() {
 		runtime=System.currentTimeMillis();
-		//RBC many comments can be removed
-		//SimpleClock sc =new SimpleClock();
 		// TODO: write a JUnit test for this problem (long-lasting or infinite loops because
 		// redundant children of a node are called recursively after when the node is extended
 		// twice)
@@ -361,16 +359,12 @@
 				lastPrintTime = currentTime;
 				logger.debug("--- loop " + loop + " started ---");				
 			}
-			//RBC
-			//logger.debug("--- loop " + loop + " started ---");
-			//printStatistics(false);
-			//sc.printAndSet("before Traverse");
+			
 			// traverse the current search tree to find a solution
 			if(useTreeTraversal && (currentTime - lastTreeTraversalTime > traversalInterval)) {
 				traverseTree();
 				lastTreeTraversalTime = System.nanoTime();
 			}
-			//sc.printAndSet("Traverse");
 			
 			// reduce candidates to focus on promising concepts
 			if(useCandidateReduction && (currentTime - lastReductionTime > reductionInterval)) {
@@ -379,7 +373,7 @@
 //				Logger.getRootLogger().setLevel(Level.TRACE);
 			}			
 			
-			//sc.printAndSet("candidates");
+			
 //			System.out.println("next expanded: " + candidates.last().getShortDescription(nrOfPositiveExamples, nrOfNegativeExamples, baseURI));			
 			// chose best node according to heuristics
 			bestNode = candidates.last();
@@ -394,7 +388,7 @@
 			candidates.addAll(newCandidates);
 			candidatesStable.addAll(newCandidates);		
 			
-			//sc.printAndSet("after candidates");
+		
 //			System.out.println("done");			
 			
 			if(writeSearchTree) {
@@ -415,7 +409,7 @@
 				else
 					Files.appendFile(searchTreeFile, treeString);
 			}
-			//sc.printAndSet("before posonly");
+			
 			// special situation for positive only learning: the expanded node can become a solution (see explanations
 			// for maxPosOnlyExpansion above)
 			if(posOnly && (bestNode.getHorizontalExpansion() - bestNode.getConcept().getLength() >= maxPosOnlyExpansion)) {
@@ -432,15 +426,10 @@
 				}
 			}
 			
-			//sc.printAndSet("before stopping");
+		
 			// handle termination criteria
 			handleStoppingConditions();
-			//sc.printAndSet("after stopping");
 			
-			//logger.info(minExecutionTimeReached()+"aaaaaaa "+solutions.size()+"::"+guaranteeXgoodDescriptions);
-			//logger.info(solutionFound+"aaaaaaa "+stop);
-			
-			
 			// Anzahl Schleifendurchläufe
 			loop++;
 			
@@ -1118,6 +1107,7 @@
 	
 	
 	public void printBestSolutions(int nrOfSolutions, boolean showOrderedSolutions){
+		//QUALITY
 		if(!logger.isTraceEnabled())
 			return;
 		//if(!logger.getLevel().toString().equalsIgnoreCase("TRACE"))return;
@@ -1132,19 +1122,8 @@
 			i++;
 		}
 		
-		if(nrOfSolutions==0)
-			nrOfSolutions=solutions.size();
-		int a=0;
-		for(;a<nrOfSolutions && a < solutions.size();a++) {
-			
-			logger.trace("nnn: "+solutions.get(a));
-			if(a==nrOfSolutions)
-				break ;
-			
-		}
 		
 		
-		
 		if(showOrderedSolutions) {
 			logger.trace("ordered by generality (most special solutions first):");
 			SubsumptionComparator sc = new SubsumptionComparator(rs);


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