[DL-Learner SVN] SF.net SVN: dl-learner:[3342] trunk/components-ext/src

[<lor...@us...>]

Revision: 3342
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3342&view=rev
Author:   lorenz_b
Date:     2011-10-31 09:29:27 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Changed eval pdf header.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/LatexWriter.java
    trunk/components-ext/src/main/resources/tbsl/evaluation/praeambel.tex
    trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/Evaluation.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/LatexWriter.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/LatexWriter.java	2011-10-30 11:45:33 UTC (rev 3341)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/util/LatexWriter.java	2011-10-31 09:29:27 UTC (rev 3342)
@@ -124,10 +124,12 @@
 		
 	}
 	
-	public void write(String file){
+	public void write(String file, String time, int correctAnswers){
 		endSummaryTable();
 		StringBuilder latex = new StringBuilder();
 		latex.append(loadPraeambel());
+		latex.append("\\subtitle{" + time + "}\n");
+		latex.append("\\author{Correct answers:" + correctAnswers + "}\n");
 		latex.append("\\begin{document}");
 		latex.append("\\maketitle\n");
 		latex.append("\\newpage\n");

Modified: trunk/components-ext/src/main/resources/tbsl/evaluation/praeambel.tex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/evaluation/praeambel.tex	2011-10-30 11:45:33 UTC (rev 3341)
+++ trunk/components-ext/src/main/resources/tbsl/evaluation/praeambel.tex	2011-10-31 09:29:27 UTC (rev 3342)
@@ -1,4 +1,4 @@
-\documentclass[a4paper,10pt]{article}
+\documentclass[a4paper,10pt]{scrartcl}
 \usepackage{lmodern}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
@@ -42,3 +42,4 @@
 
 %opening
 \title{Evaluation}
+\date{}
\ No newline at end of file

Modified: trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/Evaluation.java
===================================================================
--- trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/Evaluation.java	2011-10-30 11:45:33 UTC (rev 3341)
+++ trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/Evaluation.java	2011-10-31 09:29:27 UTC (rev 3342)
@@ -56,6 +56,7 @@
 import com.hp.hpl.jena.sparql.vocabulary.FOAF;
 import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
+import com.ibm.icu.util.Calendar;
 
 public class Evaluation{
 	
@@ -300,8 +301,8 @@
 	
 	public void run(){
 		int topN2Print = 10;
+		int correctAnswers = 0;
 		
-		
 		int questionId = -1;
 		String question = "";
 		String targetQuery;
@@ -311,7 +312,7 @@
 		String errorCode = "";
 		LatexWriter latex = new LatexWriter();
 		int i = 0;
-		for(Entry<Integer, String> entry : id2Question.entrySet()){if(entry.getKey()==50)continue;
+		for(Entry<Integer, String> entry : id2Question.entrySet()){//if(entry.getKey()==50)continue;
 			if(testID != -1 && entry.getKey() != testID)continue;
 			try {
 				questionId = entry.getKey();
@@ -454,6 +455,9 @@
 					latex.addText(escapeAnswerString(learnedAnswer, targetAnswer));
 					precision = computePrecision(targetAnswer, learnedAnswer);
 					recall = computeRecall(targetAnswer, learnedAnswer);
+					if(precision == 1 && recall == 1){
+						correctAnswers++;
+					}
 				}
 				latex.addSummaryTableEntry(questionId, extractSentence(question), precision, recall, errorCode);
 				
@@ -468,7 +472,8 @@
 				latex.addSummaryTableEntry(questionId, extractSentence(question), precision, recall, errorCode);
 			}
 		}
-		latex.write("log/evaluation.tex");
+		
+		latex.write("log/evaluation_" + System.currentTimeMillis()+  ".tex", Calendar.getInstance().getTime().toString(), correctAnswers);
 	}
 	
 	public static List<String> extractEntities(String query){
@@ -667,7 +672,7 @@
 			}
 		}
 		latex.endDocument();
-		latex.write("log/evaluation" + new Date().getHours() + "_" + new Date().getMinutes() + ".tex");
+		latex.write("log/evaluation_" + System.nanoTime() + ".tex", Calendar.getInstance().getTime().toString(), 0);
 	}
 
 	private String escapeAnswerString(Object learnedAnswer, Object targetAnswer){

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