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

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

Revision: 860
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=860&view=rev
Author:   kurzum
Date:     2008-05-15 15:36:48 -0700 (Thu, 15 May 2008)

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


Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
    trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java
    trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
    trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java
    trunk/src/dl-learner/org/dllearner/utilities/Statistics.java

Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java	2008-05-15 22:07:25 UTC (rev 859)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java	2008-05-15 22:36:48 UTC (rev 860)
@@ -1061,8 +1061,10 @@
 	
 	
 	public void printBestSolutions(int nrOfSolutions, boolean showOrderedSolutions){
+		System.out.println("alogger is "+logger.isTraceEnabled()+"||");
 		if(!logger.isTraceEnabled())
 			return;
+		System.out.println("blogger is "+logger.isTraceEnabled()+"||");
 //		if(!logger.getLevel().toString().equalsIgnoreCase("TRACE"))return;
 		if(nrOfSolutions==0)
 			nrOfSolutions=candidatesStable.size();

Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java	2008-05-15 22:07:25 UTC (rev 859)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java	2008-05-15 22:36:48 UTC (rev 860)
@@ -75,10 +75,15 @@
 			// schauen, ob es mehrere allgemeinere Nachbarn gibt
 			SortedSet<Description> moreGeneral = subsumptionHierarchyUp.get(c);
 			//RBC  //HACK
-			if(moreGeneral != null && moreGeneral.size()>0) {
+			//if(moreGeneral != null && moreGeneral.size()>0) {
+			if(moreGeneral != null ) {
 				//System.out.println(moreGeneral);
-				Description chosenParent = moreGeneral.first();
-				hierarchyDownNew.get(chosenParent).add(c);
+				if(moreGeneral.size()==0) { 
+					hierarchyDownNew.get(new Thing()).add(c);
+				}else {
+					Description chosenParent = moreGeneral.first();
+					hierarchyDownNew.get(chosenParent).add(c);
+				}
 			}
 		}	
 		
@@ -86,9 +91,16 @@
 		for(Description c : allowedConceptsInSubsumptionHierarchy) {
 			SortedSet<Description> moreSpecial = subsumptionHierarchyDown.get(c);
 			//RBC //HACK
-			if(moreSpecial != null && moreSpecial.size()>0) {
-				Description chosenParent = moreSpecial.first();
-				hierarchyUpNew.get(chosenParent).add(c);
+			//if(moreSpecial != null && moreSpecial.size()>0) {
+			if(moreSpecial != null ) {
+				if(moreSpecial.size()==0){
+					hierarchyUpNew.get(new Nothing()).add(c);
+				}
+				else {
+					Description chosenParent = moreSpecial.first();
+					hierarchyUpNew.get(chosenParent).add(c);
+				}
+				
 			}
 		}		
 

Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java	2008-05-15 22:07:25 UTC (rev 859)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java	2008-05-15 22:36:48 UTC (rev 860)
@@ -112,6 +112,7 @@
 		
 			for(recursiondepth=0;recursiondepth<4;recursiondepth++) {
 				
+				Statistics.setCurrentLabel(recursiondepth+"");
 				printProgress(concount, concepts.size(),recursiondepth, oneConcept,total.getTime());
 				/*if(i==0){;}
 				else if(closeAfterRecursion) {
@@ -125,7 +126,7 @@
 				
 				Statistics.print(number);
 				
-				System.out.println("currently at label "+Statistics.getCurrentLabel()+"||i: "+recursiondepth);
+				//System.out.println("currently at label "+Statistics.getCurrentLabel()+"||i: "+recursiondepth);
 				
 				LearnSparql ls = new LearnSparql();
 				TreeSet<String> igno = new TreeSet<String>();

Modified: trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java	2008-05-15 22:07:25 UTC (rev 859)
+++ trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java	2008-05-15 22:36:48 UTC (rev 860)
@@ -83,7 +83,7 @@
 		cm.applyConfigEntry(la,"maxExecutionTimeInSeconds",20);
 		
 		//cm.applyConfigEntry(la,"guaranteeXgoodDescriptions",999999);
-		cm.applyConfigEntry(la,"logLevel","TRACE");
+		cm.applyConfigEntry(la,"logLevel","DEBUG");
 		
 		//cm.applyConfigEntry(la,"quiet",false);
 		//System.out.println(ignoredConcepts.first());;
@@ -95,6 +95,7 @@
 		sc.setTime();
 		la.start();
 		Statistics.addTimeLearning(sc.getTime());
+		
 		if(sc.getTime()/1000 >= 20)System.out.println("XXXMAX time reached");
 		
 		//System.out.println("best"+la(20));

Modified: trunk/src/dl-learner/org/dllearner/utilities/Statistics.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/Statistics.java	2008-05-15 22:07:25 UTC (rev 859)
+++ trunk/src/dl-learner/org/dllearner/utilities/Statistics.java	2008-05-15 22:36:48 UTC (rev 860)
@@ -37,6 +37,7 @@
 		else {
 			timeCollecting.put(currentLabel, new Long(current.longValue()+value));
 		}
+		
 	}
 	
 	public static void addTimeLearning(long value) {
@@ -85,6 +86,7 @@
 		printInt(numberOfSparqlQueries,"total queries\t");
 		
 		
+		
 		//printIntAVG(numberOfTriples,number,"triples avg\t");
 		
 		
@@ -187,6 +189,7 @@
 		
 		 numberOfSparqlQueries = new HashMap<String, Integer>();
 		 numberOfCachedSparqlQueries = new HashMap<String, Integer>();
+		 System.out.println("xxxRESET");
 		
 	}
 	


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