Menu
▾
▴
[gate-cvs] SF.net SVN: gate:[17438] gate/trunk/plugins/TermRaider/src/gate/termraider
|
From: <ada...@us...> - 2014-02-26 15:16:23
|
Revision: 17438
http://sourceforge.net/p/gate/code/17438
Author: adamfunk
Date: 2014-02-26 15:16:19 +0000 (Wed, 26 Feb 2014)
Log Message:
-----------
Adding a bit more of as much as I can without breaking existing code...
Modified Paths:
--------------
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractPairbank.java
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractTermbank.java
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java
gate/trunk/plugins/TermRaider/src/gate/termraider/util/AbstractBank.java
gate/trunk/plugins/TermRaider/src/gate/termraider/util/TermComparatorByDescendingScore.java
Modified: gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractPairbank.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractPairbank.java 2014-02-26 15:12:08 UTC (rev 17437)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractPairbank.java 2014-02-26 15:16:19 UTC (rev 17438)
@@ -31,7 +31,6 @@
private static final long serialVersionUID = 424942970862740181L;
// CREOLE init parameters
- protected String inputASName;
protected transient List<Action> actionsList;
@@ -214,14 +213,6 @@
/***** CREOLE PARAMETERS *****/
- @CreoleParameter(comment = "input AS name",
- defaultValue = "")
- public void setInputASName(String name) {
- this.inputASName = name;
- }
- public String getInputASName() {
- return this.inputASName;
- }
}
Modified: gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractTermbank.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractTermbank.java 2014-02-26 15:12:08 UTC (rev 17437)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/bank/AbstractTermbank.java 2014-02-26 15:16:19 UTC (rev 17438)
@@ -29,14 +29,15 @@
implements ActionsPublisher {
private static final long serialVersionUID = -2809051430169834059L;
- // CREOLE init parameters
- protected String inputASName;
+ // additional CREOLE init parameters
protected Set<String> inputAnnotationTypes;
// transient to allow serialization
protected transient List<Action> actionsList;
+ protected Map<ScoreType, Map<Term, Number>> scores;
protected Map<Term, Set<String>> termDocuments;
+
protected Map<Term, Double> termScores;
protected Map<Term, Double> rawTermScores;
protected List<Term> termsByDescendingScore, termsByDescendingFrequency,
@@ -51,6 +52,8 @@
public Resource init() throws ResourceInstantiationException {
prepare();
initializeScoreTypes();
+ // Above method must be set in each subclass;
+ // now we check it has been done.
if (this.scoreTypes.size() == 0) {
throw new ResourceInstantiationException("No score types found in " + this.toString());
}
@@ -305,16 +308,6 @@
/***** CREOLE PARAMETERS *****/
- @CreoleParameter(comment = "input AS name",
- defaultValue = "")
- public void setInputASName(String name) {
- this.inputASName = name;
- }
- public String getInputASName() {
- return this.inputASName;
- }
-
-
@CreoleParameter(comment = "input annotation types",
defaultValue = "SingleWord;MultiWord")
public void setInputAnnotationTypes(Set<String> names) {
Modified: gate/trunk/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java 2014-02-26 15:12:08 UTC (rev 17437)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java 2014-02-26 15:16:19 UTC (rev 17438)
@@ -296,7 +296,7 @@
protected void initializeScoreTypes() {
// Whatever this is called, it must be the reference
- // document frequency, so we will only meed
+ // document frequency, so we will only need
// getDefaultScoreType()
this.scoreTypes = new ArrayList<ScoreType>();
this.scoreTypes.add(new ScoreType(scoreProperty));
Modified: gate/trunk/plugins/TermRaider/src/gate/termraider/util/AbstractBank.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/util/AbstractBank.java 2014-02-26 15:12:08 UTC (rev 17437)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/util/AbstractBank.java 2014-02-26 15:16:19 UTC (rev 17438)
@@ -76,6 +76,7 @@
protected String inputAnnotationFeature;
protected Set<Corpus> corpora;
protected boolean debugMode;
+ protected String inputASName;
@@ -130,4 +131,14 @@
return this.debugMode;
}
+ @CreoleParameter(comment = "input AS name",
+ defaultValue = "")
+ public void setInputASName(String name) {
+ this.inputASName = name;
+ }
+ public String getInputASName() {
+ return this.inputASName;
+ }
+
+
}
Modified: gate/trunk/plugins/TermRaider/src/gate/termraider/util/TermComparatorByDescendingScore.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/util/TermComparatorByDescendingScore.java 2014-02-26 15:12:08 UTC (rev 17437)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/util/TermComparatorByDescendingScore.java 2014-02-26 15:16:19 UTC (rev 17438)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010--2012, The University of Sheffield. See the file
+ * Copyright (c) 2010--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
@@ -18,6 +18,9 @@
*/
public class TermComparatorByDescendingScore implements Comparator<Term> {
+ // TODO: may be able to change this to Map<Term, Number>
+ // in future after regularization of all the scoring
+ // maps in one Map<ScoreType, Map<Term, Number>> ?!?
private Map<Term, ? extends Number> termScores;
public TermComparatorByDescendingScore(Map<Term, ? extends Number> termScores) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|