Revision: 14675
http://gate.svn.sourceforge.net/gate/?rev=14675&view=rev
Author: thomas_heitz
Date: 2011-12-05 19:02:25 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Corpus Quality Assurance: swap columns Precision and Recall to have Precision
first like standard.
Modified Paths:
--------------
gate/trunk/src/gate/gui/CorpusQualityAssurance.java
gate/trunk/src/gate/util/AnnotationDiffer.java
gate/trunk/src/gate/util/OntologyMeasures.java
Modified: gate/trunk/src/gate/gui/CorpusQualityAssurance.java
===================================================================
--- gate/trunk/src/gate/gui/CorpusQualityAssurance.java 2011-12-05 17:55:36 UTC
(rev 14674)
+++ gate/trunk/src/gate/gui/CorpusQualityAssurance.java 2011-12-05 19:02:25 UTC
(rev 14675)
@@ -1316,28 +1316,28 @@
double beta = (index == -1) ?
1 : Double.valueOf(measure.substring(1, index));
if (measure.endsWith("strict")) {
+ values.add(f.format(differ.getPrecisionStrict()));
values.add(f.format(differ.getRecallStrict()));
- values.add(f.format(differ.getPrecisionStrict()));
values.add(f.format(differ.getFMeasureStrict(beta)));
} else if (measure.endsWith("strict BDM")) {
+ values.add(f.format(ontologyMeasures.getPrecisionStrictBdm()));
values.add(f.format(ontologyMeasures.getRecallStrictBdm()));
- values.add(f.format(ontologyMeasures.getPrecisionStrictBdm()));
values.add(f.format(ontologyMeasures.getFMeasureStrictBdm(beta)));
} else if (measure.endsWith("lenient")) {
+ values.add(f.format(differ.getPrecisionLenient()));
values.add(f.format(differ.getRecallLenient()));
- values.add(f.format(differ.getPrecisionLenient()));
values.add(f.format(differ.getFMeasureLenient(beta)));
} else if (measure.endsWith("lenient BDM")) {
+ values.add(f.format(ontologyMeasures.getPrecisionLenientBdm()));
values.add(f.format(ontologyMeasures.getRecallLenientBdm()));
- values.add(f.format(ontologyMeasures.getPrecisionLenientBdm()));
values.add(f.format(ontologyMeasures.getFMeasureLenientBdm(beta)));
} else if (measure.endsWith("average")) {
+ values.add(f.format(differ.getPrecisionAverage()));
values.add(f.format(differ.getRecallAverage()));
- values.add(f.format(differ.getPrecisionAverage()));
values.add(f.format(differ.getFMeasureAverage(beta)));
} else if (measure.endsWith("average BDM")) {
+ values.add(f.format(ontologyMeasures.getPrecisionAverageBdm()));
values.add(f.format(ontologyMeasures.getRecallAverageBdm()));
- values.add(f.format(ontologyMeasures.getPrecisionAverageBdm()));
values.add(f.format(ontologyMeasures.getFMeasureAverageBdm(beta)));
} else if (measure.equals("Observed agreement")) {
values.add(f.format(classificationMeasures.getObservedAgreement()));
@@ -1418,10 +1418,10 @@
.replaceFirst("score lenient", "l.")
.replaceFirst("score average", "a.")
.replaceFirst(" BDM", "B.");
+ documentTableModel.addColumn("Prec.B/A");
+ annotationTableModel.addColumn("Prec.B/A");
documentTableModel.addColumn("Rec.B/A");
annotationTableModel.addColumn("Rec.B/A");
- documentTableModel.addColumn("Prec.B/A");
- annotationTableModel.addColumn("Prec.B/A");
documentTableModel.addColumn(measureString);
annotationTableModel.addColumn(measureString);
}
Modified: gate/trunk/src/gate/util/AnnotationDiffer.java
===================================================================
--- gate/trunk/src/gate/util/AnnotationDiffer.java 2011-12-05 17:55:36 UTC
(rev 14674)
+++ gate/trunk/src/gate/util/AnnotationDiffer.java 2011-12-05 19:02:25 UTC
(rev 14675)
@@ -852,16 +852,16 @@
double beta = Double.valueOf(
measure.substring(1,measure.indexOf('-')));
if (measure.endsWith("strict")) {
+ row.add(f.format(getPrecisionStrict()));
row.add(f.format(getRecallStrict()));
- row.add(f.format(getPrecisionStrict()));
row.add(f.format(getFMeasureStrict(beta)));
} else if (measure.endsWith("lenient")) {
+ row.add(f.format(getPrecisionLenient()));
row.add(f.format(getRecallLenient()));
- row.add(f.format(getPrecisionLenient()));
row.add(f.format(getFMeasureLenient(beta)));
} else if (measure.endsWith("average")) {
+ row.add(f.format(getPrecisionAverage()));
row.add(f.format(getRecallAverage()));
- row.add(f.format(getPrecisionAverage()));
row.add(f.format(getFMeasureAverage(beta)));
}
}
Modified: gate/trunk/src/gate/util/OntologyMeasures.java
===================================================================
--- gate/trunk/src/gate/util/OntologyMeasures.java 2011-12-05 17:55:36 UTC
(rev 14674)
+++ gate/trunk/src/gate/util/OntologyMeasures.java 2011-12-05 19:02:25 UTC
(rev 14675)
@@ -418,28 +418,28 @@
double beta = Double.valueOf(
measure.substring(1,measure.indexOf('-')));
if (measure.endsWith("strict")) {
+ row.add(f.format(differ.getPrecisionStrict()));
row.add(f.format(differ.getRecallStrict()));
- row.add(f.format(differ.getPrecisionStrict()));
row.add(f.format(differ.getFMeasureStrict(beta)));
} else if (measure.endsWith("strict BDM")) {
+ row.add(f.format(getPrecisionStrictBdm()));
row.add(f.format(getRecallStrictBdm()));
- row.add(f.format(getPrecisionStrictBdm()));
row.add(f.format(getFMeasureStrictBdm(beta)));
} else if (measure.endsWith("lenient")) {
+ row.add(f.format(differ.getPrecisionLenient()));
row.add(f.format(differ.getRecallLenient()));
- row.add(f.format(differ.getPrecisionLenient()));
row.add(f.format(differ.getFMeasureLenient(beta)));
} else if (measure.endsWith("lenient BDM")) {
+ row.add(f.format(getPrecisionLenientBdm()));
row.add(f.format(getRecallLenientBdm()));
- row.add(f.format(getPrecisionLenientBdm()));
row.add(f.format(getFMeasureLenientBdm(beta)));
} else if (measure.endsWith("average")) {
+ row.add(f.format(differ.getPrecisionAverage()));
row.add(f.format(differ.getRecallAverage()));
- row.add(f.format(differ.getPrecisionAverage()));
row.add(f.format(differ.getFMeasureAverage(beta)));
} else if (measure.endsWith("average BDM")) {
+ row.add(f.format(getPrecisionAverageBdm()));
row.add(f.format(getRecallAverageBdm()));
- row.add(f.format(getPrecisionAverageBdm()));
row.add(f.format(getFMeasureAverageBdm(beta)));
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
