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:25:33 UTC
svn commit: r1300425 - in /incubator/lucene.net/trunk/src:
contrib/Core/Index/ contrib/Queries/ contrib/Spatial/Tier/ core/Index/
core/Search/ core/Search/Function/ core/Search/Spans/
Author: ccurrens
Date: Wed Mar 14 00:25:32 2012
New Revision: 1300425
URL: http://svn.apache.org/viewvc?rev=1300425&view=rev
Log:
Fixed the build after breaking the build thinking it was fixing the build.
Converted some methods to properties in TermDocs.cs
Modified:
incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs
incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs
incubator/lucene.net/trunk/src/contrib/Queries/TermsFilter.cs
incubator/lucene.net/trunk/src/contrib/Spatial/Tier/CartesianShapeFilter.cs
incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs
incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs
incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs
incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs
incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
incubator/lucene.net/trunk/src/core/Index/MultipleTermPositions.cs
incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs
incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
incubator/lucene.net/trunk/src/core/Index/TermDocs.cs
incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs
incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs
incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs
incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs
incubator/lucene.net/trunk/src/core/Search/PhrasePositions.cs
incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs
incubator/lucene.net/trunk/src/core/Search/TermQuery.cs
incubator/lucene.net/trunk/src/core/Search/TermScorer.cs
Modified: incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Core/Index/FieldEnumerator.cs Wed Mar 14 00:25:32 2012
@@ -461,7 +461,7 @@ namespace Lucene.Net.Index
/// </summary>
public int Current
{
- get { return this.termDocs.Doc(); }
+ get { return this.termDocs.Doc; }
}
#endregion
Modified: incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/DuplicateFilter.cs Wed Mar 14 00:25:32 2012
@@ -96,13 +96,13 @@ namespace Lucene.Net.Search
{
if (keepMode == KM_USE_FIRST_OCCURRENCE)
{
- bits.Set(td.Doc());
+ bits.Set(td.Doc);
}
else
{
do
{
- lastDoc = td.Doc();
+ lastDoc = td.Doc;
} while (td.Next());
bits.Set(lastDoc);
}
@@ -141,7 +141,7 @@ namespace Lucene.Net.Search
}
do
{
- lastDoc = td.Doc();
+ lastDoc = td.Doc;
bits.Clear(lastDoc);
} while (td.Next());
if (keepMode == KM_USE_LAST_OCCURRENCE)
Modified: incubator/lucene.net/trunk/src/contrib/Queries/TermsFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/TermsFilter.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/TermsFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/TermsFilter.cs Wed Mar 14 00:25:32 2012
@@ -60,7 +60,7 @@ namespace Lucene.Net.Search
td.Seek(t);
while (td.Next())
{
- result.Set(td.Doc());
+ result.Set(td.Doc);
}
}
}
Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Tier/CartesianShapeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Tier/CartesianShapeFilter.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Tier/CartesianShapeFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Tier/CartesianShapeFilter.cs Wed Mar 14 00:25:32 2012
@@ -51,7 +51,7 @@ namespace Lucene.Net.Spatial.Tier
// which have this boxId
while (termDocs.Next())
{
- bits.FastSet(termDocs.Doc());
+ bits.FastSet(termDocs.Doc);
}
}
Modified: incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs Wed Mar 14 00:25:32 2012
@@ -57,14 +57,14 @@ namespace Lucene.Net.Index
throw new NotSupportedException();
}
- public int Doc()
+ public int Doc
{
- return doc;
+ get { return doc; }
}
- public int Freq()
+ public int Freq
{
- return 1;
+ get { return 1; }
}
public bool Next()
Modified: incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/CheckIndex.cs Wed Mar 14 00:25:32 2012
@@ -686,8 +686,8 @@ namespace Lucene.Net.Index
while (termPositions.Next())
{
freq0++;
- int doc = termPositions.Doc();
- int freq = termPositions.Freq();
+ int doc = termPositions.Doc;
+ int freq = termPositions.Freq;
if (doc <= lastDoc)
{
throw new System.SystemException("term " + term + ": doc " + doc + " <= lastDoc " + lastDoc);
Modified: incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs Wed Mar 14 00:25:32 2012
@@ -1355,16 +1355,17 @@ namespace Lucene.Net.Index
readerTermDocs = new TermDocs[r.Length];
}
-
- public virtual int Doc()
+
+ public virtual int Doc
{
- return base_Renamed + current.Doc();
+ get { return base_Renamed + current.Doc; }
}
- public virtual int Freq()
+
+ public virtual int Freq
{
- return current.Freq();
+ get { return current.Freq; }
}
-
+
public virtual void Seek(Term term)
{
this.term = term;
Modified: incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs Wed Mar 14 00:25:32 2012
@@ -1344,7 +1344,7 @@ namespace Lucene.Net.Index
int limit = entry.Value.GetNum();
while (docs.Next())
{
- int docID = docs.Doc();
+ int docID = docs.Doc;
if (docIDStart + docID >= limit)
break;
reader.DeleteDocument(docID);
Modified: incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FilterIndexReader.cs Wed Mar 14 00:25:32 2012
@@ -54,15 +54,18 @@ namespace Lucene.Net.Index
{
in_Renamed.Seek(termEnum);
}
- public virtual int Doc()
- {
- return in_Renamed.Doc();
- }
- public virtual int Freq()
- {
- return in_Renamed.Freq();
- }
- public virtual bool Next()
+
+ public virtual int Doc
+ {
+ get { return in_Renamed.Doc; }
+ }
+
+ public virtual int Freq
+ {
+ get { return in_Renamed.Freq; }
+ }
+
+ public virtual bool Next()
{
return in_Renamed.Next();
}
Modified: incubator/lucene.net/trunk/src/core/Index/IndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexReader.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexReader.cs Wed Mar 14 00:25:32 2012
@@ -1031,7 +1031,7 @@ namespace Lucene.Net.Index
{
while (docs.Next())
{
- DeleteDocument(docs.Doc());
+ DeleteDocument(docs.Doc);
n++;
}
}
Modified: incubator/lucene.net/trunk/src/core/Index/MultipleTermPositions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/MultipleTermPositions.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/MultipleTermPositions.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/MultipleTermPositions.cs Wed Mar 14 00:25:32 2012
@@ -46,7 +46,7 @@ namespace Lucene.Net.Index
public override bool LessThan(TermPositions a, TermPositions b)
{
- return a.Doc() < b.Doc();
+ return a.Doc < b.Doc;
}
}
@@ -131,14 +131,14 @@ namespace Lucene.Net.Index
return false;
_posList.clear();
- _doc = _termPositionsQueue.Peek().Doc();
+ _doc = _termPositionsQueue.Peek().Doc;
TermPositions tp;
do
{
tp = _termPositionsQueue.Peek();
- for (int i = 0; i < tp.Freq(); i++)
+ for (int i = 0; i < tp.Freq; i++)
_posList.add(tp.NextPosition());
if (tp.Next())
@@ -149,7 +149,7 @@ namespace Lucene.Net.Index
tp.Close();
}
}
- while (_termPositionsQueue.Size() > 0 && _termPositionsQueue.Peek().Doc() == _doc);
+ while (_termPositionsQueue.Size() > 0 && _termPositionsQueue.Peek().Doc == _doc);
_posList.sort();
_freq = _posList.size();
@@ -164,7 +164,7 @@ namespace Lucene.Net.Index
public bool SkipTo(int target)
{
- while (_termPositionsQueue.Peek() != null && target > _termPositionsQueue.Peek().Doc())
+ while (_termPositionsQueue.Peek() != null && target > _termPositionsQueue.Peek().Doc)
{
TermPositions tp = _termPositionsQueue.Pop();
if (tp.SkipTo(target))
@@ -174,18 +174,18 @@ namespace Lucene.Net.Index
}
return Next();
}
-
- public int Doc()
- {
- return _doc;
- }
-
- public int Freq()
- {
- return _freq;
- }
-
- [Obsolete("Use Dispose() instead")]
+
+ public int Doc
+ {
+ get { return _doc; }
+ }
+
+ public int Freq
+ {
+ get { return _freq; }
+ }
+
+ [Obsolete("Use Dispose() instead")]
public void Close()
{
Dispose();
Modified: incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs Wed Mar 14 00:25:32 2012
@@ -697,17 +697,18 @@ namespace Lucene.Net.Index
else
Seek(term);
}
-
- public virtual int Doc()
- {
- return termDocs.Doc();
- }
- public virtual int Freq()
- {
- return termDocs.Freq();
- }
-
- public virtual void Seek(Term term)
+
+ public virtual int Doc
+ {
+ get { return termDocs.Doc; }
+ }
+
+ public virtual int Freq
+ {
+ get { return termDocs.Freq; }
+ }
+
+ public virtual void Seek(Term term)
{
IndexReader reader = Enclosing_Instance.fieldToReader[term.Field];
termDocs = reader != null?reader.TermDocs(term):null;
Modified: incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentMerger.cs Wed Mar 14 00:25:32 2012
@@ -814,12 +814,12 @@ namespace Lucene.Net.Index
while (postings.Next())
{
df++;
- int doc = postings.Doc();
+ int doc = postings.Doc;
if (docMap != null)
doc = docMap[doc]; // map around deletions
doc += base_Renamed; // convert to merged space
- int freq = postings.Freq();
+ int freq = postings.Freq;
FormatPostingsPositionsConsumer posConsumer = docConsumer.AddDoc(doc, freq);
if (!omitTermFreqAndPositions)
Modified: incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentTermDocs.cs Wed Mar 14 00:25:32 2012
@@ -132,17 +132,18 @@ namespace Lucene.Net.Index
isDisposed = true;
}
-
- public int Doc()
- {
- return doc;
- }
- public int Freq()
- {
- return freq;
- }
-
- protected internal virtual void SkippingDoc()
+
+ public int Doc
+ {
+ get { return doc; }
+ }
+
+ public int Freq
+ {
+ get { return freq; }
+ }
+
+ protected internal virtual void SkippingDoc()
{
}
Modified: incubator/lucene.net/trunk/src/core/Index/TermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/TermDocs.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermDocs.cs Wed Mar 14 00:25:32 2012
@@ -37,18 +37,18 @@ namespace Lucene.Net.Index
/// This may be optimized in some implementations.
/// </summary>
void Seek(TermEnum termEnum);
-
- /// <summary>Returns the current document number. <p/> This is invalid until <see cref="Next()" />
- /// is called for the first time.
- /// </summary>
- int Doc();
-
- /// <summary>Returns the frequency of the term within the current document. <p/> This
- /// is invalid until <see cref="Next()" /> is called for the first time.
- /// </summary>
- int Freq();
-
- /// <summary>Moves to the next pair in the enumeration. <p/> Returns true iff there is
+
+ /// <summary>Returns the current document number. <p/> This is invalid until <see cref="Next()" />
+ /// is called for the first time.
+ /// </summary>
+ int Doc { get; }
+
+ /// <summary>Returns the frequency of the term within the current document. <p/> This
+ /// is invalid until <see cref="Next()" /> is called for the first time.
+ /// </summary>
+ int Freq { get; }
+
+ /// <summary>Moves to the next pair in the enumeration. <p/> Returns true iff there is
/// such a next pair in the enumeration.
/// </summary>
bool Next();
Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs Wed Mar 14 00:25:32 2012
@@ -346,7 +346,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -405,7 +405,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -474,7 +474,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -548,7 +548,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -620,7 +620,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -692,7 +692,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -742,7 +742,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = termval;
+ retArray[termDocs.Doc] = termval;
}
}
while (termEnum.Next());
@@ -797,7 +797,7 @@ namespace Lucene.Net.Search
termDocs.Seek(termEnum);
while (termDocs.Next())
{
- retArray[termDocs.Doc()] = t;
+ retArray[termDocs.Doc] = t;
}
t++;
Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheRangeFilter.cs Wed Mar 14 00:25:32 2012
@@ -841,7 +841,7 @@ namespace Lucene.Net.Search
if (!termDocs.Next())
return doc = NO_MORE_DOCS;
}
- while (!Enclosing_Instance.MatchDoc(doc = termDocs.Doc()));
+ while (!Enclosing_Instance.MatchDoc(doc = termDocs.Doc));
return doc;
}
@@ -849,7 +849,7 @@ namespace Lucene.Net.Search
{
if (!termDocs.SkipTo(target))
return doc = NO_MORE_DOCS;
- while (!Enclosing_Instance.MatchDoc(doc = termDocs.Doc()))
+ while (!Enclosing_Instance.MatchDoc(doc = termDocs.Doc))
{
if (!termDocs.Next())
return doc = NO_MORE_DOCS;
Modified: incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Function/ValueSourceQuery.cs Wed Mar 14 00:25:32 2012
@@ -183,7 +183,7 @@ namespace Lucene.Net.Search.Function
public override int NextDoc()
{
- return doc = termDocs.Next() ? termDocs.Doc() : NO_MORE_DOCS;
+ return doc = termDocs.Next() ? termDocs.Doc : NO_MORE_DOCS;
}
public override int DocID()
@@ -193,13 +193,13 @@ namespace Lucene.Net.Search.Function
public override int Advance(int target)
{
- return doc = termDocs.SkipTo(target) ? termDocs.Doc() : NO_MORE_DOCS;
+ return doc = termDocs.SkipTo(target) ? termDocs.Doc : NO_MORE_DOCS;
}
/*(non-Javadoc) <see cref="Lucene.Net.Search.Scorer.explain(int) */
public override float Score()
{
- return qWeight * vals.FloatVal(termDocs.Doc());
+ return qWeight * vals.FloatVal(termDocs.Doc);
}
}
Modified: incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MatchAllDocsQuery.cs Wed Mar 14 00:25:32 2012
@@ -79,7 +79,7 @@ namespace Lucene.Net.Search
public override int NextDoc()
{
- return doc = termDocs.Next()?termDocs.Doc():NO_MORE_DOCS;
+ return doc = termDocs.Next()?termDocs.Doc:NO_MORE_DOCS;
}
public override float Score()
@@ -89,7 +89,7 @@ namespace Lucene.Net.Search
public override int Advance(int target)
{
- return doc = termDocs.SkipTo(target)?termDocs.Doc():NO_MORE_DOCS;
+ return doc = termDocs.SkipTo(target)?termDocs.Doc:NO_MORE_DOCS;
}
}
Modified: incubator/lucene.net/trunk/src/core/Search/PhrasePositions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/PhrasePositions.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/PhrasePositions.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/PhrasePositions.cs Wed Mar 14 00:25:32 2012
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
doc = System.Int32.MaxValue; // sentinel value
return false;
}
- doc = tp.Doc();
+ doc = tp.Doc;
position = 0;
return true;
}
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search
doc = System.Int32.MaxValue; // sentinel value
return false;
}
- doc = tp.Doc();
+ doc = tp.Doc;
position = 0;
return true;
}
@@ -69,7 +69,7 @@ namespace Lucene.Net.Search
internal void FirstPosition()
{
- count = tp.Freq(); // read first pos
+ count = tp.Freq; // read first pos
NextPosition();
}
Modified: incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs Wed Mar 14 00:25:32 2012
@@ -53,8 +53,8 @@ namespace Lucene.Net.Search.Spans
doc = System.Int32.MaxValue;
return false;
}
- doc = positions.Doc();
- freq = positions.Freq();
+ doc = positions.Doc;
+ freq = positions.Freq;
count = 0;
}
position = positions.NextPosition();
@@ -70,8 +70,8 @@ namespace Lucene.Net.Search.Spans
return false;
}
- doc = positions.Doc();
- freq = positions.Freq();
+ doc = positions.Doc;
+ freq = positions.Freq;
count = 0;
position = positions.NextPosition();
Modified: incubator/lucene.net/trunk/src/core/Search/TermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TermQuery.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TermQuery.cs Wed Mar 14 00:25:32 2012
@@ -142,9 +142,9 @@ namespace Lucene.Net.Search
{
try
{
- if (termDocs.SkipTo(doc) && termDocs.Doc() == doc)
+ if (termDocs.SkipTo(doc) && termDocs.Doc == doc)
{
- tf = termDocs.Freq();
+ tf = termDocs.Freq;
}
}
finally
Modified: incubator/lucene.net/trunk/src/core/Search/TermScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/TermScorer.cs?rev=1300425&r1=1300424&r2=1300425&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/TermScorer.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/TermScorer.cs Wed Mar 14 00:25:32 2012
@@ -165,8 +165,8 @@ namespace Lucene.Net.Search
{
pointerMax = 1;
pointer = 0;
- docs[pointer] = doc = termDocs.Doc();
- freqs[pointer] = termDocs.Freq();
+ docs[pointer] = doc = termDocs.Doc;
+ freqs[pointer] = termDocs.Freq;
}
else
{