You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/01/28 10:15:59 UTC
[16/22] lucenenet git commit: Lucene.Net.Queries refactor: renamed
protected fields camelCase prefixed with m_
Lucene.Net.Queries refactor: renamed protected fields camelCase prefixed with m_
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d60b93d9
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d60b93d9
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d60b93d9
Branch: refs/heads/api-work
Commit: d60b93d97c4aa08fb61d77579c5ff0b4cdd77973
Parents: 99df7a2
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 09:48:13 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 09:48:13 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/CommonTermsQuery.cs | 120 +++++++++----------
src/Lucene.Net.Queries/CustomScoreProvider.cs | 4 +-
.../Function/DocValues/BoolDocValues.cs | 6 +-
.../DocValues/DocTermsIndexDocValues.cs | 40 +++----
.../Function/DocValues/DoubleDocValues.cs | 6 +-
.../Function/DocValues/FloatDocValues.cs | 6 +-
.../Function/DocValues/IntDocValues.cs | 6 +-
.../Function/DocValues/LongDocValues.cs | 6 +-
.../Function/DocValues/StrDocValues.cs | 6 +-
.../Function/FunctionQuery.cs | 28 ++---
.../Function/ValueSourceScorer.cs | 26 ++--
.../Function/ValueSources/ByteFieldSource.cs | 4 +-
.../ValueSources/BytesRefFieldSource.cs | 8 +-
.../Function/ValueSources/DefFunction.cs | 2 +-
.../Function/ValueSources/DocFreqValueSource.cs | 24 ++--
.../Function/ValueSources/DoubleFieldSource.cs | 14 +--
.../Function/ValueSources/DualFloatFunction.cs | 24 ++--
.../Function/ValueSources/EnumFieldSource.cs | 6 +-
.../Function/ValueSources/FieldCacheSource.cs | 16 +--
.../Function/ValueSources/FloatFieldSource.cs | 15 ++-
.../Function/ValueSources/IDFValueSource.cs | 4 +-
.../Function/ValueSources/IntFieldSource.cs | 6 +-
.../ValueSources/JoinDocFreqValueSource.cs | 14 +--
.../ValueSources/LinearFloatFunction.cs | 30 ++---
.../Function/ValueSources/LiteralValueSource.cs | 22 ++--
.../Function/ValueSources/LongFieldSource.cs | 14 +--
.../Function/ValueSources/MultiBoolFunction.cs | 16 +--
.../Function/ValueSources/MultiFloatFunction.cs | 18 +--
.../Function/ValueSources/MultiFunction.cs | 12 +-
.../Function/ValueSources/NormValueSource.cs | 14 +--
.../Function/ValueSources/OrdFieldSource.cs | 12 +-
.../ValueSources/RangeMapFloatFunction.cs | 56 ++++-----
.../ValueSources/ReciprocalFloatFunction.cs | 32 ++---
.../Function/ValueSources/ScaleFloatFunction.cs | 38 +++---
.../Function/ValueSources/ShortFieldSource.cs | 4 +-
.../Function/ValueSources/SimpleBoolFunction.cs | 14 +--
.../ValueSources/SimpleFloatFunction.cs | 2 +-
.../Function/ValueSources/SingleFunction.cs | 12 +-
.../ValueSources/SumTotalTermFreqValueSource.cs | 12 +-
.../Function/ValueSources/TFValueSource.cs | 6 +-
.../ValueSources/TermFreqValueSource.cs | 4 +-
.../ValueSources/TotalTermFreqValueSource.cs | 24 ++--
.../Function/ValueSources/VectorValueSource.cs | 25 ++--
src/Lucene.Net.Queries/TermsFilter.cs | 8 +-
.../TestCustomScoreQuery.cs | 2 +-
45 files changed, 383 insertions(+), 385 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index 01e33fc..422f56b 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -60,15 +60,15 @@ namespace Lucene.Net.Queries
* rewrite to dismax rather than boolean. Yet, this can already be subclassed
* to do so.
*/
- protected readonly IList<Term> terms = new List<Term>();
- protected readonly bool disableCoord;
- protected readonly float maxTermFrequency;
- protected readonly Occur lowFreqOccur;
- protected readonly Occur highFreqOccur;
- protected float lowFreqBoost = 1.0f;
- protected float highFreqBoost = 1.0f;
- protected float lowFreqMinNrShouldMatch = 0;
- protected float highFreqMinNrShouldMatch = 0;
+ protected readonly IList<Term> m_terms = new List<Term>();
+ protected readonly bool m_disableCoord;
+ protected readonly float m_maxTermFrequency;
+ protected readonly Occur m_lowFreqOccur;
+ protected readonly Occur m_highFreqOccur;
+ protected float m_lowFreqBoost = 1.0f;
+ protected float m_highFreqBoost = 1.0f;
+ protected float m_lowFreqMinNrShouldMatch = 0;
+ protected float m_highFreqMinNrShouldMatch = 0;
/// <summary>
/// Creates a new <seealso cref="CommonTermsQuery"/>
@@ -117,10 +117,10 @@ namespace Lucene.Net.Queries
{
throw new System.ArgumentException("lowFreqOccur should be MUST or SHOULD but was MUST_NOT");
}
- this.disableCoord = disableCoord;
- this.highFreqOccur = highFreqOccur;
- this.lowFreqOccur = lowFreqOccur;
- this.maxTermFrequency = maxTermFrequency;
+ this.m_disableCoord = disableCoord;
+ this.m_highFreqOccur = highFreqOccur;
+ this.m_lowFreqOccur = lowFreqOccur;
+ this.m_maxTermFrequency = maxTermFrequency;
}
/// <summary>
@@ -134,37 +134,37 @@ namespace Lucene.Net.Queries
{
throw new ArgumentException("Term must not be null");
}
- this.terms.Add(term);
+ this.m_terms.Add(term);
}
public override Query Rewrite(IndexReader reader)
{
- if (this.terms.Count == 0)
+ if (this.m_terms.Count == 0)
{
return new BooleanQuery();
}
- else if (this.terms.Count == 1)
+ else if (this.m_terms.Count == 1)
{
- Query tq = NewTermQuery(this.terms[0], null);
+ Query tq = NewTermQuery(this.m_terms[0], null);
tq.Boost = Boost;
return tq;
}
var leaves = reader.Leaves;
int maxDoc = reader.MaxDoc;
- var contextArray = new TermContext[terms.Count];
- var queryTerms = this.terms.ToArray();
+ var contextArray = new TermContext[m_terms.Count];
+ var queryTerms = this.m_terms.ToArray();
CollectTermContext(reader, leaves, contextArray, queryTerms);
return BuildQuery(maxDoc, contextArray, queryTerms);
}
protected virtual int CalcLowFreqMinimumNumberShouldMatch(int numOptional)
{
- return MinNrShouldMatch(lowFreqMinNrShouldMatch, numOptional);
+ return MinNrShouldMatch(m_lowFreqMinNrShouldMatch, numOptional);
}
protected virtual int CalcHighFreqMinimumNumberShouldMatch(int numOptional)
{
- return MinNrShouldMatch(highFreqMinNrShouldMatch, numOptional);
+ return MinNrShouldMatch(m_highFreqMinNrShouldMatch, numOptional);
}
private int MinNrShouldMatch(float minNrShouldMatch, int numOptional)
@@ -178,38 +178,38 @@ namespace Lucene.Net.Queries
protected virtual Query BuildQuery(int maxDoc, TermContext[] contextArray, Term[] queryTerms)
{
- var lowFreq = new BooleanQuery(disableCoord);
- var highFreq = new BooleanQuery(disableCoord) { Boost = highFreqBoost };
- lowFreq.Boost = lowFreqBoost;
+ var lowFreq = new BooleanQuery(m_disableCoord);
+ var highFreq = new BooleanQuery(m_disableCoord) { Boost = m_highFreqBoost };
+ lowFreq.Boost = m_lowFreqBoost;
var query = new BooleanQuery(true);
for (int i = 0; i < queryTerms.Length; i++)
{
TermContext termContext = contextArray[i];
if (termContext == null)
{
- lowFreq.Add(NewTermQuery(queryTerms[i], null), lowFreqOccur);
+ lowFreq.Add(NewTermQuery(queryTerms[i], null), m_lowFreqOccur);
}
else
{
- if ((maxTermFrequency >= 1f && termContext.DocFreq > maxTermFrequency) || (termContext.DocFreq > (int)Math.Ceiling(maxTermFrequency * (float)maxDoc)))
+ if ((m_maxTermFrequency >= 1f && termContext.DocFreq > m_maxTermFrequency) || (termContext.DocFreq > (int)Math.Ceiling(m_maxTermFrequency * (float)maxDoc)))
{
- highFreq.Add(NewTermQuery(queryTerms[i], termContext), highFreqOccur);
+ highFreq.Add(NewTermQuery(queryTerms[i], termContext), m_highFreqOccur);
}
else
{
- lowFreq.Add(NewTermQuery(queryTerms[i], termContext), lowFreqOccur);
+ lowFreq.Add(NewTermQuery(queryTerms[i], termContext), m_lowFreqOccur);
}
}
}
int numLowFreqClauses = lowFreq.GetClauses().Length;
int numHighFreqClauses = highFreq.GetClauses().Length;
- if (lowFreqOccur == Occur.SHOULD && numLowFreqClauses > 0)
+ if (m_lowFreqOccur == Occur.SHOULD && numLowFreqClauses > 0)
{
int minMustMatch = CalcLowFreqMinimumNumberShouldMatch(numLowFreqClauses);
lowFreq.MinimumNumberShouldMatch = minMustMatch;
}
- if (highFreqOccur == Occur.SHOULD && numHighFreqClauses > 0)
+ if (m_highFreqOccur == Occur.SHOULD && numHighFreqClauses > 0)
{
int minMustMatch = CalcHighFreqMinimumNumberShouldMatch(numHighFreqClauses);
highFreq.MinimumNumberShouldMatch = minMustMatch;
@@ -220,7 +220,7 @@ namespace Lucene.Net.Queries
* if lowFreq is empty we rewrite the high freq terms in a conjunction to
* prevent slow queries.
*/
- if (highFreq.MinimumNumberShouldMatch == 0 && highFreqOccur != Occur.MUST)
+ if (highFreq.MinimumNumberShouldMatch == 0 && m_highFreqOccur != Occur.MUST)
{
foreach (BooleanClause booleanClause in highFreq)
{
@@ -299,7 +299,7 @@ namespace Lucene.Net.Queries
{
get
{
- return disableCoord;
+ return m_disableCoord;
}
}
@@ -320,8 +320,8 @@ namespace Lucene.Net.Queries
/// the number of optional clauses that must match </param>
public virtual float LowFreqMinimumNumberShouldMatch
{
- get { return lowFreqMinNrShouldMatch; }
- set { lowFreqMinNrShouldMatch = value; }
+ get { return m_lowFreqMinNrShouldMatch; }
+ set { m_lowFreqMinNrShouldMatch = value; }
}
@@ -342,14 +342,14 @@ namespace Lucene.Net.Queries
/// the number of optional clauses that must match </param>
public virtual float HighFreqMinimumNumberShouldMatch
{
- get { return highFreqMinNrShouldMatch; }
- set { highFreqMinNrShouldMatch = value; }
+ get { return m_highFreqMinNrShouldMatch; }
+ set { m_highFreqMinNrShouldMatch = value; }
}
public override void ExtractTerms(ISet<Term> terms)
{
- terms.AddAll(this.terms);
+ terms.AddAll(this.m_terms);
}
public override string ToString(string field)
@@ -360,12 +360,12 @@ namespace Lucene.Net.Queries
{
buffer.Append("(");
}
- for (int i = 0; i < terms.Count; i++)
+ for (int i = 0; i < m_terms.Count; i++)
{
- Term t = terms[i];
+ Term t = m_terms[i];
buffer.Append(NewTermQuery(t, null).ToString());
- if (i != terms.Count - 1)
+ if (i != m_terms.Count - 1)
{
buffer.Append(", ");
}
@@ -393,15 +393,15 @@ namespace Lucene.Net.Queries
{
const int prime = 31;
int result = base.GetHashCode();
- result = prime * result + (disableCoord ? 1231 : 1237);
- result = prime * result + Number.FloatToIntBits(highFreqBoost);
- result = prime * result + /*((highFreqOccur == null) ? 0 :*/ highFreqOccur.GetHashCode()/*)*/;
- result = prime * result + Number.FloatToIntBits(lowFreqBoost);
- result = prime * result + /*((lowFreqOccur == null) ? 0 :*/ lowFreqOccur.GetHashCode()/*)*/;
- result = prime * result + Number.FloatToIntBits(maxTermFrequency);
- result = prime * result + Number.FloatToIntBits(lowFreqMinNrShouldMatch);
- result = prime * result + Number.FloatToIntBits(highFreqMinNrShouldMatch);
- result = prime * result + ((terms == null) ? 0 : terms.GetValueHashCode());
+ result = prime * result + (m_disableCoord ? 1231 : 1237);
+ result = prime * result + Number.FloatToIntBits(m_highFreqBoost);
+ result = prime * result + /*((highFreqOccur == null) ? 0 :*/ m_highFreqOccur.GetHashCode()/*)*/;
+ result = prime * result + Number.FloatToIntBits(m_lowFreqBoost);
+ result = prime * result + /*((lowFreqOccur == null) ? 0 :*/ m_lowFreqOccur.GetHashCode()/*)*/;
+ result = prime * result + Number.FloatToIntBits(m_maxTermFrequency);
+ result = prime * result + Number.FloatToIntBits(m_lowFreqMinNrShouldMatch);
+ result = prime * result + Number.FloatToIntBits(m_highFreqMinNrShouldMatch);
+ result = prime * result + ((m_terms == null) ? 0 : m_terms.GetValueHashCode());
return result;
}
@@ -420,46 +420,46 @@ namespace Lucene.Net.Queries
return false;
}
var other = (CommonTermsQuery)obj;
- if (disableCoord != other.disableCoord)
+ if (m_disableCoord != other.m_disableCoord)
{
return false;
}
- if (Number.FloatToIntBits(highFreqBoost) != Number.FloatToIntBits(other.highFreqBoost))
+ if (Number.FloatToIntBits(m_highFreqBoost) != Number.FloatToIntBits(other.m_highFreqBoost))
{
return false;
}
- if (highFreqOccur != other.highFreqOccur)
+ if (m_highFreqOccur != other.m_highFreqOccur)
{
return false;
}
- if (Number.FloatToIntBits(lowFreqBoost) != Number.FloatToIntBits(other.lowFreqBoost))
+ if (Number.FloatToIntBits(m_lowFreqBoost) != Number.FloatToIntBits(other.m_lowFreqBoost))
{
return false;
}
- if (lowFreqOccur != other.lowFreqOccur)
+ if (m_lowFreqOccur != other.m_lowFreqOccur)
{
return false;
}
- if (Number.FloatToIntBits(maxTermFrequency) != Number.FloatToIntBits(other.maxTermFrequency))
+ if (Number.FloatToIntBits(m_maxTermFrequency) != Number.FloatToIntBits(other.m_maxTermFrequency))
{
return false;
}
- if (lowFreqMinNrShouldMatch != other.lowFreqMinNrShouldMatch)
+ if (m_lowFreqMinNrShouldMatch != other.m_lowFreqMinNrShouldMatch)
{
return false;
}
- if (highFreqMinNrShouldMatch != other.highFreqMinNrShouldMatch)
+ if (m_highFreqMinNrShouldMatch != other.m_highFreqMinNrShouldMatch)
{
return false;
}
- if (terms == null)
+ if (m_terms == null)
{
- if (other.terms != null)
+ if (other.m_terms != null)
{
return false;
}
}
- else if (!terms.SequenceEqual(other.terms))
+ else if (!m_terms.SequenceEqual(other.m_terms))
{
return false;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/CustomScoreProvider.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CustomScoreProvider.cs b/src/Lucene.Net.Queries/CustomScoreProvider.cs
index 4347d96..8f32365 100644
--- a/src/Lucene.Net.Queries/CustomScoreProvider.cs
+++ b/src/Lucene.Net.Queries/CustomScoreProvider.cs
@@ -36,14 +36,14 @@ namespace Lucene.Net.Queries
/// </summary>
public class CustomScoreProvider
{
- protected readonly AtomicReaderContext context;
+ protected readonly AtomicReaderContext m_context;
/// <summary>
/// Creates a new instance of the provider class for the given <seealso cref="IndexReader"/>.
/// </summary>
public CustomScoreProvider(AtomicReaderContext context)
{
- this.context = context;
+ this.m_context = context;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
index 22c5231..55b01a7 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -26,11 +26,11 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class BoolDocValues : FunctionValues
{
- protected readonly ValueSource vs;
+ protected readonly ValueSource m_vs;
public BoolDocValues(ValueSource vs)
{
- this.vs = vs;
+ this.m_vs = vs;
}
public override abstract bool BoolVal(int doc);
@@ -77,7 +77,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override string ToString(int doc)
{
- return vs.GetDescription() + '=' + StrVal(doc);
+ return m_vs.GetDescription() + '=' + StrVal(doc);
}
public override ValueFiller GetValueFiller()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
index 2e98a64..bd337d1 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
@@ -29,23 +29,23 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class DocTermsIndexDocValues : FunctionValues
{
- protected readonly SortedDocValues termsIndex;
- protected readonly ValueSource vs;
- protected readonly MutableValueStr val = new MutableValueStr();
- protected readonly BytesRef spare = new BytesRef();
- protected readonly CharsRef spareChars = new CharsRef();
+ protected readonly SortedDocValues m_termsIndex;
+ protected readonly ValueSource m_vs;
+ protected readonly MutableValueStr m_val = new MutableValueStr();
+ protected readonly BytesRef m_spare = new BytesRef();
+ protected readonly CharsRef m_spareChars = new CharsRef();
public DocTermsIndexDocValues(ValueSource vs, AtomicReaderContext context, string field)
{
try
{
- termsIndex = FieldCache.DEFAULT.GetTermsIndex(context.AtomicReader, field);
+ m_termsIndex = FieldCache.DEFAULT.GetTermsIndex(context.AtomicReader, field);
}
catch (Exception e)
{
throw new DocTermsIndexException(field, e);
}
- this.vs = vs;
+ this.m_vs = vs;
}
protected abstract string ToTerm(string readableValue);
@@ -57,29 +57,29 @@ namespace Lucene.Net.Queries.Function.DocValues
public override int OrdVal(int doc)
{
- return termsIndex.GetOrd(doc);
+ return m_termsIndex.GetOrd(doc);
}
public override int NumOrd
{
- get { return termsIndex.ValueCount; }
+ get { return m_termsIndex.ValueCount; }
}
public override bool BytesVal(int doc, BytesRef target)
{
- termsIndex.Get(doc, target);
+ m_termsIndex.Get(doc, target);
return target.Length > 0;
}
public override string StrVal(int doc)
{
- termsIndex.Get(doc, spare);
- if (spare.Length == 0)
+ m_termsIndex.Get(doc, m_spare);
+ if (m_spare.Length == 0)
{
return null;
}
- UnicodeUtil.UTF8toUTF16(spare, spareChars);
- return spareChars.ToString();
+ UnicodeUtil.UTF8toUTF16(m_spare, m_spareChars);
+ return m_spareChars.ToString();
}
public override bool BoolVal(int doc)
@@ -98,7 +98,7 @@ namespace Lucene.Net.Queries.Function.DocValues
int lower = int.MinValue;
if (lowerVal != null)
{
- lower = termsIndex.LookupTerm(new BytesRef(lowerVal));
+ lower = m_termsIndex.LookupTerm(new BytesRef(lowerVal));
if (lower < 0)
{
lower = -lower - 1;
@@ -112,7 +112,7 @@ namespace Lucene.Net.Queries.Function.DocValues
int upper = int.MaxValue;
if (upperVal != null)
{
- upper = termsIndex.LookupTerm(new BytesRef(upperVal));
+ upper = m_termsIndex.LookupTerm(new BytesRef(upperVal));
if (upper < 0)
{
upper = -upper - 2;
@@ -146,14 +146,14 @@ namespace Lucene.Net.Queries.Function.DocValues
public override bool MatchesValue(int doc)
{
- int ord = outerInstance.termsIndex.GetOrd(doc);
+ int ord = outerInstance.m_termsIndex.GetOrd(doc);
return ord >= ll && ord <= uu;
}
}
public override string ToString(int doc)
{
- return vs.GetDescription() + '=' + StrVal(doc);
+ return m_vs.GetDescription() + '=' + StrVal(doc);
}
public override ValueFiller GetValueFiller()
@@ -183,7 +183,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override void FillValue(int doc)
{
- int ord = outerInstance.termsIndex.GetOrd(doc);
+ int ord = outerInstance.m_termsIndex.GetOrd(doc);
if (ord == -1)
{
mval.Value.Bytes = BytesRef.EMPTY_BYTES;
@@ -193,7 +193,7 @@ namespace Lucene.Net.Queries.Function.DocValues
}
else
{
- outerInstance.termsIndex.LookupOrd(ord, mval.Value);
+ outerInstance.m_termsIndex.LookupOrd(ord, mval.Value);
mval.Exists = true;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
index 1f5f674..f457267 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -27,11 +27,11 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class DoubleDocValues : FunctionValues
{
- protected readonly ValueSource vs;
+ protected readonly ValueSource m_vs;
public DoubleDocValues(ValueSource vs)
{
- this.vs = vs;
+ this.m_vs = vs;
}
public override sbyte ByteVal(int doc)
@@ -78,7 +78,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override string ToString(int doc)
{
- return vs.GetDescription() + '=' + StrVal(doc);
+ return m_vs.GetDescription() + '=' + StrVal(doc);
}
public override ValueSourceScorer GetRangeScorer(IndexReader reader, string lowerVal, string upperVal,
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
index 76b6471..8417433 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -26,11 +26,11 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class FloatDocValues : FunctionValues
{
- protected readonly ValueSource vs;
+ protected readonly ValueSource m_vs;
public FloatDocValues(ValueSource vs)
{
- this.vs = vs;
+ this.m_vs = vs;
}
public override sbyte ByteVal(int doc)
@@ -72,7 +72,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override string ToString(int doc)
{
- return vs.GetDescription() + '=' + StrVal(doc);
+ return m_vs.GetDescription() + '=' + StrVal(doc);
}
public override ValueFiller GetValueFiller()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
index 8107155..7091e9b 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -27,11 +27,11 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class IntDocValues : FunctionValues
{
- protected readonly ValueSource vs;
+ protected readonly ValueSource m_vs;
public IntDocValues(ValueSource vs)
{
- this.vs = vs;
+ this.m_vs = vs;
}
public override sbyte ByteVal(int doc)
@@ -73,7 +73,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override string ToString(int doc)
{
- return vs.GetDescription() + '=' + StrVal(doc);
+ return m_vs.GetDescription() + '=' + StrVal(doc);
}
public override ValueSourceScorer GetRangeScorer(IndexReader reader, string lowerVal, string upperVal, bool includeLower, bool includeUpper)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
index 4fd8a32..f5fa22c 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -27,11 +27,11 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class LongDocValues : FunctionValues
{
- protected readonly ValueSource vs;
+ protected readonly ValueSource m_vs;
public LongDocValues(ValueSource vs)
{
- this.vs = vs;
+ this.m_vs = vs;
}
public override sbyte ByteVal(int doc)
@@ -78,7 +78,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override string ToString(int doc)
{
- return vs.GetDescription() + '=' + StrVal(doc);
+ return m_vs.GetDescription() + '=' + StrVal(doc);
}
protected virtual long ExternalToLong(string extVal)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
index 0d1418d..7b05226 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
@@ -25,11 +25,11 @@ namespace Lucene.Net.Queries.Function.DocValues
/// </summary>
public abstract class StrDocValues : FunctionValues
{
- protected readonly ValueSource vs;
+ protected readonly ValueSource m_vs;
public StrDocValues(ValueSource vs)
{
- this.vs = vs;
+ this.m_vs = vs;
}
public override abstract string StrVal(int doc);
@@ -46,7 +46,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override string ToString(int doc)
{
- return vs.GetDescription() + "='" + StrVal(doc) + "'";
+ return m_vs.GetDescription() + "='" + StrVal(doc) + "'";
}
public override ValueFiller GetValueFiller()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/FunctionQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionQuery.cs b/src/Lucene.Net.Queries/Function/FunctionQuery.cs
index e3bfce3..11ad039 100644
--- a/src/Lucene.Net.Queries/Function/FunctionQuery.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionQuery.cs
@@ -64,17 +64,17 @@ namespace Lucene.Net.Queries.Function
{
private readonly FunctionQuery outerInstance;
- protected readonly IndexSearcher searcher;
- protected internal float queryNorm;
- protected float queryWeight;
- protected internal readonly IDictionary context;
+ protected readonly IndexSearcher m_searcher;
+ protected internal float m_queryNorm;
+ protected float m_queryWeight;
+ protected internal readonly IDictionary m_context;
public FunctionWeight(FunctionQuery outerInstance, IndexSearcher searcher)
{
this.outerInstance = outerInstance;
- this.searcher = searcher;
- this.context = ValueSource.NewContext(searcher);
- outerInstance.func.CreateWeight(context, searcher);
+ this.m_searcher = searcher;
+ this.m_context = ValueSource.NewContext(searcher);
+ outerInstance.func.CreateWeight(m_context, searcher);
}
public override Query Query
@@ -87,19 +87,19 @@ namespace Lucene.Net.Queries.Function
public override float GetValueForNormalization()
{
- queryWeight = outerInstance.Boost;
- return queryWeight * queryWeight;
+ m_queryWeight = outerInstance.Boost;
+ return m_queryWeight * m_queryWeight;
}
public override void Normalize(float norm, float topLevelBoost)
{
- this.queryNorm = norm * topLevelBoost;
- queryWeight *= this.queryNorm;
+ this.m_queryNorm = norm * topLevelBoost;
+ m_queryWeight *= this.m_queryNorm;
}
public override Scorer GetScorer(AtomicReaderContext ctx, IBits acceptDocs)
{
- return new AllScorer(outerInstance, ctx, acceptDocs, this, queryWeight);
+ return new AllScorer(outerInstance, ctx, acceptDocs, this, m_queryWeight);
}
public override Explanation Explain(AtomicReaderContext ctx, int doc)
@@ -130,7 +130,7 @@ namespace Lucene.Net.Queries.Function
this.reader = context.Reader;
this.maxDoc = reader.MaxDoc;
this.acceptDocs = acceptDocs;
- vals = outerInstance.func.GetValues(weight.context, context);
+ vals = outerInstance.func.GetValues(weight.m_context, context);
}
public override int DocID
@@ -194,7 +194,7 @@ namespace Lucene.Net.Queries.Function
result.AddDetail(vals.Explain(d));
result.AddDetail(new Explanation(outerInstance.Boost, "boost"));
- result.AddDetail(new Explanation(weight.queryNorm, "queryNorm"));
+ result.AddDetail(new Explanation(weight.m_queryNorm, "queryNorm"));
return result;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs b/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
index 66bcf0b..59ef2f9 100644
--- a/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
@@ -27,19 +27,19 @@ namespace Lucene.Net.Queries.Function
/// </summary>
public class ValueSourceScorer : Scorer
{
- protected readonly IndexReader reader;
+ protected readonly IndexReader m_reader;
private int doc = -1;
- protected readonly int maxDoc;
- protected readonly FunctionValues values;
- protected bool checkDeletes;
+ protected readonly int m_maxDoc;
+ protected readonly FunctionValues m_values;
+ protected bool m_checkDeletes;
private readonly IBits liveDocs;
protected internal ValueSourceScorer(IndexReader reader, FunctionValues values)
: base(null)
{
- this.reader = reader;
- this.maxDoc = reader.MaxDoc;
- this.values = values;
+ this.m_reader = reader;
+ this.m_maxDoc = reader.MaxDoc;
+ this.m_values = values;
SetCheckDeletes(true);
this.liveDocs = MultiFields.GetLiveDocs(reader);
}
@@ -48,18 +48,18 @@ namespace Lucene.Net.Queries.Function
{
get
{
- return reader;
+ return m_reader;
}
}
public virtual void SetCheckDeletes(bool checkDeletes)
{
- this.checkDeletes = checkDeletes && reader.HasDeletions;
+ this.m_checkDeletes = checkDeletes && m_reader.HasDeletions;
}
public virtual bool Matches(int doc)
{
- return (!checkDeletes || liveDocs.Get(doc)) && MatchesValue(doc);
+ return (!m_checkDeletes || liveDocs.Get(doc)) && MatchesValue(doc);
}
public virtual bool MatchesValue(int doc)
@@ -77,7 +77,7 @@ namespace Lucene.Net.Queries.Function
for (; ; )
{
doc++;
- if (doc >= maxDoc)
+ if (doc >= m_maxDoc)
{
return doc = NO_MORE_DOCS;
}
@@ -97,7 +97,7 @@ namespace Lucene.Net.Queries.Function
public override float GetScore()
{
- return values.FloatVal(doc);
+ return m_values.FloatVal(doc);
}
public override int Freq
@@ -107,7 +107,7 @@ namespace Lucene.Net.Queries.Function
public override long GetCost()
{
- return maxDoc;
+ return m_maxDoc;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
index b3b5a1b..b175070 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
@@ -48,12 +48,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return "byte(" + field + ')';
+ return "byte(" + m_field + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FieldCache.Bytes arr = cache.GetBytes(readerContext.AtomicReader, field, parser, false);
+ FieldCache.Bytes arr = m_cache.GetBytes(readerContext.AtomicReader, m_field, parser, false);
return new FunctionValuesAnonymousInnerClassHelper(this, arr);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
index 9199cd4..dc10900 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
@@ -35,18 +35,18 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FieldInfo fieldInfo = readerContext.AtomicReader.FieldInfos.FieldInfo(field);
+ FieldInfo fieldInfo = readerContext.AtomicReader.FieldInfos.FieldInfo(m_field);
// To be sorted or not to be sorted, that is the question
// TODO: do it cleaner?
if (fieldInfo != null && fieldInfo.DocValuesType == DocValuesType.BINARY)
{
- BinaryDocValues binaryValues = Search.FieldCache.DEFAULT.GetTerms(readerContext.AtomicReader, field, true);
- IBits docsWithField = Search.FieldCache.DEFAULT.GetDocsWithField(readerContext.AtomicReader, field);
+ BinaryDocValues binaryValues = Search.FieldCache.DEFAULT.GetTerms(readerContext.AtomicReader, m_field, true);
+ IBits docsWithField = Search.FieldCache.DEFAULT.GetDocsWithField(readerContext.AtomicReader, m_field);
return new FunctionValuesAnonymousInnerClassHelper(this, binaryValues, docsWithField);
}
else
{
- return new DocTermsIndexDocValuesAnonymousInnerClassHelper(this, this, readerContext, field);
+ return new DocTermsIndexDocValuesAnonymousInnerClassHelper(this, this, readerContext, m_field);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
index 139b65a..3917d14 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary fcontext, AtomicReaderContext readerContext)
{
- return new ValuesAnonymousInnerClassHelper(this, ValsArr(sources, fcontext, readerContext));
+ return new ValuesAnonymousInnerClassHelper(this, ValsArr(m_sources, fcontext, readerContext));
}
private class ValuesAnonymousInnerClassHelper : Values
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
index f1bbd24..acd6036 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
@@ -123,17 +123,17 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class DocFreqValueSource : ValueSource
{
- protected readonly string field;
- protected readonly string indexedField;
- protected readonly string val;
- protected readonly BytesRef indexedBytes;
+ protected readonly string m_field;
+ protected readonly string m_indexedField;
+ protected readonly string m_val;
+ protected readonly BytesRef m_indexedBytes;
public DocFreqValueSource(string field, string val, string indexedField, BytesRef indexedBytes)
{
- this.field = field;
- this.val = val;
- this.indexedField = indexedField;
- this.indexedBytes = indexedBytes;
+ this.m_field = field;
+ this.m_val = val;
+ this.m_indexedField = indexedField;
+ this.m_indexedBytes = indexedBytes;
}
public virtual string Name
@@ -143,13 +143,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return Name + '(' + field + ',' + val + ')';
+ return Name + '(' + m_field + ',' + m_val + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
var searcher = (IndexSearcher)context["searcher"];
- int docfreq = searcher.IndexReader.DocFreq(new Term(indexedField, indexedBytes));
+ int docfreq = searcher.IndexReader.DocFreq(new Term(m_indexedField, m_indexedBytes));
return new ConstIntDocValues(docfreq, this);
}
@@ -160,7 +160,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override int GetHashCode()
{
- return this.GetType().GetHashCode() + indexedField.GetHashCode() * 29 + indexedBytes.GetHashCode();
+ return this.GetType().GetHashCode() + m_indexedField.GetHashCode() * 29 + m_indexedBytes.GetHashCode();
}
public override bool Equals(object o)
@@ -170,7 +170,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return false;
}
var other = (DocFreqValueSource)o;
- return this.indexedField.Equals(other.indexedField) && this.indexedBytes.Equals(other.indexedBytes);
+ return this.m_indexedField.Equals(other.m_indexedField) && this.m_indexedBytes.Equals(other.m_indexedBytes);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
index ed78163..54e70f8 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class DoubleFieldSource : FieldCacheSource
{
- protected readonly FieldCache.IDoubleParser parser;
+ protected readonly FieldCache.IDoubleParser m_parser;
public DoubleFieldSource(string field)
: this(field, null)
@@ -40,18 +40,18 @@ namespace Lucene.Net.Queries.Function.ValueSources
public DoubleFieldSource(string field, FieldCache.IDoubleParser parser)
: base(field)
{
- this.parser = parser;
+ this.m_parser = parser;
}
public override string GetDescription()
{
- return "double(" + field + ')';
+ return "double(" + m_field + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var arr = cache.GetDoubles(readerContext.AtomicReader, field, parser, true);
- var valid = cache.GetDocsWithField(readerContext.AtomicReader, field);
+ var arr = m_cache.GetDoubles(readerContext.AtomicReader, m_field, m_parser, true);
+ var valid = m_cache.GetDocsWithField(readerContext.AtomicReader, m_field);
return new DoubleDocValuesAnonymousInnerClassHelper(this, arr, valid);
}
@@ -119,12 +119,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
return false;
}
return base.Equals(other) &&
- (this.parser == null ? other.parser == null : this.parser.GetType() == other.parser.GetType());
+ (this.m_parser == null ? other.m_parser == null : this.m_parser.GetType() == other.m_parser.GetType());
}
public override int GetHashCode()
{
- int h = parser == null ? typeof(double?).GetHashCode() : parser.GetType().GetHashCode();
+ int h = m_parser == null ? typeof(double?).GetHashCode() : m_parser.GetType().GetHashCode();
h += base.GetHashCode();
return h;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
index 369dc4e..feec489 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
@@ -29,15 +29,15 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class DualFloatFunction : ValueSource
{
- protected readonly ValueSource a;
- protected readonly ValueSource b;
+ protected readonly ValueSource m_a;
+ protected readonly ValueSource m_b;
/// <param name="a"> the base. </param>
/// <param name="b"> the exponent. </param>
public DualFloatFunction(ValueSource a, ValueSource b)
{
- this.a = a;
- this.b = b;
+ this.m_a = a;
+ this.m_b = b;
}
protected abstract string Name { get; }
@@ -45,13 +45,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return Name + "(" + a.GetDescription() + "," + b.GetDescription() + ")";
+ return Name + "(" + m_a.GetDescription() + "," + m_b.GetDescription() + ")";
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FunctionValues aVals = a.GetValues(context, readerContext);
- FunctionValues bVals = b.GetValues(context, readerContext);
+ FunctionValues aVals = m_a.GetValues(context, readerContext);
+ FunctionValues bVals = m_b.GetValues(context, readerContext);
return new FloatDocValuesAnonymousInnerClassHelper(this, this, aVals, bVals);
}
@@ -83,15 +83,15 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- a.CreateWeight(context, searcher);
- b.CreateWeight(context, searcher);
+ m_a.CreateWeight(context, searcher);
+ m_b.CreateWeight(context, searcher);
}
public override int GetHashCode()
{
- int h = a.GetHashCode();
+ int h = m_a.GetHashCode();
h ^= (h << 13) | ((int)((uint)h >> 20));
- h += b.GetHashCode();
+ h += m_b.GetHashCode();
h ^= (h << 23) | ((int)((uint)h >> 10));
h += Name.GetHashCode();
return h;
@@ -104,7 +104,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return false;
}
- return this.a.Equals(other.a) && this.b.Equals(other.b);
+ return this.m_a.Equals(other.m_a) && this.m_b.Equals(other.m_b);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
index 3b28473..2bec9d4 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -108,14 +108,14 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return "enum(" + field + ')';
+ return "enum(" + m_field + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var arr = cache.GetInts(readerContext.AtomicReader, field, parser, true);
- var valid = cache.GetDocsWithField(readerContext.AtomicReader, field);
+ var arr = m_cache.GetInts(readerContext.AtomicReader, m_field, parser, true);
+ var valid = m_cache.GetDocsWithField(readerContext.AtomicReader, m_field);
return new IntDocValuesAnonymousInnerClassHelper(this, this, arr, valid);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
index 9c8eb5a..09efeff 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
@@ -27,19 +27,19 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class FieldCacheSource : ValueSource
{
- protected readonly string field;
- protected readonly IFieldCache cache = Search.FieldCache.DEFAULT;
+ protected readonly string m_field;
+ protected readonly IFieldCache m_cache = Search.FieldCache.DEFAULT;
public FieldCacheSource(string field)
{
- this.field = field;
+ this.m_field = field;
}
public virtual IFieldCache FieldCache
{
get
{
- return cache;
+ return m_cache;
}
}
@@ -47,13 +47,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
get
{
- return field;
+ return m_field;
}
}
public override string GetDescription()
{
- return field;
+ return m_field;
}
public override bool Equals(object o)
@@ -63,12 +63,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return false;
}
- return field.Equals(other.field) && cache == other.cache;
+ return m_field.Equals(other.m_field) && m_cache == other.m_cache;
}
public override int GetHashCode()
{
- return cache.GetHashCode() + field.GetHashCode();
+ return m_cache.GetHashCode() + m_field.GetHashCode();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
index 26844c1..43ffeac 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -30,8 +30,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class FloatFieldSource : FieldCacheSource
{
-
- protected readonly FieldCache.IFloatParser parser;
+ protected readonly FieldCache.IFloatParser m_parser;
public FloatFieldSource(string field)
: this(field, null)
@@ -41,18 +40,18 @@ namespace Lucene.Net.Queries.Function.ValueSources
public FloatFieldSource(string field, FieldCache.IFloatParser parser)
: base(field)
{
- this.parser = parser;
+ this.m_parser = parser;
}
public override string GetDescription()
{
- return "float(" + field + ')';
+ return "float(" + m_field + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var arr = cache.GetFloats(readerContext.AtomicReader, field, parser, true);
- var valid = cache.GetDocsWithField(readerContext.AtomicReader, field);
+ var arr = m_cache.GetFloats(readerContext.AtomicReader, m_field, m_parser, true);
+ var valid = m_cache.GetDocsWithField(readerContext.AtomicReader, m_field);
return new FloatDocValuesAnonymousInnerClassHelper(this, arr, valid);
}
@@ -121,12 +120,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as FloatFieldSource;
if (other == null)
return false;
- return base.Equals(other) && (this.parser == null ? other.parser == null : this.parser.GetType() == other.parser.GetType());
+ return base.Equals(other) && (this.m_parser == null ? other.m_parser == null : this.m_parser.GetType() == other.m_parser.GetType());
}
public override int GetHashCode()
{
- int h = parser == null ? typeof(float?).GetHashCode() : parser.GetType().GetHashCode();
+ int h = m_parser == null ? typeof(float?).GetHashCode() : m_parser.GetType().GetHashCode();
h += base.GetHashCode();
return h;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
index dd1ccc2..0b14ff5 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
@@ -49,12 +49,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
var searcher = (IndexSearcher)context["searcher"];
- TFIDFSimilarity sim = AsTFIDF(searcher.Similarity, field);
+ TFIDFSimilarity sim = AsTFIDF(searcher.Similarity, m_field);
if (sim == null)
{
throw new System.NotSupportedException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
}
- int docfreq = searcher.IndexReader.DocFreq(new Term(indexedField, indexedBytes));
+ int docfreq = searcher.IndexReader.DocFreq(new Term(m_indexedField, m_indexedBytes));
float idf = sim.Idf(docfreq, searcher.IndexReader.MaxDoc);
return new ConstDoubleDocValues(idf, this);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
index d54ed49..dc2a634 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -46,13 +46,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return "int(" + field + ')';
+ return "int(" + m_field + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FieldCache.Ints arr = cache.GetInts(readerContext.AtomicReader, field, parser, true);
- IBits valid = cache.GetDocsWithField(readerContext.AtomicReader, field);
+ FieldCache.Ints arr = m_cache.GetInts(readerContext.AtomicReader, m_field, parser, true);
+ IBits valid = m_cache.GetDocsWithField(readerContext.AtomicReader, m_field);
return new IntDocValuesAnonymousInnerClassHelper(this, this, arr, valid);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
index 46327c3..19cc714 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
@@ -34,24 +34,24 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
public const string NAME = "joindf";
- protected readonly string qfield;
+ protected readonly string m_qfield;
public JoinDocFreqValueSource(string field, string qfield)
: base(field)
{
- this.qfield = qfield;
+ this.m_qfield = qfield;
}
public override string GetDescription()
{
- return NAME + "(" + field + ":(" + qfield + "))";
+ return NAME + "(" + m_field + ":(" + m_qfield + "))";
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- BinaryDocValues terms = cache.GetTerms(readerContext.AtomicReader, field, false, PackedInts.FAST);
+ BinaryDocValues terms = m_cache.GetTerms(readerContext.AtomicReader, m_field, false, PackedInts.FAST);
IndexReader top = ReaderUtil.GetTopLevelContext(readerContext).Reader;
- Terms t = MultiFields.GetTerms(top, qfield);
+ Terms t = MultiFields.GetTerms(top, m_qfield);
TermsEnum termsEnum = t == null ? TermsEnum.EMPTY : t.GetIterator(null);
return new IntDocValuesAnonymousInnerClassHelper(this, this, terms, termsEnum);
@@ -103,7 +103,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return false;
}
var other = (JoinDocFreqValueSource)o;
- if (!qfield.Equals(other.qfield))
+ if (!m_qfield.Equals(other.m_qfield))
{
return false;
}
@@ -112,7 +112,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override int GetHashCode()
{
- return qfield.GetHashCode() + base.GetHashCode();
+ return m_qfield.GetHashCode() + base.GetHashCode();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
index 558447d..bcc115c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
@@ -33,25 +33,25 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class LinearFloatFunction : ValueSource
{
- protected readonly ValueSource source;
- protected readonly float slope;
- protected readonly float intercept;
+ protected readonly ValueSource m_source;
+ protected readonly float m_slope;
+ protected readonly float m_intercept;
public LinearFloatFunction(ValueSource source, float slope, float intercept)
{
- this.source = source;
- this.slope = slope;
- this.intercept = intercept;
+ this.m_source = source;
+ this.m_slope = slope;
+ this.m_intercept = intercept;
}
public override string GetDescription()
{
- return slope + "*float(" + source.GetDescription() + ")+" + intercept;
+ return m_slope + "*float(" + m_source.GetDescription() + ")+" + m_intercept;
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FunctionValues vals = source.GetValues(context, readerContext);
+ FunctionValues vals = m_source.GetValues(context, readerContext);
return new FloatDocValuesAnonymousInnerClassHelper(this, this, vals);
}
@@ -69,26 +69,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override float FloatVal(int doc)
{
- return vals.FloatVal(doc) * outerInstance.slope + outerInstance.intercept;
+ return vals.FloatVal(doc) * outerInstance.m_slope + outerInstance.m_intercept;
}
public override string ToString(int doc)
{
- return outerInstance.slope + "*float(" + vals.ToString(doc) + ")+" + outerInstance.intercept;
+ return outerInstance.m_slope + "*float(" + vals.ToString(doc) + ")+" + outerInstance.m_intercept;
}
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- source.CreateWeight(context, searcher);
+ m_source.CreateWeight(context, searcher);
}
public override int GetHashCode()
{
- int h = Number.FloatToIntBits(slope);
+ int h = Number.FloatToIntBits(m_slope);
h = ((int)((uint)h >> 2)) | (h << 30);
- h += Number.FloatToIntBits(intercept);
+ h += Number.FloatToIntBits(m_intercept);
h ^= (h << 14) | ((int)((uint)h >> 19));
- return h + source.GetHashCode();
+ return h + m_source.GetHashCode();
}
public override bool Equals(object o)
@@ -96,7 +96,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as LinearFloatFunction;
if (other == null)
return false;
- return this.slope == other.slope && this.intercept == other.intercept && this.source.Equals(other.source);
+ return this.m_slope == other.m_slope && this.m_intercept == other.m_intercept && this.m_source.Equals(other.m_source);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
index 2ae0fa8..f640c45 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
@@ -29,13 +29,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class LiteralValueSource : ValueSource
{
- protected readonly string str;
- protected readonly BytesRef bytesRef;
+ protected readonly string m_str;
+ protected readonly BytesRef m_bytesRef;
public LiteralValueSource(string str)
{
- this.str = str;
- this.bytesRef = new BytesRef(str);
+ this.m_str = str;
+ this.m_bytesRef = new BytesRef(str);
}
/// <summary>
@@ -44,7 +44,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
get
{
- return str;
+ return m_str;
}
}
@@ -66,24 +66,24 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string StrVal(int doc)
{
- return outerInstance.str;
+ return outerInstance.m_str;
}
public override bool BytesVal(int doc, BytesRef target)
{
- target.CopyBytes(outerInstance.bytesRef);
+ target.CopyBytes(outerInstance.m_bytesRef);
return true;
}
public override string ToString(int doc)
{
- return outerInstance.str;
+ return outerInstance.m_str;
}
}
public override string GetDescription()
{
- return "literal(" + str + ")";
+ return "literal(" + m_str + ")";
}
public override bool Equals(object o)
@@ -95,14 +95,14 @@ namespace Lucene.Net.Queries.Function.ValueSources
var that = o as LiteralValueSource;
if (that == null)
return false;
- return str.Equals(that.str);
+ return m_str.Equals(that.m_str);
}
public static readonly int hash = typeof(LiteralValueSource).GetHashCode();
public override int GetHashCode()
{
- return hash + str.GetHashCode();
+ return hash + m_str.GetHashCode();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
index eceeb41..7f5e349 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class LongFieldSource : FieldCacheSource
{
- protected readonly FieldCache.ILongParser parser;
+ protected readonly FieldCache.ILongParser m_parser;
public LongFieldSource(string field)
: this(field, null)
@@ -41,12 +41,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
public LongFieldSource(string field, FieldCache.ILongParser parser)
: base(field)
{
- this.parser = parser;
+ this.m_parser = parser;
}
public override string GetDescription()
{
- return "long(" + field + ')';
+ return "long(" + m_field + ')';
}
public virtual long ExternalToLong(string extVal)
@@ -66,8 +66,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var arr = cache.GetLongs(readerContext.AtomicReader, field, parser, true);
- var valid = cache.GetDocsWithField(readerContext.AtomicReader, field);
+ var arr = m_cache.GetLongs(readerContext.AtomicReader, m_field, m_parser, true);
+ var valid = m_cache.GetDocsWithField(readerContext.AtomicReader, m_field);
return new LongDocValuesAnonymousInnerClassHelper(this, this, arr, valid);
}
@@ -158,12 +158,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as LongFieldSource;
if (other == null)
return false;
- return base.Equals(other) && (this.parser == null ? other.parser == null : this.parser.GetType() == other.parser.GetType());
+ return base.Equals(other) && (this.m_parser == null ? other.m_parser == null : this.m_parser.GetType() == other.m_parser.GetType());
}
public override int GetHashCode()
{
- int h = parser == null ? this.GetType().GetHashCode() : parser.GetType().GetHashCode();
+ int h = m_parser == null ? this.GetType().GetHashCode() : m_parser.GetType().GetHashCode();
h += base.GetHashCode();
return h;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
index 2fbdb8c..80e734c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
@@ -31,11 +31,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class MultiBoolFunction : BoolFunction
{
- protected readonly IList<ValueSource> sources;
+ protected readonly IList<ValueSource> m_sources;
public MultiBoolFunction(IList<ValueSource> sources)
{
- this.sources = sources;
+ this.m_sources = sources;
}
protected abstract string Name { get; }
@@ -44,9 +44,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var vals = new FunctionValues[sources.Count];
+ var vals = new FunctionValues[m_sources.Count];
int i = 0;
- foreach (ValueSource source in sources)
+ foreach (ValueSource source in m_sources)
{
vals[i++] = source.GetValues(context, readerContext);
}
@@ -98,7 +98,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var sb = new StringBuilder(Name);
sb.Append('(');
bool first = true;
- foreach (ValueSource source in sources)
+ foreach (ValueSource source in m_sources)
{
if (first)
{
@@ -115,7 +115,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override int GetHashCode()
{
- return sources.GetHashCode() + Name.GetHashCode();
+ return m_sources.GetHashCode() + Name.GetHashCode();
}
public override bool Equals(object o)
@@ -127,12 +127,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as MultiBoolFunction;
if (other == null)
return false;
- return this.sources.Equals(other.sources);
+ return this.m_sources.Equals(other.m_sources);
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- foreach (ValueSource source in sources)
+ foreach (ValueSource source in m_sources)
{
source.CreateWeight(context, searcher);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
index e5cf748..1e0a189 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
@@ -31,11 +31,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class MultiFloatFunction : ValueSource
{
- protected readonly ValueSource[] sources;
+ protected readonly ValueSource[] m_sources;
public MultiFloatFunction(ValueSource[] sources)
{
- this.sources = sources;
+ this.m_sources = sources;
}
protected abstract string Name { get; }
@@ -47,7 +47,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var sb = new StringBuilder();
sb.Append(Name).Append('(');
bool firstTime = true;
- foreach (var source in sources)
+ foreach (var source in m_sources)
{
if (firstTime)
{
@@ -65,10 +65,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var valsArr = new FunctionValues[sources.Length];
- for (int i = 0; i < sources.Length; i++)
+ var valsArr = new FunctionValues[m_sources.Length];
+ for (int i = 0; i < m_sources.Length; i++)
{
- valsArr[i] = sources[i].GetValues(context, readerContext);
+ valsArr[i] = m_sources[i].GetValues(context, readerContext);
}
return new FloatDocValuesAnonymousInnerClassHelper(this, this, valsArr);
@@ -115,7 +115,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- foreach (ValueSource source in sources)
+ foreach (ValueSource source in m_sources)
{
source.CreateWeight(context, searcher);
}
@@ -123,7 +123,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override int GetHashCode()
{
- return Arrays.GetHashCode(sources) + Name.GetHashCode();
+ return Arrays.GetHashCode(m_sources) + Name.GetHashCode();
}
public override bool Equals(object o)
@@ -135,7 +135,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as MultiFloatFunction;
if (other == null)
return false;
- return Name.Equals(other.Name) && Arrays.Equals(this.sources, other.sources);
+ return Name.Equals(other.Name) && Arrays.Equals(this.m_sources, other.m_sources);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
index 3d17835..0769519 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
@@ -29,18 +29,18 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class MultiFunction : ValueSource
{
- protected readonly IList<ValueSource> sources;
+ protected readonly IList<ValueSource> m_sources;
protected MultiFunction(IList<ValueSource> sources)
{
- this.sources = sources;
+ this.m_sources = sources;
}
protected abstract string Name { get; }
public override string GetDescription()
{
- return GetDescription(Name, sources);
+ return GetDescription(Name, m_sources);
}
public static string GetDescription(string name, IList<ValueSource> sources)
@@ -117,7 +117,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- foreach (ValueSource source in sources)
+ foreach (ValueSource source in m_sources)
{
source.CreateWeight(context, searcher);
}
@@ -125,7 +125,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override int GetHashCode()
{
- return sources.GetHashCode() + Name.GetHashCode();
+ return m_sources.GetHashCode() + Name.GetHashCode();
}
public override bool Equals(object o)
@@ -135,7 +135,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return false;
}
var other = (MultiFunction)o;
- return this.sources.Equals(other.sources);
+ return this.m_sources.Equals(other.m_sources);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
index cfd944c..79794cd 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
@@ -34,11 +34,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class NormValueSource : ValueSource
{
- protected readonly string field;
+ protected readonly string m_field;
public NormValueSource(string field)
{
- this.field = field;
+ this.m_field = field;
}
public virtual string Name
@@ -48,7 +48,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return Name + '(' + field + ')';
+ return Name + '(' + m_field + ')';
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
@@ -59,13 +59,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
var searcher = (IndexSearcher)context["searcher"];
- TFIDFSimilarity similarity = IDFValueSource.AsTFIDF(searcher.Similarity, field);
+ TFIDFSimilarity similarity = IDFValueSource.AsTFIDF(searcher.Similarity, m_field);
if (similarity == null)
{
throw new System.NotSupportedException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
}
- NumericDocValues norms = readerContext.AtomicReader.GetNormValues(field);
+ NumericDocValues norms = readerContext.AtomicReader.GetNormValues(m_field);
if (norms == null)
{
return new ConstDoubleDocValues(0.0, this);
@@ -101,12 +101,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return false;
}
- return this.field.Equals(((NormValueSource)o).field);
+ return this.m_field.Equals(((NormValueSource)o).m_field);
}
public override int GetHashCode()
{
- return this.GetType().GetHashCode() + field.GetHashCode();
+ return this.GetType().GetHashCode() + m_field.GetHashCode();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
index ae45334..27cc836 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -44,16 +44,16 @@ namespace Lucene.Net.Queries.Function.ValueSources
public class OrdFieldSource : ValueSource
{
- protected readonly string field;
+ protected readonly string m_field;
public OrdFieldSource(string field)
{
- this.field = field;
+ this.m_field = field;
}
public override string GetDescription()
{
- return "ord(" + field + ')';
+ return "ord(" + m_field + ')';
}
@@ -63,7 +63,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
int off = readerContext.DocBase;
IndexReader topReader = ReaderUtil.GetTopLevelContext(readerContext).Reader;
AtomicReader r = SlowCompositeReaderWrapper.Wrap(topReader);
- SortedDocValues sindex = FieldCache.DEFAULT.GetTermsIndex(r, field);
+ SortedDocValues sindex = FieldCache.DEFAULT.GetTermsIndex(r, m_field);
return new IntDocValuesAnonymousInnerClassHelper(this, this, off, sindex);
}
@@ -139,14 +139,14 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override bool Equals(object o)
{
- return o != null && o.GetType() == typeof(OrdFieldSource) && this.field.Equals(((OrdFieldSource)o).field);
+ return o != null && o.GetType() == typeof(OrdFieldSource) && this.m_field.Equals(((OrdFieldSource)o).m_field);
}
private static readonly int hcode = typeof(OrdFieldSource).GetHashCode();
public override int GetHashCode()
{
- return hcode + field.GetHashCode();
+ return hcode + m_field.GetHashCode();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
index d558c78..63e48e1 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
@@ -33,11 +33,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class RangeMapFloatFunction : ValueSource
{
- protected readonly ValueSource source;
- protected readonly float min;
- protected readonly float max;
- protected readonly ValueSource target;
- protected readonly ValueSource defaultVal;
+ protected readonly ValueSource m_source;
+ protected readonly float m_min;
+ protected readonly float m_max;
+ protected readonly ValueSource m_target;
+ protected readonly ValueSource m_defaultVal;
public RangeMapFloatFunction(ValueSource source, float min, float max, float target, float? def)
: this(source, min, max, new ConstValueSource(target), def == null ? null : new ConstValueSource(def.Value))
@@ -46,23 +46,23 @@ namespace Lucene.Net.Queries.Function.ValueSources
public RangeMapFloatFunction(ValueSource source, float min, float max, ValueSource target, ValueSource def)
{
- this.source = source;
- this.min = min;
- this.max = max;
- this.target = target;
- this.defaultVal = def;
+ this.m_source = source;
+ this.m_min = min;
+ this.m_max = max;
+ this.m_target = target;
+ this.m_defaultVal = def;
}
public override string GetDescription()
{
- return "map(" + source.GetDescription() + "," + min + "," + max + "," + target.GetDescription() + ")";
+ return "map(" + m_source.GetDescription() + "," + m_min + "," + m_max + "," + m_target.GetDescription() + ")";
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FunctionValues vals = source.GetValues(context, readerContext);
- FunctionValues targets = target.GetValues(context, readerContext);
- FunctionValues defaults = (this.defaultVal == null) ? null : defaultVal.GetValues(context, readerContext);
+ FunctionValues vals = m_source.GetValues(context, readerContext);
+ FunctionValues targets = m_target.GetValues(context, readerContext);
+ FunctionValues defaults = (this.m_defaultVal == null) ? null : m_defaultVal.GetValues(context, readerContext);
return new FloatDocValuesAnonymousInnerClassHelper(this, this, vals, targets, defaults);
}
@@ -86,30 +86,30 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override float FloatVal(int doc)
{
float val = vals.FloatVal(doc);
- return (val >= outerInstance.min && val <= outerInstance.max) ? targets.FloatVal(doc) : (outerInstance.defaultVal == null ? val : defaults.FloatVal(doc));
+ return (val >= outerInstance.m_min && val <= outerInstance.m_max) ? targets.FloatVal(doc) : (outerInstance.m_defaultVal == null ? val : defaults.FloatVal(doc));
}
public override string ToString(int doc)
{
- return "map(" + vals.ToString(doc) + ",min=" + outerInstance.min + ",max=" + outerInstance.max + ",target=" + targets.ToString(doc) + ")";
+ return "map(" + vals.ToString(doc) + ",min=" + outerInstance.m_min + ",max=" + outerInstance.m_max + ",target=" + targets.ToString(doc) + ")";
}
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- source.CreateWeight(context, searcher);
+ m_source.CreateWeight(context, searcher);
}
public override int GetHashCode()
{
- int h = source.GetHashCode();
+ int h = m_source.GetHashCode();
h ^= (h << 10) | ((int)((uint)h >> 23));
- h += Number.FloatToIntBits(min);
+ h += Number.FloatToIntBits(m_min);
h ^= (h << 14) | ((int)((uint)h >> 19));
- h += Number.FloatToIntBits(max);
- h += target.GetHashCode();
- if (defaultVal != null)
+ h += Number.FloatToIntBits(m_max);
+ h += m_target.GetHashCode();
+ if (m_defaultVal != null)
{
- h += defaultVal.GetHashCode();
+ h += m_defaultVal.GetHashCode();
}
return h;
}
@@ -123,11 +123,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as RangeMapFloatFunction;
if (other == null)
return false;
- return this.min == other.min
- && this.max == other.max
- && this.target.Equals(other.target)
- && this.source.Equals(other.source)
- && (this.defaultVal == other.defaultVal || (this.defaultVal != null && this.defaultVal.Equals(other.defaultVal)));
+ return this.m_min == other.m_min
+ && this.m_max == other.m_max
+ && this.m_target.Equals(other.m_target)
+ && this.m_source.Equals(other.m_source)
+ && (this.m_defaultVal == other.m_defaultVal || (this.m_defaultVal != null && this.m_defaultVal.Equals(other.m_defaultVal)));
}
}
}
\ No newline at end of file