You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by gs...@apache.org on 2008/11/12 15:35:16 UTC
svn commit: r713382 - in /lucene/solr/trunk/src:
java/org/apache/solr/common/params/TermVectorParams.java
java/org/apache/solr/handler/component/TermVectorComponent.java
test/org/apache/solr/handler/component/TermVectorComponentTest.java
Author: gsingers
Date: Wed Nov 12 06:35:15 2008
New Revision: 713382
URL: http://svn.apache.org/viewvc?rev=713382&view=rev
Log:
SOLR-651: minor fixes to input/output paramters/keys
Modified:
lucene/solr/trunk/src/java/org/apache/solr/common/params/TermVectorParams.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/params/TermVectorParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/params/TermVectorParams.java?rev=713382&r1=713381&r2=713382&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/params/TermVectorParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/params/TermVectorParams.java Wed Nov 12 06:35:15 2008
@@ -25,12 +25,12 @@
/**
* Return IDF information. May be expensive
* */
- public static final String IDF = TV_PREFIX + "idf";
+ public static final String DF = TV_PREFIX + "df";
/**
* Return TF-IDF calculation, i.e. (tf / idf). May be expensive.
*/
- public static final String TF_IDF = TV_PREFIX + "tf-idf";
+ public static final String TF_IDF = TV_PREFIX + "tf_idf";
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=713382&r1=713381&r2=713382&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/TermVectorComponent.java Wed Nov 12 06:35:15 2008
@@ -19,7 +19,6 @@
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocListAndSet;
import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.util.RefCounted;
import org.apache.solr.util.plugin.SolrCoreAware;
import java.io.IOException;
@@ -31,7 +30,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
/**
@@ -81,7 +79,7 @@
boolean termFreq = params.getBool(TermVectorParams.TF, false);
boolean positions = params.getBool(TermVectorParams.POSITIONS, false);
boolean offsets = params.getBool(TermVectorParams.OFFSETS, false);
- boolean idf = params.getBool(TermVectorParams.IDF, false);
+ boolean docFreq = params.getBool(TermVectorParams.DF, false);
boolean tfIdf = params.getBool(TermVectorParams.TF_IDF, false);
//boolean cacheIdf = params.getBool(TermVectorParams.IDF, false);
//short cut to all values.
@@ -90,7 +88,7 @@
termFreq = true;
positions = true;
offsets = true;
- idf = true;
+ docFreq = true;
tfIdf = true;
}
@@ -111,7 +109,7 @@
IndexReader reader = searcher.getReader();
//the TVMapper is a TermVectorMapper which can be used to optimize loading of Term Vectors
- TVMapper mapper = new TVMapper(fields, reader, termFreq, positions, offsets, idf, tfIdf);
+ TVMapper mapper = new TVMapper(fields, reader, termFreq, positions, offsets, docFreq, tfIdf);
IndexSchema schema = rb.req.getSchema();
String uniqFieldName = schema.getUniqueKeyField().getName();
//Only load the id field
@@ -188,21 +186,21 @@
private NamedList docNL;
private IndexReader reader;
private Set<String> fields;
- private boolean termFreq, positions, offsets, idf, tfIdf;
+ private boolean termFreq, positions, offsets, docFreq, tfIdf;
//internal vars not passed in by construction
private boolean map, useOffsets, usePositions;
//private Map<String, Integer> idfCache;
private NamedList fieldNL;
private Term currentTerm;
- public TVMapper(String[] fields, IndexReader reader, boolean termFreq, boolean positions, boolean offsets, boolean idf, boolean tfIdf) {
+ public TVMapper(String[] fields, IndexReader reader, boolean termFreq, boolean positions, boolean offsets, boolean docFreq, boolean tfIdf) {
this.reader = reader;
this.fields = fields != null ? new HashSet<String>(Arrays.asList(fields)) : Collections.<String>emptySet();
this.termFreq = termFreq;
this.positions = positions;
this.offsets = offsets;
- this.idf = idf;
+ this.docFreq = docFreq;
this.tfIdf = tfIdf;
}
@@ -212,7 +210,7 @@
NamedList termInfo = new NamedList();
fieldNL.add(term, termInfo);
if (termFreq == true) {
- termInfo.add("freq", frequency);
+ termInfo.add("tf", frequency);
}
if (useOffsets == true) {
NamedList theOffsets = new NamedList();
@@ -230,17 +228,17 @@
}
termInfo.add("positions", positionsNL);
}
- if (idf == true) {
- termInfo.add("idf", getIdf(term));
+ if (docFreq == true) {
+ termInfo.add("df", getDocFreq(term));
}
if (tfIdf == true){
- double tfIdfVal = ((double) frequency) / getIdf(term);
+ double tfIdfVal = ((double) frequency) / getDocFreq(term);
termInfo.add("tf-idf", tfIdfVal);
}
}
}
- private int getIdf(String term) {
+ private int getDocFreq(String term) {
int result = 1;
currentTerm = currentTerm.createTerm(term);
try {
@@ -256,7 +254,7 @@
public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
- if (idf == true && reader != null) {
+ if (docFreq == true && reader != null) {
this.currentTerm = new Term(field);
}
useOffsets = storeOffsets && offsets;
Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java?rev=713382&r1=713381&r2=713382&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java Wed Nov 12 06:35:15 2008
@@ -92,7 +92,7 @@
assertTrue(field.size() + " does not equal: " + 2, field.size() == 2);
NamedList titl = (NamedList) field.get("titl");
assertTrue("titl is null and it shouldn't be", titl != null);
- assertTrue(titl.get("freq") + " does not equal: " + 2, ((Integer) titl.get("freq")) == 2);
+ assertTrue(titl.get("tf") + " does not equal: " + 2, ((Integer) titl.get("tf")) == 2);
String uniqueKeyFieldName = (String) termVectors.getVal(1);
assertTrue("uniqueKeyFieldName is null and it shouldn't be", uniqueKeyFieldName != null);
@@ -108,7 +108,7 @@
params.add(CommonParams.Q, "id:0");
params.add(CommonParams.QT, "tvrh");
params.add(TermVectorParams.TF, "true");
- params.add(TermVectorParams.IDF, "true");
+ params.add(TermVectorParams.DF, "true");
params.add(TermVectorParams.OFFSETS, "true");
params.add(TermVectorParams.POSITIONS, "true");
params.add(TermVectorParams.TF_IDF, "true");
@@ -167,7 +167,7 @@
params.add(CommonParams.Q, "id:0");
params.add(CommonParams.QT, "tvrh");
params.add(TermVectorParams.TF, "true");
- params.add(TermVectorParams.IDF, "true");
+ params.add(TermVectorParams.DF, "true");
params.add(TermVectorParams.OFFSETS, "true");
params.add(TermVectorParams.POSITIONS, "true");
params.add(TermVectorComponent.COMPONENT_NAME, "true");