You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/03/14 01:07:52 UTC
svn commit: r1300422 - in /incubator/lucene.net/trunk/test: contrib/Queries/
core/Analysis/ core/Index/ core/Search/
Author: ccurrens
Date: Wed Mar 14 00:07:51 2012
New Revision: 1300422
URL: http://svn.apache.org/viewvc?rev=1300422&view=rev
Log:
Fixing the build. Missed a few files on the last commit.
Modified:
incubator/lucene.net/trunk/test/contrib/Queries/DuplicateFilterTest.cs
incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs
incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs
incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs
incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
incubator/lucene.net/trunk/test/core/Index/TestLazyProxSkipping.cs
incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs
incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs
incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs
incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs
incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs
incubator/lucene.net/trunk/test/core/Index/TestSegmentTermDocs.cs
incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs
incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs
incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs
Modified: incubator/lucene.net/trunk/test/contrib/Queries/DuplicateFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Queries/DuplicateFilterTest.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Queries/DuplicateFilterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Queries/DuplicateFilterTest.cs Wed Mar 14 00:07:51 2012
@@ -145,7 +145,7 @@ namespace Lucene.Net.Search
int lastDoc = 0;
while (td.Next())
{
- lastDoc = td.Doc();
+ lastDoc = td.Doc;
}
Assert.AreEqual(lastDoc, h[i].Doc, "Duplicate urls should return last doc");
}
@@ -165,7 +165,7 @@ namespace Lucene.Net.Search
TermDocs td = reader.TermDocs(new Term(KEY_FIELD, url));
int lastDoc = 0;
td.Next();
- lastDoc = td.Doc();
+ lastDoc = td.Doc;
Assert.AreEqual(lastDoc, h[i].Doc, "Duplicate urls should return first doc");
}
}
Modified: incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Analysis/TestCachingTokenFilter.cs Wed Mar 14 00:07:51 2012
@@ -109,18 +109,18 @@ namespace Lucene.Net.Analysis
IndexReader reader = IndexReader.Open(dir, true);
TermPositions termPositions = reader.TermPositions(new Term("preanalyzed", "term1"));
Assert.IsTrue(termPositions.Next());
- Assert.AreEqual(1, termPositions.Freq());
+ Assert.AreEqual(1, termPositions.Freq);
Assert.AreEqual(0, termPositions.NextPosition());
termPositions.Seek(new Term("preanalyzed", "term2"));
Assert.IsTrue(termPositions.Next());
- Assert.AreEqual(2, termPositions.Freq());
+ Assert.AreEqual(2, termPositions.Freq);
Assert.AreEqual(1, termPositions.NextPosition());
Assert.AreEqual(3, termPositions.NextPosition());
termPositions.Seek(new Term("preanalyzed", "term3"));
Assert.IsTrue(termPositions.Next());
- Assert.AreEqual(1, termPositions.Freq());
+ Assert.AreEqual(1, termPositions.Freq);
Assert.AreEqual(2, termPositions.NextPosition());
reader.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDirectoryReader.cs Wed Mar 14 00:07:51 2012
@@ -194,7 +194,7 @@ namespace Lucene.Net.Index
// This should blow up if we forget to check that the TermEnum is from the same
// reader as the TermDocs.
while (td2.Next())
- ret += td2.Doc();
+ ret += td2.Doc;
td2.Close();
te3.Close();
@@ -212,8 +212,8 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_DOCS; i++)
{
Assert.IsTrue(td.Next());
- Assert.AreEqual(i, td.Doc());
- Assert.AreEqual(1, td.Freq());
+ Assert.AreEqual(i, td.Doc);
+ Assert.AreEqual(1, td.Freq);
}
td.Close();
reader.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestDoc.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDoc.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDoc.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDoc.cs Wed Mar 14 00:07:51 2012
@@ -242,11 +242,11 @@ namespace Lucene.Net.Index
{
while (positions.Next())
{
- out_Renamed.Write(" doc=" + positions.Doc());
- out_Renamed.Write(" TF=" + positions.Freq());
+ out_Renamed.Write(" doc=" + positions.Doc);
+ out_Renamed.Write(" TF=" + positions.Freq);
out_Renamed.Write(" pos=");
out_Renamed.Write(positions.NextPosition());
- for (int j = 1; j < positions.Freq(); j++)
+ for (int j = 1; j < positions.Freq; j++)
out_Renamed.Write("," + positions.NextPosition());
out_Renamed.WriteLine("");
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestDocumentWriter.cs Wed Mar 14 00:07:51 2012
@@ -297,7 +297,7 @@ namespace Lucene.Net.Index
TermPositions termPositions = reader.TermPositions(new Term("repeated", "repeated"));
Assert.IsTrue(termPositions.Next());
- int freq = termPositions.Freq();
+ int freq = termPositions.Freq;
Assert.AreEqual(2, freq);
Assert.AreEqual(0, termPositions.NextPosition());
Assert.AreEqual(502, termPositions.NextPosition());
@@ -321,7 +321,7 @@ namespace Lucene.Net.Index
TermPositions termPositions = reader.TermPositions(new Term("f1", "a"));
Assert.IsTrue(termPositions.Next());
- int freq = termPositions.Freq();
+ int freq = termPositions.Freq;
Assert.AreEqual(3, freq);
Assert.AreEqual(0, termPositions.NextPosition());
Assert.AreEqual(true, termPositions.IsPayloadAvailable);
@@ -348,18 +348,18 @@ namespace Lucene.Net.Index
TermPositions termPositions = reader.TermPositions(new Term("preanalyzed", "term1"));
Assert.IsTrue(termPositions.Next());
- Assert.AreEqual(1, termPositions.Freq());
+ Assert.AreEqual(1, termPositions.Freq);
Assert.AreEqual(0, termPositions.NextPosition());
termPositions.Seek(new Term("preanalyzed", "term2"));
Assert.IsTrue(termPositions.Next());
- Assert.AreEqual(2, termPositions.Freq());
+ Assert.AreEqual(2, termPositions.Freq);
Assert.AreEqual(1, termPositions.NextPosition());
Assert.AreEqual(3, termPositions.NextPosition());
termPositions.Seek(new Term("preanalyzed", "term3"));
Assert.IsTrue(termPositions.Next());
- Assert.AreEqual(1, termPositions.Freq());
+ Assert.AreEqual(1, termPositions.Freq);
Assert.AreEqual(2, termPositions.NextPosition());
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestFilterIndexReader.cs Wed Mar 14 00:07:51 2012
@@ -67,7 +67,7 @@ namespace Lucene.Net.Index
{
while (in_Renamed.Next())
{
- if ((in_Renamed.Doc() % 2) == 1)
+ if ((in_Renamed.Doc % 2) == 1)
return true;
}
return false;
@@ -135,7 +135,7 @@ namespace Lucene.Net.Index
TermPositions positions = reader.TermPositions(new Term("default", "one"));
while (positions.Next())
{
- Assert.IsTrue((positions.Doc() % 2) == 1);
+ Assert.IsTrue((positions.Doc % 2) == 1);
}
int NUM_DOCS = 3;
@@ -144,8 +144,8 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_DOCS; i++)
{
Assert.IsTrue(td.Next());
- Assert.AreEqual(i, td.Doc());
- Assert.AreEqual(1, td.Freq());
+ Assert.AreEqual(i, td.Doc);
+ Assert.AreEqual(1, td.Freq);
}
td.Close();
reader.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexReader.cs Wed Mar 14 00:07:51 2012
@@ -1594,9 +1594,9 @@ namespace Lucene.Net.Index
while (tp1.Next())
{
Assert.IsTrue(tp2.Next());
- Assert.AreEqual(tp1.Doc(), tp2.Doc(), "Different doc id in postinglist of term " + enum1.Term() + ".");
- Assert.AreEqual(tp1.Freq(), tp2.Freq(), "Different term frequence in postinglist of term " + enum1.Term() + ".");
- for (int i = 0; i < tp1.Freq(); i++)
+ Assert.AreEqual(tp1.Doc, tp2.Doc, "Different doc id in postinglist of term " + enum1.Term() + ".");
+ Assert.AreEqual(tp1.Freq, tp2.Freq, "Different term frequence in postinglist of term " + enum1.Term() + ".");
+ for (int i = 0; i < tp1.Freq; i++)
{
Assert.AreEqual(tp1.NextPosition(), tp2.NextPosition(), "Different positions in postinglist of term " + enum1.Term() + ".");
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Wed Mar 14 00:07:51 2012
@@ -994,7 +994,7 @@ namespace Lucene.Net.Index
// massive term is skipped:
TermPositions tps = reader.TermPositions(new Term("content", "another"));
Assert.IsTrue(tps.Next());
- Assert.AreEqual(1, tps.Freq());
+ Assert.AreEqual(1, tps.Freq);
Assert.AreEqual(3, tps.NextPosition());
// Make sure the doc that has the massive term is in
@@ -1994,7 +1994,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(1, reader.DocFreq(t));
TermDocs td = reader.TermDocs(t);
td.Next();
- Assert.AreEqual(128 * 1024, td.Freq());
+ Assert.AreEqual(128 * 1024, td.Freq);
reader.Close();
dir.Close();
}
@@ -4292,7 +4292,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(1, hits.Length);
TermPositions tps = s.IndexReader.TermPositions(new Term("field", "a"));
Assert.IsTrue(tps.Next());
- Assert.AreEqual(1, tps.Freq());
+ Assert.AreEqual(1, tps.Freq);
Assert.AreEqual(0, tps.NextPosition());
w.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriterReader.cs Wed Mar 14 00:07:51 2012
@@ -176,7 +176,7 @@ namespace Lucene.Net.Index
TermDocs td = r.TermDocs(t);
while (td.Next())
{
- td.Doc();
+ var d = td.Doc;
count++;
}
td.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestLazyProxSkipping.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestLazyProxSkipping.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestLazyProxSkipping.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestLazyProxSkipping.cs Wed Mar 14 00:07:51 2012
@@ -170,14 +170,14 @@ namespace Lucene.Net.Index
for (int i = 0; i < 10; i++)
{
tp.Next();
- Assert.AreEqual(tp.Doc(), i);
+ Assert.AreEqual(tp.Doc, i);
Assert.AreEqual(tp.NextPosition(), 1);
}
tp.Seek(new Term(this.field, "a"));
for (int i = 0; i < 10; i++)
{
tp.Next();
- Assert.AreEqual(tp.Doc(), i);
+ Assert.AreEqual(tp.Doc, i);
Assert.AreEqual(tp.NextPosition(), 0);
}
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestMultiLevelSkipList.cs Wed Mar 14 00:07:51 2012
@@ -88,8 +88,8 @@ namespace Lucene.Net.Index
Assert.Fail("Too many bytes read: " + counter);
}
- Assert.AreEqual(target, tp.Doc(), "Wrong document " + tp.Doc() + " after skipTo target " + target);
- Assert.AreEqual(1, tp.Freq(), "Frequency is not 1: " + tp.Freq());
+ Assert.AreEqual(target, tp.Doc, "Wrong document " + tp.Doc + " after skipTo target " + target);
+ Assert.AreEqual(1, tp.Freq, "Frequency is not 1: " + tp.Freq);
tp.NextPosition();
byte[] b = new byte[1];
tp.GetPayload(b, 0);
Modified: incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestParallelReader.cs Wed Mar 14 00:07:51 2012
@@ -226,8 +226,8 @@ namespace Lucene.Net.Index
for (int i = 0; i < NUM_DOCS; i++)
{
Assert.IsTrue(td.Next());
- Assert.AreEqual(i, td.Doc());
- Assert.AreEqual(1, td.Freq());
+ Assert.AreEqual(i, td.Doc);
+ Assert.AreEqual(1, td.Freq);
}
td.Close();
pr.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestParallelTermEnum.cs Wed Mar 14 00:07:51 2012
@@ -90,97 +90,97 @@ namespace Lucene.Net.Index
Assert.AreEqual("field1:brown", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field1:fox", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field1:jumps", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field1:quick", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field1:the", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field2:brown", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field2:fox", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field2:jumps", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field2:quick", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field2:the", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field3:dog", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field3:fox", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field3:jumps", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field3:lazy", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field3:over", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsTrue(te.Next());
Assert.AreEqual("field3:the", te.Term().ToString());
td.Seek(te.Term());
Assert.IsTrue(td.Next());
- Assert.AreEqual(0, td.Doc());
+ Assert.AreEqual(0, td.Doc);
Assert.IsFalse(td.Next());
Assert.IsFalse(te.Next());
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestPayloads.cs Wed Mar 14 00:07:51 2012
@@ -296,7 +296,7 @@ namespace Lucene.Net.Index
{
tps[i].Next();
}
- int freq = tps[0].Freq();
+ int freq = tps[0].Freq;
for (int i = 0; i < freq; i++)
{
@@ -580,7 +580,7 @@ namespace Lucene.Net.Index
TermPositions tp = reader.TermPositions(terms.Term());
while (tp.Next())
{
- int freq = tp.Freq();
+ int freq = tp.Freq;
for (int i = 0; i < freq; i++)
{
tp.NextPosition();
Modified: incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestSegmentReader.cs Wed Mar 14 00:07:51 2012
@@ -161,7 +161,7 @@ namespace Lucene.Net.Index
TermPositions positions = reader.TermPositions();
positions.Seek(new Term(DocHelper.TEXT_FIELD_1_KEY, "field"));
Assert.IsTrue(positions != null);
- Assert.IsTrue(positions.Doc() == 0);
+ Assert.IsTrue(positions.Doc == 0);
Assert.IsTrue(positions.NextPosition() >= 0);
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestSegmentTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestSegmentTermDocs.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestSegmentTermDocs.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestSegmentTermDocs.cs Wed Mar 14 00:07:51 2012
@@ -83,9 +83,9 @@ namespace Lucene.Net.Index
segTermDocs.Seek(new Term(DocHelper.TEXT_FIELD_2_KEY, "field"));
if (segTermDocs.Next() == true)
{
- int docId = segTermDocs.Doc();
+ int docId = segTermDocs.Doc;
Assert.IsTrue(docId == 0);
- int freq = segTermDocs.Freq();
+ int freq = segTermDocs.Freq;
Assert.IsTrue(freq == 3);
}
reader.Close();
@@ -157,27 +157,27 @@ namespace Lucene.Net.Index
// with next
tdocs.Seek(ta);
Assert.IsTrue(tdocs.Next());
- Assert.AreEqual(0, tdocs.Doc());
- Assert.AreEqual(4, tdocs.Freq());
+ Assert.AreEqual(0, tdocs.Doc);
+ Assert.AreEqual(4, tdocs.Freq);
Assert.IsTrue(tdocs.Next());
- Assert.AreEqual(1, tdocs.Doc());
- Assert.AreEqual(4, tdocs.Freq());
+ Assert.AreEqual(1, tdocs.Doc);
+ Assert.AreEqual(4, tdocs.Freq);
Assert.IsTrue(tdocs.SkipTo(0));
- Assert.AreEqual(2, tdocs.Doc());
+ Assert.AreEqual(2, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(4));
- Assert.AreEqual(4, tdocs.Doc());
+ Assert.AreEqual(4, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(9));
- Assert.AreEqual(9, tdocs.Doc());
+ Assert.AreEqual(9, tdocs.Doc);
Assert.IsFalse(tdocs.SkipTo(10));
// without next
tdocs.Seek(ta);
Assert.IsTrue(tdocs.SkipTo(0));
- Assert.AreEqual(0, tdocs.Doc());
+ Assert.AreEqual(0, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(4));
- Assert.AreEqual(4, tdocs.Doc());
+ Assert.AreEqual(4, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(9));
- Assert.AreEqual(9, tdocs.Doc());
+ Assert.AreEqual(9, tdocs.Doc);
Assert.IsFalse(tdocs.SkipTo(10));
// exactly skipInterval documents and therefore with optimization
@@ -185,31 +185,31 @@ namespace Lucene.Net.Index
// with next
tdocs.Seek(tb);
Assert.IsTrue(tdocs.Next());
- Assert.AreEqual(10, tdocs.Doc());
- Assert.AreEqual(4, tdocs.Freq());
+ Assert.AreEqual(10, tdocs.Doc);
+ Assert.AreEqual(4, tdocs.Freq);
Assert.IsTrue(tdocs.Next());
- Assert.AreEqual(11, tdocs.Doc());
- Assert.AreEqual(4, tdocs.Freq());
+ Assert.AreEqual(11, tdocs.Doc);
+ Assert.AreEqual(4, tdocs.Freq);
Assert.IsTrue(tdocs.SkipTo(5));
- Assert.AreEqual(12, tdocs.Doc());
+ Assert.AreEqual(12, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(15));
- Assert.AreEqual(15, tdocs.Doc());
+ Assert.AreEqual(15, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(24));
- Assert.AreEqual(24, tdocs.Doc());
+ Assert.AreEqual(24, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(25));
- Assert.AreEqual(25, tdocs.Doc());
+ Assert.AreEqual(25, tdocs.Doc);
Assert.IsFalse(tdocs.SkipTo(26));
// without next
tdocs.Seek(tb);
Assert.IsTrue(tdocs.SkipTo(5));
- Assert.AreEqual(10, tdocs.Doc());
+ Assert.AreEqual(10, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(15));
- Assert.AreEqual(15, tdocs.Doc());
+ Assert.AreEqual(15, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(24));
- Assert.AreEqual(24, tdocs.Doc());
+ Assert.AreEqual(24, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(25));
- Assert.AreEqual(25, tdocs.Doc());
+ Assert.AreEqual(25, tdocs.Doc);
Assert.IsFalse(tdocs.SkipTo(26));
// much more than skipInterval documents and therefore with optimization
@@ -217,35 +217,35 @@ namespace Lucene.Net.Index
// with next
tdocs.Seek(tc);
Assert.IsTrue(tdocs.Next());
- Assert.AreEqual(26, tdocs.Doc());
- Assert.AreEqual(4, tdocs.Freq());
+ Assert.AreEqual(26, tdocs.Doc);
+ Assert.AreEqual(4, tdocs.Freq);
Assert.IsTrue(tdocs.Next());
- Assert.AreEqual(27, tdocs.Doc());
- Assert.AreEqual(4, tdocs.Freq());
+ Assert.AreEqual(27, tdocs.Doc);
+ Assert.AreEqual(4, tdocs.Freq);
Assert.IsTrue(tdocs.SkipTo(5));
- Assert.AreEqual(28, tdocs.Doc());
+ Assert.AreEqual(28, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(40));
- Assert.AreEqual(40, tdocs.Doc());
+ Assert.AreEqual(40, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(57));
- Assert.AreEqual(57, tdocs.Doc());
+ Assert.AreEqual(57, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(74));
- Assert.AreEqual(74, tdocs.Doc());
+ Assert.AreEqual(74, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(75));
- Assert.AreEqual(75, tdocs.Doc());
+ Assert.AreEqual(75, tdocs.Doc);
Assert.IsFalse(tdocs.SkipTo(76));
//without next
tdocs.Seek(tc);
Assert.IsTrue(tdocs.SkipTo(5));
- Assert.AreEqual(26, tdocs.Doc());
+ Assert.AreEqual(26, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(40));
- Assert.AreEqual(40, tdocs.Doc());
+ Assert.AreEqual(40, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(57));
- Assert.AreEqual(57, tdocs.Doc());
+ Assert.AreEqual(57, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(74));
- Assert.AreEqual(74, tdocs.Doc());
+ Assert.AreEqual(74, tdocs.Doc);
Assert.IsTrue(tdocs.SkipTo(75));
- Assert.AreEqual(75, tdocs.Doc());
+ Assert.AreEqual(75, tdocs.Doc);
Assert.IsFalse(tdocs.SkipTo(76));
tdocs.Close();
Modified: incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs Wed Mar 14 00:07:51 2012
@@ -344,12 +344,12 @@ namespace Lucene.Net.Index
continue;
}
- int id1 = termDocs1.Doc();
+ int id1 = termDocs1.Doc;
Assert.IsFalse(termDocs1.Next());
termDocs2.Seek(termEnum);
Assert.IsTrue(termDocs2.Next());
- int id2 = termDocs2.Doc();
+ int id2 = termDocs2.Doc;
Assert.IsFalse(termDocs2.Next());
r2r1[id2] = id1;
@@ -421,8 +421,8 @@ namespace Lucene.Net.Index
termDocs1.Seek(termEnum1);
while (termDocs1.Next())
{
- int d1 = termDocs1.Doc();
- int f1 = termDocs1.Freq();
+ int d1 = termDocs1.Doc;
+ int f1 = termDocs1.Freq;
info1[len1] = (((long) d1) << 32) | f1;
len1++;
}
@@ -443,8 +443,8 @@ namespace Lucene.Net.Index
termDocs2.Seek(termEnum2);
while (termDocs2.Next())
{
- int d2 = termDocs2.Doc();
- int f2 = termDocs2.Freq();
+ int d2 = termDocs2.Doc;
+ int f2 = termDocs2.Freq;
info2[len2] = (((long) r2r1[d2]) << 32) | f2;
len2++;
}
Modified: incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs Wed Mar 14 00:07:51 2012
@@ -148,7 +148,7 @@ namespace Lucene.Net.Index
tdocs.Seek(tenum);
while (tdocs.Next())
{
- ret += tdocs.Doc();
+ ret += tdocs.Doc;
}
}
Modified: incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs Wed Mar 14 00:07:51 2012
@@ -299,7 +299,7 @@ namespace Lucene.Net.Search
int count = 0;
Assert.IsTrue(tp.Next());
// "a" occurs 4 times
- Assert.AreEqual(4, tp.Freq());
+ Assert.AreEqual(4, tp.Freq);
int expected = 0;
Assert.AreEqual(expected, tp.NextPosition());
Assert.AreEqual(1, tp.NextPosition());
Modified: incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs?rev=1300422&r1=1300421&r2=1300422&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs Wed Mar 14 00:07:51 2012
@@ -284,8 +284,8 @@ namespace Lucene.Net.Search
termDocs.Seek(term);
while (termDocs.Next())
{
- int docId = termDocs.Doc();
- int freq = termDocs.Freq();
+ int docId = termDocs.Doc;
+ int freq = termDocs.Freq;
//System.out.println("Doc Id: " + docId + " freq " + freq);
TermFreqVector vector = knownSearcher.reader_ForNUnit.GetTermFreqVector(docId, "field");
float tf = sim.Tf(freq);