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

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

Revision: 502
          http://cishell.svn.sourceforge.net/cishell/?rev=502&view=rev
Author:   mwlinnem
Date:     2007-08-30 12:24:13 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Changed name of graph report generator in preparation for non-annotated graph report generator

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

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

Copied: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java (from rev 497, trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java)
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java	                        (rev 0)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java	2007-08-30 19:24:13 UTC (rev 502)
@@ -0,0 +1,111 @@
+package org.cishell.testing.convertertester.core.tester2.reportgen.convgraph;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.cishell.testing.convertertester.core.tester2.reportgen.ConvResultMaker;
+import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
+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.osgi.service.log.LogService;
+
+public class AnnotatedGraphReportGenerator implements ReportGenerator {
+
+	private ConvResultMaker convGen = new ConvResultMaker();
+	private LogService log;
+	
+	private File annotatedNWBGraph = new File(TEMP_DIR + "annotated-converter-graph.nwb");
+	
+	private String NODE_LINE = "^\\d+? \".*?\"$";
+	
+	public AnnotatedGraphReportGenerator(LogService log) {
+		this.log = log;
+	}
+	
+	public void generateReport(AllTestsResult atr,
+							   AllConvsResult acr,
+							   File nwbConvGraph) {
+		ConvResult[] convs = acr.getConvResults();
+		
+		BufferedReader reader = null;
+		BufferedWriter writer = null;
+		try {
+			reader = new BufferedReader( new FileReader(nwbConvGraph));
+			writer = new BufferedWriter( new FileWriter(this.annotatedNWBGraph));
+			
+			String line = null;
+			while ((line = reader.readLine()) != null) {
+				line = line.trim();
+				
+				if (line.startsWith("id*int")) {
+					writer.write(line + " isTrusted*int chanceCorrect*float isConverter*int \r\n");
+				} else if (line.matches(NODE_LINE)) {
+					String[] parts = line.split(" ");
+					String rawConvName = parts[1];
+					String convName = rawConvName.replaceAll("\"", "");
+					
+					boolean wroteAttributes = false;
+					for (int ii = 0; ii < convs.length ; ii++) {
+						ConvResult cr = convs[ii];
+						if (cr.getUniqueName().equals(convName)) {
+							int trusted;
+							
+							if (cr.isTrusted()) {
+								trusted = 1;
+							} else {
+								trusted = 0;
+							}
+							
+							writer.write(line + " " + trusted + " " + 
+									cr.getChanceCorrect() + " 1 " + "\r\n");
+							wroteAttributes = true;
+							break;
+						}
+					}
+					
+					if (! wroteAttributes) {
+						writer.write(line + " 1 1.0 0" + "\r\n");
+					}
+					
+				} else {
+					writer.write(line + "\r\n");
+				}
+			}
+			
+		} catch (IOException e) {
+			this.log.log(LogService.LOG_ERROR,
+					"Unable to generate Graph Report.", e);
+			try {		
+				if (reader != null) reader.close();
+				} catch (IOException e2) {
+					this.log.log(LogService.LOG_ERROR,
+							"Unable to close graph report stream", e);
+				}
+		} finally {
+			try {
+			if (reader != null) {
+				reader.close();
+			} 
+			
+			if (writer != null) {
+				writer.close();
+			}
+			} catch (IOException e) {
+				this.log.log(LogService.LOG_ERROR, 
+						"Unable to close either graph report reader or " +
+						"writer.", e);
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	
+	public File getGraphReport() {
+		return this.annotatedNWBGraph;
+	}
+}

Deleted: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java	2007-08-30 19:22:38 UTC (rev 501)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java	2007-08-30 19:24:13 UTC (rev 502)
@@ -1,111 +0,0 @@
-package org.cishell.testing.convertertester.core.tester2.reportgen.convgraph;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.cishell.testing.convertertester.core.tester2.reportgen.ConvResultMaker;
-import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
-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.osgi.service.log.LogService;
-
-public class GraphReportGenerator implements ReportGenerator {
-
-	private ConvResultMaker convGen = new ConvResultMaker();
-	private LogService log;
-	
-	private File annotatedNWBGraph = new File(TEMP_DIR + "annotated-converter-graph.nwb");
-	
-	private String NODE_LINE = "^\\d+? \".*?\"$";
-	
-	public GraphReportGenerator(LogService log) {
-		this.log = log;
-	}
-	
-	public void generateReport(AllTestsResult atr,
-							   AllConvsResult acr,
-							   File nwbConvGraph) {
-		ConvResult[] convs = acr.getConvResults();
-		
-		BufferedReader reader = null;
-		BufferedWriter writer = null;
-		try {
-			reader = new BufferedReader( new FileReader(nwbConvGraph));
-			writer = new BufferedWriter( new FileWriter(this.annotatedNWBGraph));
-			
-			String line = null;
-			while ((line = reader.readLine()) != null) {
-				line = line.trim();
-				
-				if (line.startsWith("id*int")) {
-					writer.write(line + " isTrusted*int chanceCorrect*float isConverter*int \r\n");
-				} else if (line.matches(NODE_LINE)) {
-					String[] parts = line.split(" ");
-					String rawConvName = parts[1];
-					String convName = rawConvName.replaceAll("\"", "");
-					
-					boolean wroteAttributes = false;
-					for (int ii = 0; ii < convs.length ; ii++) {
-						ConvResult cr = convs[ii];
-						if (cr.getUniqueName().equals(convName)) {
-							int trusted;
-							
-							if (cr.isTrusted()) {
-								trusted = 1;
-							} else {
-								trusted = 0;
-							}
-							
-							writer.write(line + " " + trusted + " " + 
-									cr.getChanceCorrect() + " 1 " + "\r\n");
-							wroteAttributes = true;
-							break;
-						}
-					}
-					
-					if (! wroteAttributes) {
-						writer.write(line + " 1 1.0 0" + "\r\n");
-					}
-					
-				} else {
-					writer.write(line + "\r\n");
-				}
-			}
-			
-		} catch (IOException e) {
-			this.log.log(LogService.LOG_ERROR,
-					"Unable to generate Graph Report.", e);
-			try {		
-				if (reader != null) reader.close();
-				} catch (IOException e2) {
-					this.log.log(LogService.LOG_ERROR,
-							"Unable to close graph report stream", e);
-				}
-		} finally {
-			try {
-			if (reader != null) {
-				reader.close();
-			} 
-			
-			if (writer != null) {
-				writer.close();
-			}
-			} catch (IOException e) {
-				this.log.log(LogService.LOG_ERROR, 
-						"Unable to close either graph report reader or " +
-						"writer.", e);
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	
-	public File getGraphReport() {
-		return this.annotatedNWBGraph;
-	}
-}


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