From d2027086f771f8ae3282d9e07682733a53dd3a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Tue, 26 Oct 2010 06:17:36 +0000
Subject: [PATCH] - changed the order between recall and fmeasure in display
functions
---
html/relnotes.html | 4 ++++
src/fr/inrialpes/exmo/align/util/GroupEval.java | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/html/relnotes.html b/html/relnotes.html
index e1a6d354..24c41c20 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -62,6 +62,10 @@ The development of 4 versions continue.
<!--h2>Version 4.3 (): xx/xx/xxxx - Zimt</h2-->
<!--h2>Version 4.2 (): xx/xx/xxxx - Tring</h2-->
+<p><ul compact="1">
+<li>Changed order of display to precision/F-measure/recall (util)</li>
+</ul></p>
+
<h2>Version 4.1 (1534): 13/10/2010 - Napjakmandu</h2>
<p><ul compact="1">
diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java
index 1f474381..a8be9576 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java
@@ -446,8 +446,6 @@ which the program does...
writer.print("<td>");
if ( format.charAt(i) == 'p' ) {
writer.print("Prec.");
- } else if ( format.charAt(i) == 'r' ) {
- writer.print("Rec.");
} else if ( format.charAt(i) == 'f' ) {
writer.print("Fall.");
} else if ( format.charAt(i) == 'm' ) {
@@ -456,6 +454,8 @@ which the program does...
writer.print("Over.");
} else if ( format.charAt(i) == 't' ) {
writer.print("Time");
+ } else if ( format.charAt(i) == 'r' ) {
+ writer.print("Rec.");
}
writer.println("</td>");
}
@@ -503,8 +503,6 @@ which the program does...
writer.print("<td>");
if ( format.charAt(i) == 'p' ) {
formatter.format("%1.2f", eval.getPrecision());
- } else if ( format.charAt(i) == 'r' ) {
- formatter.format("%1.2f", eval.getRecall());
} else if ( format.charAt(i) == 'f' ) {
formatter.format("%1.2f", eval.getFallout());
} else if ( format.charAt(i) == 'm' ) {
@@ -517,6 +515,8 @@ which the program does...
} else {
formatter.format("%1.2f", eval.getTime());
}
+ } else if ( format.charAt(i) == 'r' ) {
+ formatter.format("%1.2f", eval.getRecall());
}
writer.println("</td>");
}
@@ -541,8 +541,6 @@ which the program does...
writer.print("<td>");
if ( format.charAt(i) == 'p' ) {
formatter.format("%1.2f", precision);
- } else if ( format.charAt(i) == 'r' ) {
- formatter.format("%1.2f", recall);
} else if ( format.charAt(i) == 'f' ) {
formatter.format("%1.2f", (double)(foundVect[k] - correctVect[k])/foundVect[k]);
} else if ( format.charAt(i) == 'm' ) {
@@ -555,6 +553,8 @@ which the program does...
} else {
formatter.format("%1.2f", timeVect[k]);
}
+ } else if ( format.charAt(i) == 'r' ) {
+ formatter.format("%1.2f", recall);
}
writer.println("</td>");
};
--
GitLab