Revision: 17418
http://sourceforge.net/p/gate/code/17418
Author: adamfunk
Date: 2014-02-25 14:31:07 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
fiddling with GUI & parameters
Modified Paths:
--------------
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
Modified:
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
2014-02-25 08:36:20 UTC (rev 17417)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
2014-02-25 14:31:07 UTC (rev 17418)
@@ -64,10 +64,15 @@
}
+ public int getRefDocFrequency(Term term) {
+ return this.docFreqSource.getDocFrequency(term);
+ }
+
+
protected void calculateScores() {
for (Term term : termFrequencies.keySet()) {
int tf = termFrequencies.get(term);
- int df = docFreqSource.getDocFrequency(term);
+ int df = getRefDocFrequency(term);
int n = docFreqSource.getTotalDocs();
double score = TfCalculation.calculate(tfCalculation, tf) *
IdfCalculation.calculate(idfCalculation, df, n);
rawTermScores.put(term, Double.valueOf(score));
@@ -101,7 +106,7 @@
}
/***** CREOLE PARAMETERS *****/
-
+ @Optional
@CreoleParameter(comment = "document frequency bank (unset = create from
these corpora)")
public void setDocFreqSource(DocumentFrequencyBank dfb) {
this.docFreqSource = dfb;
Modified:
gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
2014-02-25 08:36:20 UTC (rev 17417)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
2014-02-25 14:31:07 UTC (rev 17418)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008--2012, The University of Sheffield. See the file
+ * Copyright (c) 2008--2014, The University of Sheffield. See the file
* COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt
*
* This file is part of GATE (see http://gate.ac.uk/), and is free
@@ -301,6 +301,7 @@
controlPanel.add(sliderPanel, BorderLayout.CENTER);
sliderPanel.reformat();
freqTableModel.setTermbank(this.termbank);
+ freqTable.repaint();
}
@@ -430,8 +431,9 @@
class FrequencyTableModel extends AbstractTableModel {
private static final long serialVersionUID = -7654670667296912991L;
private List<Term> terms;
- private String[] columnNames = {"term", "term frequency", "doc frequency"};
- private Map<Term, Integer> termFrequencies, docFrequencies;
+ private String[] columnNames = {"term", "term frequency", "doc frequency",
"ref doc frequency"};
+ private Map<Term, Integer> termFrequencies, docFrequencies;
+ private AbstractTermbank termbank;
public FrequencyTableModel() {
this.termFrequencies = new HashMap<Term, Integer>();
@@ -443,10 +445,14 @@
this.termFrequencies = termbank.getTermFrequencies();
this.docFrequencies = termbank.getDocFrequencies();
this.terms = new ArrayList<Term>(termFrequencies.keySet());
+ this.termbank = termbank;
Collections.sort(this.terms, new TermComparator());
}
public int getColumnCount() {
+ if (this.termbank instanceof TfIdfTermbank) {
+ return 4;
+ }
return 3;
}
@@ -467,12 +473,20 @@
return 0;
}
// implied else
- if (this.docFrequencies.containsKey(term)) {
- return this.docFrequencies.get(term);
+ if (col == 2) {
+ if (this.docFrequencies.containsKey(term)) {
+ return this.docFrequencies.get(term);
+ }
+ return 0;
}
+ // implied else
+ if (col == 3) {
+ return ((TfIdfTermbank) this.termbank).getRefDocFrequency(term);
+ }
return 0;
}
+
public Class<?> getColumnClass(int col) {
if (col == 0) {
return String.class;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
