Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [508] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ tester2
|
From: <mwl...@us...> - 2007-08-30 22:36:36
|
Revision: 508
http://cishell.svn.sourceforge.net/cishell/?rev=508&view=rev
Author: mwlinnem
Date: 2007-08-30 15:30:46 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Error explanations in Converter Reports are now sorted so the errors that particular converter is most likely to be responsible for come before the errors that converter is less likely to be responsible for.
Modified Paths:
--------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java
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/faultanalysis/ChanceAtFault.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/ConvResult.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/TestResult.java
Added Paths:
-----------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java
Removed Paths:
-------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ConvResultMaker.java
Copied: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java (from rev 498, trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ConvResultMaker.java)
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java (rev 0)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -0,0 +1,334 @@
+package org.cishell.testing.convertertester.core.tester2;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.cishell.testing.convertertester.core.converter.graph.Converter;
+import org.cishell.testing.convertertester.core.converter.graph.ConverterPath;
+import org.cishell.testing.convertertester.core.tester2.reportgen.faultanalysis.ChanceAtFault;
+import org.cishell.testing.convertertester.core.tester2.reportgen.faultanalysis.ChanceAtFaultHeuristic;
+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.reportgen.results.FilePassResult;
+import org.cishell.testing.convertertester.core.tester2.reportgen.results.TestResult;
+
+public class ConvResultMaker {
+
+ public static AllConvsResult generate(AllTestsResult atr,
+ Converter[] allConvs, ChanceAtFaultHeuristic faultHeuristic) {
+
+ Converter[] trustedConvs = determineWhichAreTrusted(atr);
+
+ System.out.println("*** # Trusted Convs: " + trustedConvs.length);
+
+ Map convToTestsToPasses = associateConvsWithTestsAndPasses(atr,
+ allConvs, trustedConvs,
+ faultHeuristic);
+ ConvResult[] convResults = generateConvResults(convToTestsToPasses,
+ allConvs, trustedConvs);
+
+// addFaultInfo(convResults, trustedConvs, faultHeuristic);
+
+ return new AllConvsResult(convResults);
+
+ }
+
+ /**
+ * Looks for tests where each file pass succeeded. We will assume that
+ * each converter involved in a test where all file passes succeeded is
+ * very likely to be correct. If one of these converters is involved
+ * in a file pass that fails at some later point, we will assume
+ * that that converter was not at fault, but was fed erroneous data
+ * by previous converters.
+ * @param atr the test results, which contain info on failure
+ * or success of each test.
+ * @return an array of the converters that are trusted
+ */
+ private static Converter[] determineWhichAreTrusted(AllTestsResult atr) {
+ TestResult[] trs = atr.getTestResults();
+
+ Set trustedConverters = new HashSet();
+ for (int ii = 0; ii < trs.length; ii++) {
+ TestResult tr = trs[ii];
+ FilePassResult[] fprs = tr.getFilePassResults();
+
+ //check if all file passes were successes
+
+ boolean trusted = true;
+ for (int jj = 0; jj < fprs.length; jj++) {
+ FilePassResult fpr = fprs[jj];
+ if (! fpr.succeeded()) {
+ //not all were successes
+ trusted = false;
+ break;
+ }
+ }
+
+ if (trusted && fprs.length > 0) {
+ //mark all converters involved as trusted.
+
+ ConverterPath testConvs = tr.getTestConverters();
+ for (int kk = 0; kk < testConvs.size(); kk++) {
+ Converter conv = testConvs.get(kk);
+ trustedConverters.add(conv);
+ }
+ }
+ }
+
+ return (Converter[]) trustedConverters.toArray(new Converter[0]);
+ }
+
+
+ private static Map associateConvsWithTestsAndPasses(AllTestsResult atr,
+ Converter[] allConvs, Converter[] trustedConvs,
+ ChanceAtFaultHeuristic faultHeuristic) {
+ TestResult[] trs = atr.getTestResults();
+
+ //Map<Converter, Map<TestResult, List<FilePassResult>>>
+ Map convToTestsToPasses = new HashMap();
+ initialize(convToTestsToPasses, allConvs);
+
+ //for each test...
+ for (int ii = 0; ii < trs.length; ii++) {
+ TestResult tr = trs[ii];
+
+ FilePassResult[] fps = tr.getFilePassResults();
+ //for each file pass...
+ for (int jj = 0; jj < fps.length; jj++) {
+ FilePassResult fp = fps[jj];
+
+ Converter[] convsInvolved = fp.getConvertersInvolved();
+
+ /*
+ * associate the file pass with the chance that each converter
+ * involved is at fault.
+ */
+
+ if (! fp.succeeded()) {
+ ChanceAtFault[] chanceAtFaults = faultHeuristic.determine(fp,
+ convsInvolved, trustedConvs);
+ for (int kk = 0; kk < chanceAtFaults.length; kk++) {
+ ChanceAtFault caf = chanceAtFaults[kk];
+ fp.addChanceAtFault(caf);
+ }
+ }
+
+ //for each converter involved...
+ for (int kk = 0; kk < convsInvolved.length; kk++) {
+ Converter conv = convsInvolved[kk];
+
+ /*
+ * associate the converter with the tests and
+ * file passes that involve it.
+ *
+ * (side-effects convToTestsToPasses)
+ */
+ addPassResult(convToTestsToPasses, conv,
+ fp);
+
+ }
+ }
+ }
+
+ return convToTestsToPasses;
+ }
+
+ private static ConvResult[] generateConvResults(Map convToTestsToPasses,
+ Converter[] allConvs, Converter[] trustedConvs) {
+
+ ConvResult[] convResults = makeAndFillWithAssociatedTestsAndPasses(
+ convToTestsToPasses, allConvs, trustedConvs);
+
+// addFaultInfo(convResults, convToTestsToPasses, allConvs, trustedConvs,
+// faultHeuristic);
+
+ return convResults;
+ }
+
+ private static ConvResult[] makeAndFillWithAssociatedTestsAndPasses(
+ Map convToTestsToPasses, Converter[] allConvs,
+ Converter[] trustedConvs) {
+ List convResults = new ArrayList();
+
+ List trustedConvList = Arrays.asList(trustedConvs);
+ // for every converter we know of...
+ for (int ii = 0; ii < allConvs.length; ii++) {
+ Converter conv = allConvs[ii];
+ // get the associated test to passes map
+ Map testToPasses = (Map) convToTestsToPasses.get(conv);
+
+ /*
+ * create converter result objects which contain information about
+ * which tests and file passes it is involved with, and whether it
+ * is trusted.
+ */
+
+ boolean isTrusted = trustedConvList.contains(conv);
+
+ ConvResult convResult = new ConvResult(conv, isTrusted,
+ testToPasses);
+
+ convResults.add(convResult);
+ }
+ // return the converter result objects
+ return (ConvResult[]) convResults.toArray(new ConvResult[0]);
+ }
+
+ private static void addPassResult(Map convToTestsToPasses, Converter conv,
+ FilePassResult pass) {
+
+ TestResult test = pass.getParent();
+
+ Map testToPasses = (Map) convToTestsToPasses.get(conv);
+ List passes;
+
+ //if we already associated this test with the converter...
+ if (testToPasses != null) {
+ passes = (List) testToPasses.get(test);
+ if (passes == null) {
+ passes = new ArrayList();
+ }
+ } else { //otherwise...
+ testToPasses = new HashMap();
+ passes = new ArrayList();
+ }
+
+ passes.add(pass);
+ testToPasses.put(test, passes);
+ convToTestsToPasses.put(conv, testToPasses);
+ }
+
+ /**
+ * Ensures that each converter is represented in the map, whether or not
+ * there are any test associated with it.
+ * @param convToTestsToPasses The map we side-effect
+ * @param allConvs an array of all the converters we know of
+ */
+ private static void initialize(Map convToTestsToPasses, Converter[] allConvs) {
+ for (int ii = 0; ii < allConvs.length; ii++) {
+ Converter conv = allConvs[ii];
+
+ convToTestsToPasses.put(conv, new HashMap());
+ }
+ }
+
+// private static addFaultInfo(AllTestsResult atr, ConvResult[] crs,
+// Converter[] trustedConvs, ChanceAtFaultHeuristic faultHeuristic) {
+//
+// Map convToChanceAtFaults = new HashMap();
+//
+// FilePassResult[] failFPRs = atr.getFailedFilePasses();
+// for (int ii = 0; ii < failFPRs.length; ii++) {
+// FilePassResult failFPR = failFPRs[ii];
+//
+// ChanceAtFault[] chanceAtFaultsForEachConv = getFaultInfo(failFPR,
+// trustedConvs, trustedConvs);
+//
+// for (int jj = 0; jj < chanceAtFaultsForEachConv.length; jj++) {
+// ChanceAtFault chanceAtFaultForAConv =
+// chanceAtFaultsForEachConv[jj];
+//
+// Converter conv = chanceAtFaultForAConv.getConverter();
+//
+// addEntryToList(convToChanceAtFaults, conv,
+// chanceAtFaultForAConv);
+//
+// }
+// }
+//
+// for (int ii = 0; ii < crs.length; ii++) {
+// ConvResult cr = crs[ii];
+//
+// Converter c = cr.getConverter();
+// List chanceAtFaults = convToChanceAtFaults.get(c);
+//
+// if (chanceAtFaults != null) {
+//
+// Iterator faultIter = chanceAtFaults.iterator();
+// while (faultIter.hasNext()) {
+// ChanceAtFault caf = (ChanceAtFault) faultIter.next();
+//
+// cr.
+// }
+// }
+// }
+//
+//
+//// List convResults = new ArrayList();
+////
+//// List trustedConvList = Arrays.asList(trustedConvs);
+//// //for every converter we know of...
+//// for (int ii = 0; ii < allConvs.length; ii++) {
+//// Converter conv = allConvs[ii];
+//// //get the associated test to passes map
+//// Map testToPasses = (Map) convToTestsToPasses.get(conv);
+////
+//// /*
+//// * create converter result objects which contain
+//// * information about which tests and file passes
+//// * it is involved with, and whether it is trusted.
+//// */
+////
+//// boolean isTrusted = trustedConvList.contains(conv);
+////
+//// ConvResult convResult = new ConvResult(conv, isTrusted,
+//// testToPasses);
+////
+//// convResults.add(convResult);
+////
+//// Set tests = testToPasses.keySet();
+//// Iterator testIter = tests.iterator();
+//// //for each test...
+//// while (testIter.hasNext()) {
+//// TestResult tr = (TestResult) testIter.next();
+//// List passes = (List) testToPasses.get(tr);
+//// Iterator passIter = passes.iterator();
+//// //for each involved pass...
+//// while (passIter.hasNext()) {
+//// FilePassResult fpr = (FilePassResult) passIter.next();
+////
+//// if (! fpr.succeeded()) {
+//// addFailInfo(fpr, trustedConvs, faultHeuristic);
+//// }
+//// }
+//// }
+//// }
+// }
+
+// private static ChanceAtFault[] getFaultInfo(FilePassResult failFP, Converter[] trustedConverters,
+// ChanceAtFaultHeuristic faultHeuristic) {
+// Converter[] convsInvolvedInFailure = failFP.getConvertersInvolved();
+// ChanceAtFault[] chanceAtFaults = faultHeuristic.determine(failFP,
+// convsInvolvedInFailure, trustedConverters);
+// return chanceAtFaults;
+// }
+
+ /**
+ * For maps that associate an object to a list of objects,
+ * add the given value to the list associated with the key.
+ *
+ * Side-effects the map
+ *
+ * @param map
+ * @param key
+ * @param value
+ */
+ private static void addEntryToList(Map map, Object key, Object value) {
+ List oldEntries = (List) map.get(key);
+
+ if (oldEntries == null) {
+ //no entries so far
+ oldEntries = new ArrayList();
+ }
+
+ oldEntries.add(value);
+
+ map.put(key, value);
+ }
+}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -20,7 +20,6 @@
import org.cishell.testing.convertertester.core.tester2.graphcomparison.IdsPreservedComparer;
import org.cishell.testing.convertertester.core.tester2.graphcomparison.LossyComparer;
import org.cishell.testing.convertertester.core.tester2.graphcomparison.NewGraphComparer;
-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.faultanalysis.ChanceAtFaultHeuristic;
import org.cishell.testing.convertertester.core.tester2.reportgen.faultanalysis.FullTrustHeuristic;
Deleted: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ConvResultMaker.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ConvResultMaker.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ConvResultMaker.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -1,335 +0,0 @@
-package org.cishell.testing.convertertester.core.tester2.reportgen;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.cishell.testing.convertertester.core.converter.graph.Converter;
-import org.cishell.testing.convertertester.core.converter.graph.ConverterPath;
-import org.cishell.testing.convertertester.core.tester2.reportgen.faultanalysis.ChanceAtFault;
-import org.cishell.testing.convertertester.core.tester2.reportgen.faultanalysis.ChanceAtFaultHeuristic;
-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.reportgen.results.FilePassResult;
-import org.cishell.testing.convertertester.core.tester2.reportgen.results.TestResult;
-import org.cishell.testing.convertertester.core.tester2.reportgen.results.filepass.FilePassSuccess;
-
-public class ConvResultMaker {
-
- public static AllConvsResult generate(AllTestsResult atr,
- Converter[] allConvs, ChanceAtFaultHeuristic faultHeuristic) {
-
- Converter[] trustedConvs = determineWhichAreTrusted(atr);
-
- System.out.println("*** # Trusted Convs: " + trustedConvs.length);
-
- Map convToTestsToPasses = associateConvsWithTestsAndPasses(atr,
- allConvs, trustedConvs,
- faultHeuristic);
- ConvResult[] convResults = generateConvResults(convToTestsToPasses,
- allConvs, trustedConvs);
-
-// addFaultInfo(convResults, trustedConvs, faultHeuristic);
-
- return new AllConvsResult(convResults);
-
- }
-
- /**
- * Looks for tests where each file pass succeeded. We will assume that
- * each converter involved in a test where all file passes succeeded is
- * very likely to be correct. If one of these converters is involved
- * in a file pass that fails at some later point, we will assume
- * that that converter was not at fault, but was fed erroneous data
- * by previous converters.
- * @param atr the test results, which contain info on failure
- * or success of each test.
- * @return an array of the converters that are trusted
- */
- private static Converter[] determineWhichAreTrusted(AllTestsResult atr) {
- TestResult[] trs = atr.getTestResults();
-
- List trustedConverters = new ArrayList();
- for (int ii = 0; ii < trs.length; ii++) {
- TestResult tr = trs[ii];
- FilePassResult[] fprs = tr.getFilePassResults();
-
- //check if all file passes were successes
-
- boolean trusted = true;
- for (int jj = 0; jj < fprs.length; jj++) {
- FilePassResult fpr = fprs[jj];
- if (! fpr.succeeded()) {
- //not all were successes
- trusted = false;
- break;
- }
- }
-
- if (trusted && fprs.length > 0) {
- //mark all converters involved as trusted.
-
- ConverterPath testConvs = tr.getTestConverters();
- for (int kk = 0; kk < testConvs.size(); kk++) {
- Converter conv = testConvs.get(kk);
- trustedConverters.add(conv);
- }
- }
- }
-
- return (Converter[]) trustedConverters.toArray(new Converter[0]);
- }
-
-
- private static Map associateConvsWithTestsAndPasses(AllTestsResult atr,
- Converter[] allConvs, Converter[] trustedConvs,
- ChanceAtFaultHeuristic faultHeuristic) {
- TestResult[] trs = atr.getTestResults();
-
- //Map<Converter, Map<TestResult, List<FilePassResult>>>
- Map convToTestsToPasses = new HashMap();
- initialize(convToTestsToPasses, allConvs);
-
- //for each test...
- for (int ii = 0; ii < trs.length; ii++) {
- TestResult tr = trs[ii];
-
- FilePassResult[] fps = tr.getFilePassResults();
- //for each file pass...
- for (int jj = 0; jj < fps.length; jj++) {
- FilePassResult fp = fps[jj];
-
- Converter[] convsInvolved = fp.getConvertersInvolved();
-
- /*
- * associate the file pass with the chance that each converter
- * involved is at fault.
- */
-
- if (! fp.succeeded()) {
- ChanceAtFault[] chanceAtFaults = faultHeuristic.determine(fp,
- convsInvolved, trustedConvs);
- for (int kk = 0; kk < chanceAtFaults.length; kk++) {
- ChanceAtFault caf = chanceAtFaults[kk];
- fp.addChanceAtFault(caf);
- }
- }
-
- //for each converter involved...
- for (int kk = 0; kk < convsInvolved.length; kk++) {
- Converter conv = convsInvolved[kk];
-
- /*
- * associate the converter with the tests and
- * file passes that involve it.
- *
- * (side-effects convToTestsToPasses)
- */
- addPassResult(convToTestsToPasses, conv,
- fp);
-
- }
- }
- }
-
- return convToTestsToPasses;
- }
-
- private static ConvResult[] generateConvResults(Map convToTestsToPasses,
- Converter[] allConvs, Converter[] trustedConvs) {
-
- ConvResult[] convResults = makeAndFillWithAssociatedTestsAndPasses(
- convToTestsToPasses, allConvs, trustedConvs);
-
-// addFaultInfo(convResults, convToTestsToPasses, allConvs, trustedConvs,
-// faultHeuristic);
-
- return convResults;
- }
-
- private static ConvResult[] makeAndFillWithAssociatedTestsAndPasses(
- Map convToTestsToPasses, Converter[] allConvs,
- Converter[] trustedConvs) {
- List convResults = new ArrayList();
-
- List trustedConvList = Arrays.asList(trustedConvs);
- // for every converter we know of...
- for (int ii = 0; ii < allConvs.length; ii++) {
- Converter conv = allConvs[ii];
- // get the associated test to passes map
- Map testToPasses = (Map) convToTestsToPasses.get(conv);
-
- /*
- * create converter result objects which contain information about
- * which tests and file passes it is involved with, and whether it
- * is trusted.
- */
-
- boolean isTrusted = trustedConvList.contains(conv);
-
- ConvResult convResult = new ConvResult(conv, isTrusted,
- testToPasses);
-
- convResults.add(convResult);
- }
- // return the converter result objects
- return (ConvResult[]) convResults.toArray(new ConvResult[0]);
- }
-
- private static void addPassResult(Map convToTestsToPasses, Converter conv,
- FilePassResult pass) {
-
- TestResult test = pass.getParent();
-
- Map testToPasses = (Map) convToTestsToPasses.get(conv);
- List passes;
-
- //if we already associated this test with the converter...
- if (testToPasses != null) {
- passes = (List) testToPasses.get(test);
- if (passes == null) {
- passes = new ArrayList();
- }
- } else { //otherwise...
- testToPasses = new HashMap();
- passes = new ArrayList();
- }
-
- passes.add(pass);
- testToPasses.put(test, passes);
- convToTestsToPasses.put(conv, testToPasses);
- }
-
- /**
- * Ensures that each converter is represented in the map, whether or not
- * there are any test associated with it.
- * @param convToTestsToPasses The map we side-effect
- * @param allConvs an array of all the converters we know of
- */
- private static void initialize(Map convToTestsToPasses, Converter[] allConvs) {
- for (int ii = 0; ii < allConvs.length; ii++) {
- Converter conv = allConvs[ii];
-
- convToTestsToPasses.put(conv, new HashMap());
- }
- }
-
-// private static addFaultInfo(AllTestsResult atr, ConvResult[] crs,
-// Converter[] trustedConvs, ChanceAtFaultHeuristic faultHeuristic) {
-//
-// Map convToChanceAtFaults = new HashMap();
-//
-// FilePassResult[] failFPRs = atr.getFailedFilePasses();
-// for (int ii = 0; ii < failFPRs.length; ii++) {
-// FilePassResult failFPR = failFPRs[ii];
-//
-// ChanceAtFault[] chanceAtFaultsForEachConv = getFaultInfo(failFPR,
-// trustedConvs, trustedConvs);
-//
-// for (int jj = 0; jj < chanceAtFaultsForEachConv.length; jj++) {
-// ChanceAtFault chanceAtFaultForAConv =
-// chanceAtFaultsForEachConv[jj];
-//
-// Converter conv = chanceAtFaultForAConv.getConverter();
-//
-// addEntryToList(convToChanceAtFaults, conv,
-// chanceAtFaultForAConv);
-//
-// }
-// }
-//
-// for (int ii = 0; ii < crs.length; ii++) {
-// ConvResult cr = crs[ii];
-//
-// Converter c = cr.getConverter();
-// List chanceAtFaults = convToChanceAtFaults.get(c);
-//
-// if (chanceAtFaults != null) {
-//
-// Iterator faultIter = chanceAtFaults.iterator();
-// while (faultIter.hasNext()) {
-// ChanceAtFault caf = (ChanceAtFault) faultIter.next();
-//
-// cr.
-// }
-// }
-// }
-//
-//
-//// List convResults = new ArrayList();
-////
-//// List trustedConvList = Arrays.asList(trustedConvs);
-//// //for every converter we know of...
-//// for (int ii = 0; ii < allConvs.length; ii++) {
-//// Converter conv = allConvs[ii];
-//// //get the associated test to passes map
-//// Map testToPasses = (Map) convToTestsToPasses.get(conv);
-////
-//// /*
-//// * create converter result objects which contain
-//// * information about which tests and file passes
-//// * it is involved with, and whether it is trusted.
-//// */
-////
-//// boolean isTrusted = trustedConvList.contains(conv);
-////
-//// ConvResult convResult = new ConvResult(conv, isTrusted,
-//// testToPasses);
-////
-//// convResults.add(convResult);
-////
-//// Set tests = testToPasses.keySet();
-//// Iterator testIter = tests.iterator();
-//// //for each test...
-//// while (testIter.hasNext()) {
-//// TestResult tr = (TestResult) testIter.next();
-//// List passes = (List) testToPasses.get(tr);
-//// Iterator passIter = passes.iterator();
-//// //for each involved pass...
-//// while (passIter.hasNext()) {
-//// FilePassResult fpr = (FilePassResult) passIter.next();
-////
-//// if (! fpr.succeeded()) {
-//// addFailInfo(fpr, trustedConvs, faultHeuristic);
-//// }
-//// }
-//// }
-//// }
-// }
-
-// private static ChanceAtFault[] getFaultInfo(FilePassResult failFP, Converter[] trustedConverters,
-// ChanceAtFaultHeuristic faultHeuristic) {
-// Converter[] convsInvolvedInFailure = failFP.getConvertersInvolved();
-// ChanceAtFault[] chanceAtFaults = faultHeuristic.determine(failFP,
-// convsInvolvedInFailure, trustedConverters);
-// return chanceAtFaults;
-// }
-
- /**
- * For maps that associate an object to a list of objects,
- * add the given value to the list associated with the key.
- *
- * Side-effects the map
- *
- * @param map
- * @param key
- * @param value
- */
- private static void addEntryToList(Map map, Object key, Object value) {
- List oldEntries = (List) map.get(key);
-
- if (oldEntries == null) {
- //no entries so far
- oldEntries = new ArrayList();
- }
-
- oldEntries.add(value);
-
- map.put(key, value);
- }
-}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -4,8 +4,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
import org.cishell.testing.convertertester.core.converter.graph.Converter;
import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
@@ -72,8 +71,11 @@
ChanceAtFault[] failureExplns = cr
.getUniqueExplnChanceAtFaults();
+ Arrays.sort(failureExplns, cr.getCompareFaultsByLikelihood());
+
if (failureExplns.length > 0) {
- report.println("Unique Failure Explanations...");
+ report.println("Unique Failure Explanations " +
+ "(sorted by likelihood)...");
for (int ii = 0; ii < failureExplns.length; ii++) {
ChanceAtFault failureExp = failureExplns[ii];
@@ -107,18 +109,21 @@
report.println("may not be testable.");
}
- this.convReport = new ConvReport(reportFile, new TestReport[0], cr
- .getShortNameWithTrust());
+ this.convReport = new ConvReport(reportFile, new TestReport[0],
+ cr.getShortNameWithTrust());
+
report.println("");
report.flush();
reportOutStream.close();
} catch (IOException e) {
- this.log.log(LogService.LOG_ERROR, "Unable to generate a converter report.", e);
+ this.log.log(LogService.LOG_ERROR,
+ "Unable to generate a converter report.", e);
try {
if (reportOutStream != null)
reportOutStream.close();
} catch (IOException e2) {
- this.log.log(LogService.LOG_ERROR, "Unable to close a converter report", e);
+ this.log.log(LogService.LOG_ERROR,
+ "Unable to close a converter report", e);
}
}
}
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-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/AnnotatedGraphReportGenerator.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -7,7 +7,7 @@
import java.io.FileWriter;
import java.io.IOException;
-import org.cishell.testing.convertertester.core.tester2.reportgen.ConvResultMaker;
+import org.cishell.testing.convertertester.core.tester2.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;
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/faultanalysis/ChanceAtFault.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/faultanalysis/ChanceAtFault.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/faultanalysis/ChanceAtFault.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -1,10 +1,15 @@
package org.cishell.testing.convertertester.core.tester2.reportgen.faultanalysis;
+import java.util.Comparator;
+
import org.cishell.testing.convertertester.core.converter.graph.Converter;
import org.cishell.testing.convertertester.core.tester2.reportgen.results.filepass.FilePassFailure;
public class ChanceAtFault {
+ public static final Comparator COMPARE_BY_LIKELIHOOD =
+ new CompareByLikelihood();
+
private FilePassFailure failedFP;
private Converter c;
private float chanceAtFault;
@@ -38,4 +43,33 @@
public String toString() {
return String.valueOf(chanceAtFault);
}
+
+ private static class CompareByLikelihood implements Comparator {
+
+ public int compare(Object arg0, Object arg1) {
+ if (arg0 instanceof ChanceAtFault &&
+ arg1 instanceof ChanceAtFault) {
+ ChanceAtFault caf0 = (ChanceAtFault) arg0;
+ ChanceAtFault caf1 = (ChanceAtFault) arg1;
+
+ float difference = caf1.getChanceAtFault() -
+ caf0.getChanceAtFault();
+
+ if (difference > 0.0f) {
+ return 1;
+ } else if (difference == 0.0f) {
+ return 0;
+ } else if (difference < 0.0f) {
+ return -1;
+ }
+
+ } else {
+ throw new IllegalArgumentException("Must compare two " +
+ "ChanceAtFaults");
+ }
+
+ return 0;
+ }
+
+ }
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/ConvResult.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/ConvResult.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/ConvResult.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -241,6 +242,10 @@
return 1.0f - this.chanceCorrect;
}
+ public Comparator getCompareFaultsByLikelihood() {
+ return ChanceAtFault.COMPARE_BY_LIKELIHOOD;
+ }
+
private boolean containsChanceAtFaultWithExpln(List chanceAtFaultList,
String explanation) {
Iterator iter = chanceAtFaultList.iterator();
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -1,6 +1,7 @@
package org.cishell.testing.convertertester.core.tester2.reportgen.results;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -13,6 +14,8 @@
public abstract class FilePassResult {
+ public static final Comparator COMPARE_BY_SUCCESS = new CompareBySuccess();
+
public static final String DEFAULT_NAME = "Default File Pass Name";
private Data[] originalData;
@@ -186,4 +189,45 @@
public void addChanceAtFault(ChanceAtFault chanceAtFault) {
this.chanceAtFaults.add(chanceAtFault);
}
+
+
+private static class CompareBySuccess implements Comparator {
+
+ /**
+ * Compare first by success, where
+ * completely successful > partially successful > complet failure,
+ * and then alphabetize (the natural order of test results)
+ * for cases where they both have the same success type.
+ */
+ public int compare(Object o1, Object o2) {
+ if (o1 instanceof TestResult && o2 instanceof TestResult) {
+ TestResult tr1 = (TestResult) o1;
+ TestResult tr2 = (TestResult) o2;
+
+ int success1 = getSuccessRating(tr1);
+ int success2 = getSuccessRating(tr2);
+
+ if (success1 != success2) {
+ return success2 - success1;
+ } else {
+ return tr1.compareTo(tr2);
+ }
+
+ } else {
+ throw new IllegalArgumentException("Can only " +
+ "compare test results");
+ }
+
+ }
+
+ private int getSuccessRating(TestResult tr) {
+ if (tr.allSucceeded()) {
+ return 2;
+ } else if (tr.someSucceeded()) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ }
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/TestResult.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/TestResult.java 2007-08-30 21:26:38 UTC (rev 507)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/TestResult.java 2007-08-30 22:30:46 UTC (rev 508)
@@ -266,51 +266,6 @@
}
public static Comparator getCompareBySuccess() {
- return new CompareBySuccess();
- }
-
- private static class CompareBySuccess implements Comparator {
-
- /**
- * Compare first by success, where
- * completely successful > partially successful > complet failure,
- * and then alphabetize (the natural order of test results)
- * for cases where they both have the same success type.
- */
- public int compare(Object o1, Object o2) {
- if (o1 instanceof TestResult && o2 instanceof TestResult) {
- TestResult tr1 = (TestResult) o1;
- TestResult tr2 = (TestResult) o2;
-
- int success1 = getSuccessRating(tr1);
- int success2 = getSuccessRating(tr2);
-
- if (success1 != success2) {
- return success2 - success1;
- } else {
- return tr1.compareTo(tr2);
- }
-
- } else {
- throw new IllegalArgumentException("Can only " +
- "compare test results");
- }
-
- }
-
- private int getSuccessRating(TestResult tr) {
- if (tr.allSucceeded()) {
- return 2;
- } else if (tr.someSucceeded()) {
- return 1;
- } else {
- return 0;
- }
- }
- }
-
-
-
-
-
+ return FilePassResult.COMPARE_BY_SUCCESS;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
