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

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

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

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


Modified Paths:
--------------
    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/scripts/SPARQLExtractionEvaluation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java	2008-05-15 16:54:43 UTC (rev 853)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java	2008-05-15 19:24:02 UTC (rev 854)
@@ -93,8 +93,11 @@
 			
 			poslimit+=5;
 			neglimit+=5;
-		
+			System.out.println("XXX examplesize "+(poslimit+neglimit));
+			int concount=0;
 		for (String oneConcept : concepts) {
+			System.out.println("XXX "+concount+" of "+concepts.size()+""+oneConcept);concount++;
+			
 			int recursiondepth=0;
 			boolean closeAfterRecursion=true;
 			
@@ -106,7 +109,8 @@
 			posExamples = ae.getPosExamples();
 			negExamples = ae.getNegExamples();
 		
-			for(recursiondepth=0;recursiondepth<5;recursiondepth++) {
+			for(recursiondepth=0;recursiondepth<4;recursiondepth++) {
+				System.out.println("XXX recursiondepth "+recursiondepth+" con "+oneConcept);
 				
 				/*if(i==0){;}
 				else if(closeAfterRecursion) {
@@ -138,17 +142,18 @@
 		}
 		Statistics.print(number);
 		String pre="log/gnu_";
-		String comment1="# "+poslimit+neglimit+"examples\n";
-		String f1=pre+"1avgtrip_"+poslimit+neglimit+"example"+concepts.size()+"classes";
+		int examples=poslimit+neglimit;
+		String comment1="# "+examples+"examples\n";
+		String f1=pre+"1avgtrip_"+examples+"example"+concepts.size()+"classes";
 		writeToFile(f1, comment1+Statistics.getAVGTriplesForRecursionDepth(number));
-		String comment2="# "+poslimit+neglimit+"examples\n";
-		String f2=pre+"2avgTimeExtraction_"+poslimit+neglimit+"example"+concepts.size()+"classes";
+		String comment2="# "+examples+"examples\n";
+		String f2=pre+"2avgTimeExtraction_"+examples+"example"+concepts.size()+"classes";
 		writeToFile(f2, comment2+Statistics.getAVGTimeCollecting(number));
-		String comment3="# "+poslimit+neglimit+"examples\n";
-		String f3=pre+"2avgTimeLearning_"+poslimit+neglimit+"example"+concepts.size()+"classes";
+		String comment3="# "+examples+"examples\n";
+		String f3=pre+"2avgTimeLearning_"+examples+"example"+concepts.size()+"classes";
 		writeToFile(f3, comment3+Statistics.getAVGTimeLearning(number));
+		Statistics.reset();
 		
-		
 		}//outer
 	}
 	

Modified: trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java	2008-05-15 16:54:43 UTC (rev 853)
+++ trunk/src/dl-learner/org/dllearner/utilities/LearnSparql.java	2008-05-15 19:24:02 UTC (rev 854)
@@ -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));
 		//((ExampleBasedROLComponent)la).printBestSolutions(10000);

Modified: trunk/src/dl-learner/org/dllearner/utilities/Statistics.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/Statistics.java	2008-05-15 16:54:43 UTC (rev 853)
+++ trunk/src/dl-learner/org/dllearner/utilities/Statistics.java	2008-05-15 19:24:02 UTC (rev 854)
@@ -178,6 +178,17 @@
 		return currentLabel;
 	}
 	
+	public static void reset(){
+		currentLabel="";
+		order = new LinkedList<String>();
+		 numberOfTriples = new HashMap<String, Integer>();
+		timeCollecting = new HashMap<String, Long>();
+		timeLearning = new HashMap<String, Long>();
+		
+		 numberOfSparqlQueries = new HashMap<String, Integer>();
+		 numberOfCachedSparqlQueries = new HashMap<String, Integer>();
+		
+	}
 	
 	//stats
 	


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