[CIShell-SVN] SF.net SVN: cishell: [523] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java

[<mwl...@us...>]

Revision: 523
          http://cishell.svn.sourceforge.net/cishell/?rev=523&view=rev
Author:   mwlinnem
Date:     2007-09-17 07:17:26 -0700 (Mon, 17 Sep 2007)

Log Message:
-----------
Fixed bug in AnnotatedGraphReport. The chanceCorrect column values should now be the actual value instead of always being 100.0

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java	2007-09-13 19:43:23 UTC (rev 522)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java	2007-09-17 14:17:26 UTC (rev 523)
@@ -12,6 +12,7 @@
 import org.cishell.testing.convertertester.core.tester2.reportgen.results.AllConvsResult;
 import org.cishell.testing.convertertester.core.tester2.reportgen.results.AllTestsResult;
 import org.cishell.testing.convertertester.core.tester2.reportgen.results.ConvResult;
+import org.cishell.testing.convertertester.core.tester2.util.FormatUtil;
 import org.osgi.service.log.LogService;
 
 public class AnnotatedGraphReportGenerator implements ReportGenerator {
@@ -47,12 +48,13 @@
 				} else if (line.matches(NODE_LINE)) {
 					String[] parts = line.split(" ");
 					String rawConvName = parts[1];
+					//raw names are now short names
 					String convName = rawConvName.replaceAll("\"", "");
 					
 					boolean wroteAttributes = false;
 					for (int ii = 0; ii < convs.length ; ii++) {
 						ConvResult cr = convs[ii];
-						if (cr.getUniqueName().equals(convName)) {
+						if (cr.getShortName().equals(convName)) {
 							int trusted;
 							
 							if (cr.isTrusted()) {
@@ -61,15 +63,17 @@
 								trusted = 0;
 							}
 							
-							writer.write(line + " " + trusted + " " + 
-									cr.getChanceCorrect() + " 1 " + "\r\n");
+							writer.write(line + " " + trusted 
+								+ " " + 
+								FormatUtil.formatToPercent(cr.getChanceCorrect())
+								+ " 1 " + "\r\n");
 							wroteAttributes = true;
 							break;
 						}
 					}
 					
 					if (! wroteAttributes) {
-						writer.write(line + " 1 1.0 0" + "\r\n");
+						writer.write(line + " 1 100.0 0" + "\r\n");
 					}
 					
 				} else {


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