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:44 UTC
[01/22] lucenenet git commit: Lucene.Net.Queries.ChainedFilter
refactor: doChain() > DoChain()
Repository: lucenenet
Updated Branches:
refs/heads/api-work 89171dccd -> 286040300
Lucene.Net.Queries.ChainedFilter refactor: doChain() > DoChain()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f94ecf7a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f94ecf7a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f94ecf7a
Branch: refs/heads/api-work
Commit: f94ecf7a86697975fe2c442767e159a8f26e4cef
Parents: 89171dc
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:32:31 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:32:31 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/ChainedFilter.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f94ecf7a/src/Lucene.Net.Queries/ChainedFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/ChainedFilter.cs b/src/Lucene.Net.Queries/ChainedFilter.cs
index 8f85d63..01cefb7 100644
--- a/src/Lucene.Net.Queries/ChainedFilter.cs
+++ b/src/Lucene.Net.Queries/ChainedFilter.cs
@@ -159,7 +159,7 @@ namespace Lucene.Net.Queries
for (; index[0] < chain.Length; index[0]++)
{
// we dont pass acceptDocs, we will filter at the end using an additional filter
- doChain(result, logic, chain[index[0]].GetDocIdSet(context, null));
+ DoChain(result, logic, chain[index[0]].GetDocIdSet(context, null));
}
return result;
}
@@ -181,7 +181,7 @@ namespace Lucene.Net.Queries
for (; index[0] < chain.Length; index[0]++)
{
// we dont pass acceptDocs, we will filter at the end using an additional filter
- doChain(result, logic[index[0]], chain[index[0]].GetDocIdSet(context, null));
+ DoChain(result, logic[index[0]], chain[index[0]].GetDocIdSet(context, null));
}
return result;
}
@@ -200,7 +200,7 @@ namespace Lucene.Net.Queries
}
/// <exception cref="System.IO.IOException"/>
- private void doChain(FixedBitSet result, int logic, DocIdSet dis) // LUCENENET TODO: Rename DoChain
+ private void DoChain(FixedBitSet result, int logic, DocIdSet dis)
{
if (dis is FixedBitSet)
{
@@ -220,7 +220,7 @@ namespace Lucene.Net.Queries
result.Xor((FixedBitSet)dis);
break;
default:
- doChain(result, DEFAULT, dis);
+ DoChain(result, DEFAULT, dis);
break;
}
}
@@ -251,7 +251,7 @@ namespace Lucene.Net.Queries
result.Xor(disi);
break;
default:
- doChain(result, DEFAULT, dis);
+ DoChain(result, DEFAULT, dis);
break;
}
}
[14/22] lucenenet git commit:
Lucene.Net.Queries.Function.ValueSources.ReverseOrdFieldSource: Changed
public field named "field" to private and added public property Field
Posted by ni...@apache.org.
Lucene.Net.Queries.Function.ValueSources.ReverseOrdFieldSource: Changed public field named "field" to private and added public property Field
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/99df7a29
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/99df7a29
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/99df7a29
Branch: refs/heads/api-work
Commit: 99df7a29fbc398909b2f1491e1cf35870e8dfaed
Parents: 0d8a7ed
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 09:19:51 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 09:19:51 2017 +0700
----------------------------------------------------------------------
.../Function/ValueSources/ReverseOrdFieldSource.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/99df7a29/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
index b2dd93b..34bd66e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
@@ -46,7 +46,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
public class ReverseOrdFieldSource : ValueSource
{
- public readonly string field;
+ // LUCENENET NOTE: Made private and added public property for reading
+ private readonly string field;
+ public string Field
+ {
+ get { return field; }
+ }
public ReverseOrdFieldSource(string field)
{
[19/22] lucenenet git commit: Lucene.Net.Tests.Analysis.Common:
removed references to ICU4Net
Posted by ni...@apache.org.
Lucene.Net.Tests.Analysis.Common: removed references to ICU4Net
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2a6c69ea
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2a6c69ea
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2a6c69ea
Branch: refs/heads/api-work
Commit: 2a6c69ea79f86489c700f9d1b6a680ca65ca1cff
Parents: dfdeeed
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 10:14:20 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 10:14:20 2017 +0700
----------------------------------------------------------------------
.../Lucene.Net.Tests.Analysis.Common.csproj | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2a6c69ea/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index bce782a..b5587d0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -33,14 +33,6 @@
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ICU4NET, Version=1.0.5593.31013, Culture=neutral, processorArchitecture=x86">
- <HintPath>..\..\packages\ICU4NET-ICU4C55.1-bin32.1.0.0\lib\net45\ICU4NET.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="ICU4NETExtension, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <HintPath>..\..\packages\ICU4NET-ICU4C55.1-bin32.1.0.0\lib\net45\ICU4NETExtension.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
[10/22] lucenenet git commit: Lucene.Net.Queries.Mlt.MoreLikeThis
refactor: createQueue() > CreateQueue(), describeParams() > DescribeParams()
Posted by ni...@apache.org.
Lucene.Net.Queries.Mlt.MoreLikeThis refactor: createQueue() > CreateQueue(), describeParams() > DescribeParams()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/62ea1031
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/62ea1031
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/62ea1031
Branch: refs/heads/api-work
Commit: 62ea1031519c3a7e8dfb83970452343ead4c7d65
Parents: 34cde53
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 08:09:28 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 08:09:28 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62ea1031/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 4534bdc..4237302 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -447,7 +447,7 @@ namespace Lucene.Net.Queries.Mlt
/// </summary>
/// <param name="words"> a map of words keyed on the word(String) with Int objects as the values. </param>
/// <exception cref="IOException"/>
- private Util.PriorityQueue<object[]> createQueue(IDictionary<string, Int> words) // LUCENENET TODO: Rename CreateQueue
+ private Util.PriorityQueue<object[]> CreateQueue(IDictionary<string, Int> words)
{
// have collected all words in doc and their freqs
int numDocs = ir.NumDocs;
@@ -498,7 +498,7 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
/// Describe the parameters that control how the "more like this" query is formed.
/// </summary>
- public string describeParams() // LUCENENET TODO: Rename DescribeParams()
+ public string DescribeParams()
{
StringBuilder sb = new StringBuilder();
sb.Append("\t").Append("maxQueryTerms : ").Append(MaxQueryTerms).Append("\n");
@@ -559,7 +559,7 @@ namespace Lucene.Net.Queries.Mlt
}
}
- return createQueue(termFreqMap);
+ return CreateQueue(termFreqMap);
}
/// <summary>
@@ -695,7 +695,7 @@ namespace Lucene.Net.Queries.Mlt
{
IDictionary<string, Int> words = new Dictionary<string, Int>();
AddTermFrequencies(r, words, fieldName);
- return createQueue(words);
+ return CreateQueue(words);
}
/// <seealso cref= #retrieveInterestingTerms(java.io.Reader, String) </seealso>
[07/22] lucenenet git commit:
Lucene.Net.Queries.Function.ValueSources.ScaleFloatFunction.ScaleInfo
refactor: changed internal fields into auto-implemented properties
Posted by ni...@apache.org.
Lucene.Net.Queries.Function.ValueSources.ScaleFloatFunction.ScaleInfo refactor: changed internal fields into auto-implemented properties
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d11d4da7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d11d4da7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d11d4da7
Branch: refs/heads/api-work
Commit: d11d4da756b82b6ee19120028204dc0ef21b47aa
Parents: d0f7e40
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:57:54 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:57:54 2017 +0700
----------------------------------------------------------------------
.../Function/ValueSources/ScaleFloatFunction.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d11d4da7/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
index ed74f76..4953c60 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
@@ -56,8 +56,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
private class ScaleInfo
{
- internal float minVal; // LUCENENET TODO: Make property
- internal float maxVal; // LUCENENET TODO: Make property
+ internal float MinVal { get; set; }
+ internal float MaxVal { get; set; }
}
private ScaleInfo CreateScaleInfo(IDictionary context, AtomicReaderContext readerContext)
@@ -98,7 +98,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
minVal = maxVal = 0;
}
- var scaleInfo = new ScaleInfo { minVal = minVal, maxVal = maxVal };
+ var scaleInfo = new ScaleInfo { MinVal = minVal, MaxVal = maxVal };
context[this] = scaleInfo;
return scaleInfo;
}
@@ -112,9 +112,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
scaleInfo = CreateScaleInfo(context, readerContext);
}
- float scale = (scaleInfo.maxVal - scaleInfo.minVal == 0) ? 0 : (max - min) / (scaleInfo.maxVal - scaleInfo.minVal);
- float minSource = scaleInfo.minVal;
- float maxSource = scaleInfo.maxVal;
+ float scale = (scaleInfo.MaxVal - scaleInfo.MinVal == 0) ? 0 : (max - min) / (scaleInfo.MaxVal - scaleInfo.MinVal);
+ float minSource = scaleInfo.MinVal;
+ float maxSource = scaleInfo.MaxVal;
var vals = source.GetValues(context, readerContext);
return new FloatDocValuesAnonymousInnerClassHelper(this, this, scale, minSource, maxSource, vals);
[18/22] lucenenet git commit: Lucene.Net.Queries: enabled all rules
for code analysis
Posted by ni...@apache.org.
Lucene.Net.Queries: enabled all rules for code analysis
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/dfdeeed8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/dfdeeed8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/dfdeeed8
Branch: refs/heads/api-work
Commit: dfdeeed85710e1adf9cf624c4b24c3d716ccbc6c
Parents: 3a686b5
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 10:09:38 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 10:09:38 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dfdeeed8/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index a093616..bdfb26a 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
@@ -22,6 +22,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
[15/22] lucenenet git commit: Lucene.Net.Queries refactor: renamed
protected fields camelCase prefixed with m_
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
index 33ae99f..bc6d799 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
@@ -47,25 +47,25 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </seealso>
public class ReciprocalFloatFunction : ValueSource
{
- protected readonly ValueSource source;
- protected readonly float m;
- protected readonly float a;
- protected readonly float b;
+ protected readonly ValueSource m_source;
+ protected readonly float m_m;
+ protected readonly float m_a;
+ protected readonly float m_b;
/// <summary>
/// f(source) = a/(m*float(source)+b)
/// </summary>
public ReciprocalFloatFunction(ValueSource source, float m, float a, float b)
{
- this.source = source;
- this.m = m;
- this.a = a;
- this.b = b;
+ this.m_source = source;
+ this.m_m = m;
+ this.m_a = a;
+ this.m_b = b;
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var vals = source.GetValues(context, readerContext);
+ var vals = m_source.GetValues(context, readerContext);
return new FloatDocValuesAnonymousInnerClassHelper(this, this, vals);
}
@@ -83,29 +83,29 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override float FloatVal(int doc)
{
- return outerInstance.a / (outerInstance.m * vals.FloatVal(doc) + outerInstance.b);
+ return outerInstance.m_a / (outerInstance.m_m * vals.FloatVal(doc) + outerInstance.m_b);
}
public override string ToString(int doc)
{
- return Convert.ToString(outerInstance.a) + "/(" + outerInstance.m + "*float(" + vals.ToString(doc) + ')' + '+' + outerInstance.b + ')';
+ return Convert.ToString(outerInstance.m_a) + "/(" + outerInstance.m_m + "*float(" + vals.ToString(doc) + ')' + '+' + outerInstance.m_b + ')';
}
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- source.CreateWeight(context, searcher);
+ m_source.CreateWeight(context, searcher);
}
public override string GetDescription()
{
- return Convert.ToString(a) + "/(" + m + "*float(" + source.GetDescription() + ")" + "+" + b + ')';
+ return Convert.ToString(m_a) + "/(" + m_m + "*float(" + m_source.GetDescription() + ")" + "+" + m_b + ')';
}
public override int GetHashCode()
{
- int h = Number.FloatToIntBits(a) + Number.FloatToIntBits(m);
+ int h = Number.FloatToIntBits(m_a) + Number.FloatToIntBits(m_m);
h ^= (h << 13) | ((int)((uint)h >> 20));
- return h + (Number.FloatToIntBits(b)) + source.GetHashCode();
+ return h + (Number.FloatToIntBits(m_b)) + m_source.GetHashCode();
}
public override bool Equals(object o)
@@ -117,7 +117,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as ReciprocalFloatFunction;
if (other == null)
return false;
- return this.m == other.m && this.a == other.a && this.b == other.b && this.source.Equals(other.source);
+ return this.m_m == other.m_m && this.m_a == other.m_a && this.m_b == other.m_b && 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/ScaleFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
index 4953c60..deaf177 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
@@ -38,20 +38,20 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class ScaleFloatFunction : ValueSource
{
- protected readonly ValueSource source;
- protected readonly float min;
- protected readonly float max;
+ protected readonly ValueSource m_source;
+ protected readonly float m_min;
+ protected readonly float m_max;
public ScaleFloatFunction(ValueSource source, float min, float max)
{
- this.source = source;
- this.min = min;
- this.max = max;
+ this.m_source = source;
+ this.m_min = min;
+ this.m_max = max;
}
public override string GetDescription()
{
- return "scale(" + source.GetDescription() + "," + min + "," + max + ")";
+ return "scale(" + m_source.GetDescription() + "," + m_min + "," + m_max + ")";
}
private class ScaleInfo
@@ -70,7 +70,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
foreach (AtomicReaderContext leaf in leaves)
{
int maxDoc = leaf.Reader.MaxDoc;
- FunctionValues vals = source.GetValues(context, leaf);
+ FunctionValues vals = m_source.GetValues(context, leaf);
for (int i = 0; i < maxDoc; i++)
{
@@ -112,11 +112,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
scaleInfo = CreateScaleInfo(context, readerContext);
}
- float scale = (scaleInfo.MaxVal - scaleInfo.MinVal == 0) ? 0 : (max - min) / (scaleInfo.MaxVal - scaleInfo.MinVal);
+ float scale = (scaleInfo.MaxVal - scaleInfo.MinVal == 0) ? 0 : (m_max - m_min) / (scaleInfo.MaxVal - scaleInfo.MinVal);
float minSource = scaleInfo.MinVal;
float maxSource = scaleInfo.MaxVal;
- var vals = source.GetValues(context, readerContext);
+ var vals = m_source.GetValues(context, readerContext);
return new FloatDocValuesAnonymousInnerClassHelper(this, this, scale, minSource, maxSource, vals);
}
@@ -141,26 +141,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override float FloatVal(int doc)
{
- return (vals.FloatVal(doc) - minSource) * scale + outerInstance.min;
+ return (vals.FloatVal(doc) - minSource) * scale + outerInstance.m_min;
}
public override string ToString(int doc)
{
- return "scale(" + vals.ToString(doc) + ",toMin=" + outerInstance.min + ",toMax=" + outerInstance.max + ",fromMin=" + minSource + ",fromMax=" + maxSource + ")";
+ return "scale(" + vals.ToString(doc) + ",toMin=" + outerInstance.m_min + ",toMax=" + outerInstance.m_max + ",fromMin=" + minSource + ",fromMax=" + maxSource + ")";
}
}
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(min);
+ int h = Number.FloatToIntBits(m_min);
h = h * 29;
- h += Number.FloatToIntBits(max);
+ h += Number.FloatToIntBits(m_max);
h = h * 29;
- h += source.GetHashCode();
+ h += m_source.GetHashCode();
return h;
}
@@ -169,9 +169,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as ScaleFloatFunction;
if (other == null)
return false;
- return this.min == other.min
- && this.max == other.max
- && this.source.Equals(other.source);
+ return this.m_min == other.m_min
+ && this.m_max == other.m_max
+ && 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/ShortFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
index d0cfcbe..6398604 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
@@ -46,12 +46,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return "short(" + field + ')';
+ return "short(" + m_field + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var arr = cache.GetShorts(readerContext.AtomicReader, field, parser, false);
+ var arr = m_cache.GetShorts(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/SimpleBoolFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
index 2944437..e13cad3 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
@@ -31,11 +31,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class SimpleBoolFunction : BoolFunction
{
- protected readonly ValueSource source;
+ protected readonly ValueSource m_source;
public SimpleBoolFunction(ValueSource source)
{
- this.source = source;
+ this.m_source = source;
}
protected abstract string Name { get; }
@@ -44,7 +44,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- FunctionValues vals = source.GetValues(context, readerContext);
+ FunctionValues vals = m_source.GetValues(context, readerContext);
return new BoolDocValuesAnonymousInnerClassHelper(this, this, vals);
}
@@ -73,12 +73,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return Name + '(' + source.GetDescription() + ')';
+ return Name + '(' + m_source.GetDescription() + ')';
}
public override int GetHashCode()
{
- return source.GetHashCode() + Name.GetHashCode();
+ return m_source.GetHashCode() + Name.GetHashCode();
}
public override bool Equals(object o)
@@ -86,12 +86,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as SimpleBoolFunction;
if (other == null)
return false;
- return this.source.Equals(other.source);
+ return this.m_source.Equals(other.m_source);
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- source.CreateWeight(context, searcher);
+ m_source.CreateWeight(context, searcher);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
index b0171ed..f421011 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
@@ -35,7 +35,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
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);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs
index c9d4633..2384fff 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs
@@ -25,23 +25,23 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public abstract class SingleFunction : ValueSource
{
- protected readonly ValueSource source;
+ protected readonly ValueSource m_source;
public SingleFunction(ValueSource source)
{
- this.source = source;
+ this.m_source = source;
}
protected abstract string Name { get; }
public override string GetDescription()
{
- return Name + '(' + source.GetDescription() + ')';
+ return Name + '(' + m_source.GetDescription() + ')';
}
public override int GetHashCode()
{
- return source.GetHashCode() + Name.GetHashCode();
+ return m_source.GetHashCode() + Name.GetHashCode();
}
public override bool Equals(object o)
@@ -50,12 +50,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
if (other == null)
return false;
return Name.Equals(other.Name)
- && source.Equals(other.source);
+ && m_source.Equals(other.m_source);
}
public override void CreateWeight(IDictionary context, IndexSearcher searcher)
{
- source.CreateWeight(context, searcher);
+ m_source.CreateWeight(context, searcher);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
index 188a88d..907481b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
@@ -31,11 +31,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class SumTotalTermFreqValueSource : ValueSource
{
- protected readonly string indexedField;
+ protected readonly string m_indexedField;
public SumTotalTermFreqValueSource(string indexedField)
{
- this.indexedField = indexedField;
+ this.m_indexedField = indexedField;
}
public virtual string Name
@@ -45,7 +45,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string GetDescription()
{
- return Name + '(' + indexedField + ')';
+ return Name + '(' + m_indexedField + ')';
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
@@ -63,7 +63,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
continue;
}
- Terms terms = fields.Terms(indexedField);
+ Terms terms = fields.Terms(m_indexedField);
if (terms == null)
{
continue;
@@ -104,7 +104,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override int GetHashCode()
{
- return this.GetType().GetHashCode() + indexedField.GetHashCode();
+ return this.GetType().GetHashCode() + m_indexedField.GetHashCode();
}
public override bool Equals(object o)
@@ -112,7 +112,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var other = o as SumTotalTermFreqValueSource;
if (other == null)
return false;
- return this.indexedField.Equals(other.indexedField);
+ return this.m_indexedField.Equals(other.m_indexedField);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
index cc6ce64..8780c98 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
@@ -55,9 +55,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
var fields = readerContext.AtomicReader.Fields;
- var terms = fields.Terms(indexedField);
+ var terms = fields.Terms(m_indexedField);
var searcher = (IndexSearcher)context["searcher"];
- var similarity = IDFValueSource.AsTFIDF(searcher.Similarity, indexedField);
+ var similarity = IDFValueSource.AsTFIDF(searcher.Similarity, m_indexedField);
if (similarity == null)
{
throw new System.NotSupportedException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
@@ -94,7 +94,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
- if (termsEnum.SeekExact(outerInstance.indexedBytes))
+ if (termsEnum.SeekExact(outerInstance.m_indexedBytes))
{
docs = termsEnum.Docs(null, null);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
index 6527c67..213a548 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
Fields fields = readerContext.AtomicReader.Fields;
- Terms terms = fields.Terms(indexedField);
+ Terms terms = fields.Terms(m_indexedField);
return new IntDocValuesAnonymousInnerClassHelper(this, this, terms);
}
@@ -79,7 +79,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
if (terms != null)
{
TermsEnum termsEnum = terms.GetIterator(null);
- if (termsEnum.SeekExact(outerInstance.indexedBytes))
+ if (termsEnum.SeekExact(outerInstance.m_indexedBytes))
{
docs = termsEnum.Docs(null, null);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
index 1004bb8..f083968 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
@@ -32,17 +32,17 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// </summary>
public class TotalTermFreqValueSource : 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 TotalTermFreqValueSource(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
@@ -52,7 +52,7 @@ 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)
@@ -65,7 +65,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
long totalTermFreq = 0;
foreach (var readerContext in searcher.TopReaderContext.Leaves)
{
- long val = readerContext.Reader.TotalTermFreq(new Term(indexedField, indexedBytes));
+ long val = readerContext.Reader.TotalTermFreq(new Term(m_indexedField, m_indexedBytes));
if (val == -1)
{
totalTermFreq = -1;
@@ -101,7 +101,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)
@@ -111,7 +111,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return false;
}
var other = (TotalTermFreqValueSource)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/VectorValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
index b914435..d8a6911 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
@@ -30,25 +30,24 @@ namespace Lucene.Net.Queries.Function.ValueSources
//Not crazy about the name, but...
public class VectorValueSource : MultiValueSource
{
- protected readonly IList<ValueSource> sources;
-
+ protected readonly IList<ValueSource> m_sources;
public VectorValueSource(IList<ValueSource> sources)
{
- this.sources = sources;
+ this.m_sources = sources;
}
public virtual IList<ValueSource> Sources
{
get
{
- return sources;
+ return m_sources;
}
}
public override int Dimension
{
- get { return sources.Count; }
+ get { return m_sources.Count; }
}
public virtual string Name
@@ -58,20 +57,20 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
{
- var size = sources.Count;
+ var size = m_sources.Count;
// special-case x,y and lat,lon since it's so common
if (size == 2)
{
- var x = sources[0].GetValues(context, readerContext);
- var y = sources[1].GetValues(context, readerContext);
+ var x = m_sources[0].GetValues(context, readerContext);
+ var y = m_sources[1].GetValues(context, readerContext);
return new FunctionValuesAnonymousInnerClassHelper(this, x, y);
}
var valsArr = new FunctionValues[size];
for (int i = 0; i < size; i++)
{
- valsArr[i] = sources[i].GetValues(context, readerContext);
+ valsArr[i] = m_sources[i].GetValues(context, readerContext);
}
return new FunctionValuesAnonymousInnerClassHelper2(this, valsArr);
@@ -224,7 +223,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);
}
@@ -236,7 +235,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
var sb = new StringBuilder();
sb.Append(Name).Append('(');
bool firstTime = true;
- foreach (ValueSource source in sources)
+ foreach (ValueSource source in m_sources)
{
if (firstTime)
{
@@ -264,12 +263,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
var that = (VectorValueSource)o;
- return sources.Equals(that.sources);
+ return m_sources.Equals(that.m_sources);
}
public override int GetHashCode()
{
- return sources.GetHashCode();
+ return m_sources.GetHashCode();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Queries/TermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index bc10111..3cff069 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Queries
if (iter.MoveNext())
{
var next = iter.Current;
- field = next.Field;
+ m_field = next.Field;
return next.Bytes;
}
return null;
@@ -388,7 +388,7 @@ namespace Lucene.Net.Queries
{
public TermsFilter OuterInstance { get; internal set; }
- protected string field;
+ protected string m_field;
public abstract BytesRef Next();
@@ -398,12 +398,12 @@ namespace Lucene.Net.Queries
public FieldAndTermEnum(string field)
{
- this.field = field;
+ this.m_field = field;
}
public virtual string Field
{
- get { return field; }
+ get { return m_field; }
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d60b93d9/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
index 2971df9..b1d6b82 100644
--- a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
@@ -202,7 +202,7 @@ namespace Lucene.Net.Tests.Queries
public override float CustomScore(int doc, float subScore, float valSrcScore)
{
- assertTrue(doc <= context.AtomicReader.MaxDoc);
+ assertTrue(doc <= m_context.AtomicReader.MaxDoc);
return values.Get(doc);
}
}
[20/22] lucenenet git commit: Lucene.Net.Queries: documentation
comments
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 63e48e1..96eec41 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
@@ -24,12 +24,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>RangeMapFloatFunction</code> implements a map function over
- /// another <seealso cref="ValueSource"/> whose values fall within min and max inclusive to target.
- /// <br>
- /// Normally Used as an argument to a <seealso cref="FunctionQuery"/>
- ///
- ///
+ /// <see cref="RangeMapFloatFunction"/> implements a map function over
+ /// another <see cref="ValueSource"/> whose values fall within <paramref name="min"/> and <paramref name="max"/> inclusive to <paramref name="target"/>.
+ /// <para/>
+ /// Normally used as an argument to a <see cref="FunctionQuery"/>
/// </summary>
public class RangeMapFloatFunction : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
index bc6d799..70032c8 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
@@ -25,26 +25,19 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>ReciprocalFloatFunction</code> implements a reciprocal function f(x) = a/(mx+b), based on
- /// the float value of a field or function as exported by <seealso cref="ValueSource"/>.
- /// <br>
- ///
- /// When a and b are equal, and x>=0, this function has a maximum value of 1 that drops as x increases.
+ /// <see cref="ReciprocalFloatFunction"/> implements a reciprocal function <c>f(x) = a/(mx+b)</c>, based on
+ /// the <see cref="float"/> value of a field or function as exported by <see cref="ValueSource"/>.
+ /// <para/>
+ /// When a and b are equal, and <c>x>=0</c>, this function has a maximum value of 1 that drops as x increases.
/// Increasing the value of a and b together results in a movement of the entire function to a flatter part of the curve.
- /// <para>These properties make this an idea function for boosting more recent documents.
- /// </para>
- /// <para>Example:<code> recip(ms(NOW,mydatefield),3.16e-11,1,1)</code>
- /// </para>
- /// <para>A multiplier of 3.16e-11 changes the units from milliseconds to years (since there are about 3.16e10 milliseconds
+ /// <para/>These properties make this an idea function for boosting more recent documents.
+ /// <para/>Example:<c> recip(ms(NOW,mydatefield),3.16e-11,1,1)</c>
+ /// <para/>A multiplier of 3.16e-11 changes the units from milliseconds to years (since there are about 3.16e10 milliseconds
/// per year). Thus, a very recent date will yield a value close to 1/(0+1) or 1,
/// a date a year in the past will get a multiplier of about 1/(1+1) or 1/2,
/// and date two years old will yield 1/(2+1) or 1/3.
- ///
- /// </para>
/// </summary>
- /// <seealso cref= org.apache.lucene.queries.function.FunctionQuery
- ///
- /// </seealso>
+ /// <seealso cref="FunctionQuery"/>
public class ReciprocalFloatFunction : ValueSource
{
protected readonly ValueSource m_source;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
index 34bd66e..01015f4 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
@@ -23,27 +23,25 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains the ordinal of the field value from the default Lucene <seealso cref="FieldCache"/> using getTermsIndex()
+ /// Obtains the ordinal of the field value from the default Lucene <see cref="FieldCache"/> using <see cref="IFieldCache.GetTermsIndex"/>
/// and reverses the order.
- /// <br>
+ /// <para/>
/// The native lucene index order is used to assign an ordinal value for each field value.
- /// <br>Field values (terms) are lexicographically ordered by unicode value, and numbered starting at 1.
- /// <br>
- /// Example of reverse ordinal (rord):<br>
- /// If there were only three field values: "apple","banana","pear"
- /// <br>then rord("apple")=3, rord("banana")=2, ord("pear")=1
- /// <para>
- /// WARNING: ord() depends on the position in an index and can thus change when other documents are inserted or deleted,
+ /// <para/>Field values (terms) are lexicographically ordered by unicode value, and numbered starting at 1.
+ /// <para/>
+ /// Example of reverse ordinal (rord):
+ /// <code>
+ /// If there were only three field values: "apple","banana","pear"
+ /// then rord("apple")=3, rord("banana")=2, ord("pear")=1
+ /// </code>
+ /// <para/>
+ /// WARNING: Ord depends on the position in an index and can thus change when other documents are inserted or deleted,
/// or if a MultiSearcher is used.
- /// <br>
+ /// <para/>
/// WARNING: as of Solr 1.4, ord() and rord() can cause excess memory use since they must use a FieldCache entry
/// at the top level reader, while sorting and function queries now use entries at the segment level. Hence sorting
/// or using a different function query, in addition to ord()/rord() will double memory use.
- ///
- ///
- /// </para>
/// </summary>
-
public class ReverseOrdFieldSource : ValueSource
{
// LUCENENET NOTE: Made private and added public property for reading
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
index deaf177..9acf763 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
@@ -24,17 +24,15 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Scales values to be between min and max.
- /// <para>This implementation currently traverses all of the source values to obtain
+ /// Scales values to be between <paramref name="min"/> and <paramref name="max"/>.
+ /// <para/>This implementation currently traverses all of the source values to obtain
/// their min and max.
- /// </para>
- /// <para>This implementation currently cannot distinguish when documents have been
+ /// <para/>This implementation currently cannot distinguish when documents have been
/// deleted or documents that have no value, and 0.0 values will be used for
/// these cases. This means that if values are normally all greater than 0.0, one can
/// still end up with 0.0 as the min value to map from. In these cases, an
/// appropriate map() function could be used as a workaround to change 0.0
/// to a value in the real range.
- /// </para>
/// </summary>
public class ScaleFloatFunction : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
index f590948..d2d7c23 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
@@ -23,10 +23,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains short field values from the <seealso cref="org.apache.lucene.search.FieldCache"/>
- /// using <code>getShorts()</code>
+ /// Obtains <see cref="short"/> field values from the <see cref="FieldCache"/>
+ /// using <see cref="IFieldCache.GetShorts"/>
/// and makes those values available as other numeric types, casting as needed.
- ///
/// </summary>
[Obsolete]
public class ShortFieldSource : FieldCacheSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
index e13cad3..abfec40 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs
@@ -23,11 +23,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <seealso cref="BoolFunction"/> implementation which applies an extendible boolean
- /// function to the values of a single wrapped <seealso cref="ValueSource"/>.
+ /// <see cref="BoolFunction"/> implementation which applies an extendible <see cref="bool"/>
+ /// function to the values of a single wrapped <see cref="ValueSource"/>.
///
/// Functions this can be used for include whether a field has a value or not,
- /// or inverting the boolean value of the wrapped ValueSource.
+ /// or inverting the <see cref="bool"/> value of the wrapped <see cref="ValueSource"/>.
/// </summary>
public abstract class SimpleBoolFunction : BoolFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
index f421011..bf4bc28 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// A simple float function with a single argument
+ /// A simple <see cref="float"/> function with a single argument
/// </summary>
public abstract class SimpleFloatFunction : SingleFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs
index 6f76752..fcff158 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>SumFloatFunction</code> returns the sum of it's components.
+ /// <see cref="SumFloatFunction"/> returns the sum of its components.
/// </summary>
public class SumFloatFunction : MultiFloatFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
index 907481b..f46ca0e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>SumTotalTermFreqValueSource</code> returns the number of tokens.
+ /// <see cref="SumTotalTermFreqValueSource"/> returns the number of tokens.
/// (sum of term freqs across all documents, across all terms).
/// Returns -1 if frequencies were omitted for the field, or if
/// the codec doesn't support this statistic.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
index 8780c98..1be78d0 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
@@ -27,13 +27,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Function that returns <seealso cref="TFIDFSimilarity#tf(float)"/>
+ /// Function that returns <see cref="TFIDFSimilarity.Tf(float)"/>
/// for every document.
- /// <para>
+ /// <para/>
/// Note that the configured Similarity for the field must be
- /// a subclass of <seealso cref="TFIDFSimilarity"/>
+ /// a subclass of <see cref="TFIDFSimilarity"/>
/// @lucene.internal
- /// </para>
/// </summary>
public class TFValueSource : TermFreqValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
index 213a548..3019d79 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
@@ -26,12 +26,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Function that returns <seealso cref="DocsEnum#freq()"/> for the
+ /// Function that returns <see cref="DocsEnum.Freq"/> for the
/// supplied term in every document.
- /// <para>
+ /// <para/>
/// If the term does not exist in the document, returns 0.
/// If frequencies are omitted, returns 1.
- /// </para>
/// </summary>
public class TermFreqValueSource : DocFreqValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
index f083968..6da5703 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>TotalTermFreqValueSource</code> returns the total term freq
+ /// <see cref="TotalTermFreqValueSource"/> returns the total term freq
/// (sum of term freqs across all documents).
/// Returns -1 if frequencies were omitted for the field, or if
/// the codec doesn't support this statistic.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
index 31706cf..1bae536 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
@@ -24,8 +24,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Converts individual ValueSource instances to leverage the FunctionValues *Val functions that work with multiple values,
- /// i.e. <seealso cref="FunctionValues#DoubleVal(int, double[])"/>
+ /// Converts individual <see cref="ValueSource"/> instances to leverage the FunctionValues *Val functions that work with multiple values,
+ /// i.e. <see cref="FunctionValues.DoubleVal(int, double[])"/>
/// </summary>
//Not crazy about the name, but...
public class VectorValueSource : MultiValueSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 9258ff3..8ccbd1f 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -10,7 +10,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
-using Reader = System.IO.TextReader;
namespace Lucene.Net.Queries.Mlt
{
@@ -34,13 +33,13 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
/// Generate "more like this" similarity queries.
/// Based on this mail:
- /// <code><pre>
- /// Lucene does let you access the document frequency of terms, with IndexReader.docFreq().
+ /// <code>
+ /// Lucene does let you access the document frequency of terms, with <see cref="IndexReader.DocFreq"/>.
/// Term frequencies can be computed by re-tokenizing the text, which, for a single document,
- /// is usually fast enough. But looking up the docFreq() of every term in the document is
+ /// is usually fast enough. But looking up the <see cref="IndexReader.DocFreq"/> of every term in the document is
/// probably too slow.
- /// <p/>
- /// You can use some heuristics to prune the set of terms, to avoid calling docFreq() too much,
+ /// <para/>
+ /// You can use some heuristics to prune the set of terms, to avoid calling <see cref="IndexReader.DocFreq"/> too much,
/// or at all. Since you're trying to maximize a tf*idf score, you're probably most interested
/// in terms with a high tf. Choosing a tf threshold even as low as two or three will radically
/// reduce the number of terms under consideration. Another heuristic is that terms with a
@@ -48,76 +47,73 @@ namespace Lucene.Net.Queries.Mlt
/// number of characters, not selecting anything less than, e.g., six or seven characters.
/// With these sorts of heuristics you can usually find small set of, e.g., ten or fewer terms
/// that do a pretty good job of characterizing a document.
- /// <p/>
+ /// <para/>
/// It all depends on what you're trying to do. If you're trying to eek out that last percent
/// of precision and recall regardless of computational difficulty so that you can win a TREC
/// competition, then the techniques I mention above are useless. But if you're trying to
/// provide a "more like this" button on a search results page that does a decent job and has
/// good performance, such techniques might be useful.
- /// <p/>
+ /// <para/>
/// An efficient, effective "more-like-this" query generator would be a great contribution, if
/// anyone's interested. I'd imagine that it would take a Reader or a String (the document's
/// text), analyzer Analyzer, and return a set of representative terms using heuristics like those
/// above. The frequency and length thresholds could be parameters, etc.
- /// <p/>
+ /// <para/>
/// Doug
- /// </pre></code>
- /// <p/>
- /// <p/>
- /// <p/>
- /// <h3>Initial Usage</h3>
- /// <p/>
+ /// </code>
+ /// <para/>
+ /// <para/>
+ /// <para/>
+ /// <b>Initial Usage</b>
+ /// <para/>
/// This class has lots of options to try to make it efficient and flexible.
/// The simplest possible usage is as follows. The bold
/// fragment is specific to this class.
- /// <p/>
- /// <pre class="prettyprint">
- /// <p/>
+ /// <para/>
+ /// <code>
/// IndexReader ir = ...
/// IndexSearcher is = ...
- /// <p/>
+ ///
/// MoreLikeThis mlt = new MoreLikeThis(ir);
- /// Reader target = ... // orig source of doc you want to find similarities to
- /// Query query = mlt.like( target);
- /// <p/>
- /// Hits hits = is.search(query);
+ /// TextReader target = ... // orig source of doc you want to find similarities to
+ /// Query query = mlt.Like(target);
+ ///
+ /// Hits hits = is.Search(query);
/// // now the usual iteration thru 'hits' - the only thing to watch for is to make sure
/// //you ignore the doc if it matches your 'target' document, as it should be similar to itself
- /// <p/>
- /// </pre>
- /// <p/>
+ /// </code>
+ /// <para/>
/// Thus you:
- /// <ol>
- /// <li> do your normal, Lucene setup for searching,
- /// <li> create a MoreLikeThis,
- /// <li> get the text of the doc you want to find similarities to
- /// <li> then call one of the like() calls to generate a similarity query
- /// <li> call the searcher to find the similar docs
- /// </ol>
- /// <p/>
- /// <h3>More Advanced Usage</h3>
- /// <p/>
- /// You may want to use <seealso cref="#setFieldNames setFieldNames(...)"/> so you can examine
+ /// <list type="bullet">
+ /// <item>do your normal, Lucene setup for searching,</item>
+ /// <item>create a MoreLikeThis,</item>
+ /// <item>get the text of the doc you want to find similarities to</item>
+ /// <item>then call one of the <see cref="Like"/> calls to generate a similarity query</item>
+ /// <item>call the searcher to find the similar docs</item>
+ /// </list>
+ /// <para/>
+ /// <b>More Advanced Usage</b>
+ /// <para/>
+ /// You may want to use the setter for <see cref="FieldNames"/> so you can examine
/// multiple fields (e.g. body and title) for similarity.
- /// <p/>
- /// <p/>
+ /// <para/>
+ /// <para/>
/// Depending on the size of your index and the size and makeup of your documents you
/// may want to call the other set methods to control how the similarity queries are
/// generated:
- /// <ul>
- /// <li> <seealso cref="#setMinTermFreq setMinTermFreq(...)"/>
- /// <li> <seealso cref="#setMinDocFreq setMinDocFreq(...)"/>
- /// <li> <seealso cref="#setMaxDocFreq setMaxDocFreq(...)"/>
- /// <li> <seealso cref="#setMaxDocFreqPct setMaxDocFreqPct(...)"/>
- /// <li> <seealso cref="#setMinWordLen setMinWordLen(...)"/>
- /// <li> <seealso cref="#setMaxWordLen setMaxWordLen(...)"/>
- /// <li> <seealso cref="#setMaxQueryTerms setMaxQueryTerms(...)"/>
- /// <li> <seealso cref="#setMaxNumTokensParsed setMaxNumTokensParsed(...)"/>
- /// <li> <seealso cref="#setStopWords setStopWord(...)"/>
- /// </ul>
- /// <p/>
- /// <hr>
- /// <pre>
+ /// <list type="bullet">
+ /// <item><see cref="MinTermFreq"/></item>
+ /// <item><see cref="MinDocFreq"/></item>
+ /// <item><see cref="MaxDocFreq"/></item>
+ /// <item><see cref="SetMaxDocFreqPct(int)"/></item>
+ /// <item><see cref="MinWordLen"/></item>
+ /// <item><see cref="MaxWordLen"/></item>
+ /// <item><see cref="MaxQueryTerms"/></item>
+ /// <item><see cref="MaxNumTokensParsed"/></item>
+ /// <item><see cref="StopWords"/></item>
+ /// </list>
+ /// </summary>
+ /// <remarks>
/// Changes: Mark Harwood 29/02/04
/// Some bugfixing, some refactoring, some optimisation.
/// - bugfix: retrieveTerms(int docNum) was not working for indexes without a termvector -added missing code
@@ -125,44 +121,38 @@ namespace Lucene.Net.Queries.Mlt
/// was only counting one occurrence per term/field pair in calculations(ie not including frequency info from TermVector)
/// - refactor: moved common code into isNoiseWord()
/// - optimise: when no termvector support available - used maxNumTermsParsed to limit amount of tokenization
- /// </pre>
- /// </summary>
+ /// </remarks>
public sealed class MoreLikeThis
{
-
/// <summary>
/// Default maximum number of tokens to parse in each example doc field that is not stored with TermVector support.
/// </summary>
- /// <seealso cref= #getMaxNumTokensParsed </seealso>
+ /// <seealso cref="MaxNumTokensParsed"/>
public static readonly int DEFAULT_MAX_NUM_TOKENS_PARSED = 5000;
/// <summary>
/// Ignore terms with less than this frequency in the source doc.
/// </summary>
- /// <seealso cref= #getMinTermFreq </seealso>
- /// <seealso cref= #setMinTermFreq </seealso>
+ /// <seealso cref="MinTermFreq"/>
public static readonly int DEFAULT_MIN_TERM_FREQ = 2;
/// <summary>
/// Ignore words which do not occur in at least this many docs.
/// </summary>
- /// <seealso cref= #getMinDocFreq </seealso>
- /// <seealso cref= #setMinDocFreq </seealso>
+ /// <seealso cref="MinDocFreq"/>
public static readonly int DEFAULT_MIN_DOC_FREQ = 5;
/// <summary>
/// Ignore words which occur in more than this many docs.
/// </summary>
- /// <seealso cref= #getMaxDocFreq </seealso>
- /// <seealso cref= #setMaxDocFreq </seealso>
- /// <seealso cref= #setMaxDocFreqPct </seealso>
+ /// <seealso cref="MaxDocFreq"/>
+ /// <seealso cref="SetMaxDocFreqPct(int)"/>
public static readonly int DEFAULT_MAX_DOC_FREQ = int.MaxValue;
/// <summary>
/// Boost terms in query based on score.
/// </summary>
- /// <seealso cref= #isBoost </seealso>
- /// <seealso cref= #setBoost </seealso>
+ /// <seealso cref="ApplyBoost"/>
public static readonly bool DEFAULT_BOOST = false;
/// <summary>
@@ -174,31 +164,27 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
/// Ignore words less than this length or if 0 then this has no effect.
/// </summary>
- /// <seealso cref= #getMinWordLen </seealso>
- /// <seealso cref= #setMinWordLen </seealso>
+ /// <seealso cref="MinWordLen"/>
public static readonly int DEFAULT_MIN_WORD_LENGTH = 0;
/// <summary>
/// Ignore words greater than this length or if 0 then this has no effect.
/// </summary>
- /// <seealso cref= #getMaxWordLen </seealso>
- /// <seealso cref= #setMaxWordLen </seealso>
+ /// <seealso cref="MaxWordLen"/>
public static readonly int DEFAULT_MAX_WORD_LENGTH = 0;
/// <summary>
/// Default set of stopwords.
/// If null means to allow stop words.
/// </summary>
- /// <seealso cref= #setStopWords </seealso>
- /// <seealso cref= #getStopWords </seealso>
+ /// <seealso cref="StopWords"/>
public static readonly ISet<string> DEFAULT_STOP_WORDS = null;
/// <summary>
/// Return a Query with no more than this many terms.
/// </summary>
- /// <seealso cref= BooleanQuery#getMaxClauseCount </seealso>
- /// <seealso cref= #getMaxQueryTerms </seealso>
- /// <seealso cref= #setMaxQueryTerms </seealso>
+ /// <seealso cref="BooleanQuery.MaxClauseCount"/>
+ /// <seealso cref="MaxQueryTerms"/>
public static readonly int DEFAULT_MAX_QUERY_TERMS = 25;
// LUCNENENET NOTE: The following fields were made into auto-implemented properties:
@@ -207,7 +193,7 @@ namespace Lucene.Net.Queries.Mlt
// maxQueryTerms, similarity
/// <summary>
- /// IndexReader to use
+ /// <see cref="IndexReader"/> to use
/// </summary>
private readonly IndexReader ir;
@@ -217,10 +203,8 @@ namespace Lucene.Net.Queries.Mlt
private float boostFactor = 1;
/// <summary>
- /// Returns the boost factor used when boosting terms
+ /// Gets or Sets the boost factor used when boosting terms
/// </summary>
- /// <returns> the boost factor used when boosting terms </returns>
- /// <seealso cref= #setBoostFactor(float) </seealso>
public float BoostFactor
{
get
@@ -235,7 +219,7 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
- /// Constructor requiring an IndexReader.
+ /// Constructor requiring an <see cref="IndexReader"/>.
/// </summary>
public MoreLikeThis(IndexReader ir)
: this(ir, new DefaultSimilarity())
@@ -267,37 +251,32 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
- /// Returns an analyzer that will be used to parse source doc with. The default analyzer
- /// is not set.
+ /// Gets or Sets an analyzer that will be used to parse source doc with. The default analyzer
+ /// is not set. An analyzer is not required for generating a query with the
+ /// <see cref="Like(int)"/> method, all other 'like' methods require an analyzer.
/// </summary>
- /// <returns> the analyzer that will be used to parse source doc with. </returns>
public Analyzer Analyzer { get; set; }
/// <summary>
- /// Returns the frequency below which terms will be ignored in the source doc. The default
- /// frequency is the <seealso cref="#DEFAULT_MIN_TERM_FREQ"/>.
+ /// Gets or Sets the frequency below which terms will be ignored in the source doc. The default
+ /// frequency is the <see cref="DEFAULT_MIN_TERM_FREQ"/>.
/// </summary>
- /// <returns> the frequency below which terms will be ignored in the source doc. </returns>
public int MinTermFreq { get; set; }
/// <summary>
- /// Returns the frequency at which words will be ignored which do not occur in at least this
- /// many docs. The default frequency is <seealso cref="#DEFAULT_MIN_DOC_FREQ"/>.
+ /// Gets or Sets the frequency at which words will be ignored which do not occur in at least this
+ /// many docs. The default frequency is <see cref="DEFAULT_MIN_DOC_FREQ"/>.
/// </summary>
- /// <returns> the frequency at which words will be ignored which do not occur in at least this
- /// many docs. </returns>
public int MinDocFreq { get; set; }
/// <summary>
- /// Returns the maximum frequency in which words may still appear.
+ /// Gets or Sets the maximum frequency in which words may still appear.
/// Words that appear in more than this many docs will be ignored. The default frequency is
- /// <seealso cref="#DEFAULT_MAX_DOC_FREQ"/>.
+ /// <see cref="DEFAULT_MAX_DOC_FREQ"/>.
/// </summary>
- /// <returns> get the maximum frequency at which words are still allowed,
- /// words which occur in more docs than this are ignored. </returns>
public int MaxDocFreq { get; set; }
@@ -317,55 +296,50 @@ namespace Lucene.Net.Queries.Mlt
/// Gets or Sets whether to boost terms in query based on "score" or not. The default is
/// <see cref="DEFAULT_BOOST"/>.
/// </summary>
- /// <returns> whether to boost terms in query based on "score" or not. </returns>
public bool ApplyBoost { get; set; }
/// <summary>
- /// Returns the field names that will be used when generating the 'More Like This' query.
- /// The default field names that will be used is <seealso cref="#DEFAULT_FIELD_NAMES"/>.
+ /// Gets or Sets the field names that will be used when generating the 'More Like This' query.
+ /// The default field names that will be used is <see cref="DEFAULT_FIELD_NAMES"/>.
+ /// Set this to null for the field names to be determined at runtime from the <see cref="IndexReader"/>
+ /// provided in the constructor.
/// </summary>
- /// <returns> the field names that will be used when generating the 'More Like This' query. </returns>
[WritableArray]
public string[] FieldNames { get; set; }
/// <summary>
- /// Returns the minimum word length below which words will be ignored. Set this to 0 for no
- /// minimum word length. The default is <seealso cref="#DEFAULT_MIN_WORD_LENGTH"/>.
+ /// Gets or Sets the minimum word length below which words will be ignored. Set this to 0 for no
+ /// minimum word length. The default is <see cref="DEFAULT_MIN_WORD_LENGTH"/>.
/// </summary>
- /// <returns> the minimum word length below which words will be ignored. </returns>
public int MinWordLen { get; set; }
/// <summary>
- /// Returns the maximum word length above which words will be ignored. Set this to 0 for no
- /// maximum word length. The default is <seealso cref="#DEFAULT_MAX_WORD_LENGTH"/>.
+ /// Gets or Sets the maximum word length above which words will be ignored. Set this to 0 for no
+ /// maximum word length. The default is <see cref="DEFAULT_MAX_WORD_LENGTH"/>.
/// </summary>
- /// <returns> the maximum word length above which words will be ignored. </returns>
public int MaxWordLen { get; set; }
/// <summary>
- /// Set the set of stopwords.
+ /// Gets or Sets the set of stopwords.
/// Any word in this set is considered "uninteresting" and ignored.
- /// Even if your Analyzer allows stopwords, you might want to tell the MoreLikeThis code to ignore them, as
+ /// Even if your <see cref="Analysis.Analyzer"/> allows stopwords, you might want to tell the <see cref="MoreLikeThis"/> code to ignore them, as
/// for the purposes of document similarity it seems reasonable to assume that "a stop word is never interesting".
/// </summary>
- /// <param name="stopWords"> set of stopwords, if null it means to allow stop words </param>
- /// <seealso cref= #getStopWords </seealso>
public ISet<string> StopWords { get; set; }
/// <summary>
- /// Returns the maximum number of query terms that will be included in any generated query.
- /// The default is <seealso cref="#DEFAULT_MAX_QUERY_TERMS"/>.
+ /// Gets or Sets the maximum number of query terms that will be included in any generated query.
+ /// The default is <see cref="DEFAULT_MAX_QUERY_TERMS"/>.
/// </summary>
- /// <returns> the maximum number of query terms that will be included in any generated query. </returns>
public int MaxQueryTerms { get; set; }
- /// <returns> The maximum number of tokens to parse in each example doc field that is not stored with TermVector support </returns>
- /// <seealso cref= #DEFAULT_MAX_NUM_TOKENS_PARSED </seealso>
+ /// <returns> Gets or Sets the maximum number of tokens to parse in each example doc field that is not stored with TermVector support </returns>
+ /// <seealso cref="DEFAULT_MAX_NUM_TOKENS_PARSED"/>
public int MaxNumTokensParsed { get; set; }
@@ -388,16 +362,16 @@ namespace Lucene.Net.Queries.Mlt
}
/// <summary>
- /// Return a query that will return docs like the passed Reader.
+ /// Return a query that will return docs like the passed <see cref="TextReader"/>.
/// </summary>
- /// <returns> a query that will return docs like the passed Reader. </returns>
- public Query Like(Reader r, string fieldName)
+ /// <returns> a query that will return docs like the passed <see cref="TextReader"/>. </returns>
+ public Query Like(TextReader r, string fieldName)
{
return CreateQuery(RetrieveTerms(r, fieldName));
}
/// <summary>
- /// Create the More like query from a PriorityQueue
+ /// Create the More like query from a <see cref="Util.PriorityQueue{Object[]}"/>
/// </summary>
private Query CreateQuery(Util.PriorityQueue<object[]> q)
{
@@ -442,9 +416,9 @@ namespace Lucene.Net.Queries.Mlt
}
/// <summary>
- /// Create a PriorityQueue from a word->tf map.
+ /// Create a <see cref="Util.PriorityQueue{Object[]}"/> from a word->tf map.
/// </summary>
- /// <param name="words"> a map of words keyed on the word(String) with Int objects as the values. </param>
+ /// <param name="words"> a map of words keyed on the word(<see cref="string"/>) with <see cref="Int"/> objects as the values. </param>
/// <exception cref="IOException"/>
private Util.PriorityQueue<object[]> CreateQueue(IDictionary<string, Int> words)
{
@@ -562,9 +536,9 @@ namespace Lucene.Net.Queries.Mlt
}
/// <summary>
- /// Adds terms and frequencies found in vector into the Map termFreqMap
+ /// Adds terms and frequencies found in vector into the <see cref="IDictionary{string, Int}"/> <paramref name="termFreqMap"/>
/// </summary>
- /// <param name="termFreqMap"> a Map of terms and their frequencies </param>
+ /// <param name="termFreqMap"> a <see cref="IDictionary{string, Int}"/> of terms and their frequencies </param>
/// <param name="vector"> List of terms and their frequencies for a doc/field </param>
private void AddTermFrequencies(IDictionary<string, Int> termFreqMap, Terms vector)
{
@@ -597,12 +571,12 @@ namespace Lucene.Net.Queries.Mlt
}
/// <summary>
- /// Adds term frequencies found by tokenizing text from reader into the Map words
+ /// Adds term frequencies found by tokenizing text from reader into the <see cref="IDictionary{string, Int}"/> words
/// </summary>
/// <param name="r"> a source of text to be tokenized </param>
- /// <param name="termFreqMap"> a Map of terms and their frequencies </param>
+ /// <param name="termFreqMap"> a <see cref="IDictionary{string, Int}"/> of terms and their frequencies </param>
/// <param name="fieldName"> Used by analyzer for any special per-field analysis </param>
- private void AddTermFrequencies(Reader r, IDictionary<string, Int> termFreqMap, string fieldName)
+ private void AddTermFrequencies(TextReader r, IDictionary<string, Int> termFreqMap, string fieldName)
{
if (Analyzer == null)
{
@@ -652,7 +626,7 @@ namespace Lucene.Net.Queries.Mlt
/// determines if the passed term is likely to be of interest in "more like" comparisons
/// </summary>
/// <param name="term"> The word being considered </param>
- /// <returns> true if should be ignored, false if should be used in further analysis </returns>
+ /// <returns> <c>true</c> if should be ignored, <c>false</c> if should be used in further analysis </returns>
private bool IsNoiseWord(string term)
{
int len = term.Length;
@@ -673,31 +647,31 @@ namespace Lucene.Net.Queries.Mlt
/// The result is a priority queue of arrays with one entry for <b>every word</b> in the document.
/// Each array has 6 elements.
/// The elements are:
- /// <ol>
- /// <li> The word (String)
- /// <li> The top field that this word comes from (String)
- /// <li> The score for this word (Float)
- /// <li> The IDF value (Float)
- /// <li> The frequency of this word in the index (Integer)
- /// <li> The frequency of this word in the source document (Integer)
- /// </ol>
+ /// <list type="bullet">
+ /// <item>The word (<see cref="string"/>)</item>
+ /// <item>The top field that this word comes from (<see cref="string"/>)</item>
+ /// <item>The score for this word (<see cref="float"/>)</item>
+ /// <item>The IDF value (<see cref="float"/>)</item>
+ /// <item>The frequency of this word in the index (<see cref="int"/>)</item>
+ /// <item>The frequency of this word in the source document (<see cref="int"/>)</item>
+ /// </list>
/// This is a somewhat "advanced" routine, and in general only the 1st entry in the array is of interest.
/// This method is exposed so that you can identify the "interesting words" in a document.
- /// For an easier method to call see <seealso cref="#retrieveInterestingTerms retrieveInterestingTerms()"/>.
+ /// For an easier method to call see <see cref="RetrieveInterestingTerms"/>.
/// </summary>
/// <param name="r"> the reader that has the content of the document </param>
/// <param name="fieldName"> field passed to the analyzer to use when analyzing the content </param>
/// <returns> the most interesting words in the document ordered by score, with the highest scoring, or best entry, first </returns>
/// <exception cref="IOException"/>
- /// <seealso cref= #retrieveInterestingTerms </seealso>
- public Util.PriorityQueue<object[]> RetrieveTerms(Reader r, string fieldName)
+ /// <seealso cref="RetrieveInterestingTerms"/>
+ public Util.PriorityQueue<object[]> RetrieveTerms(TextReader r, string fieldName)
{
IDictionary<string, Int> words = new Dictionary<string, Int>();
AddTermFrequencies(r, words, fieldName);
return CreateQueue(words);
}
- /// <seealso cref= #retrieveInterestingTerms(java.io.Reader, String) </seealso>
+ /// <seealso cref="RetrieveInterestingTerms(TextReader, string)"/>
public string[] RetrieveInterestingTerms(int docNum)
{
var al = new List<string>(MaxQueryTerms);
@@ -715,14 +689,14 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
/// Convenience routine to make it easy to return the most interesting words in a document.
- /// More advanced users will call <seealso cref="#retrieveTerms(Reader, String) retrieveTerms()"/> directly.
+ /// More advanced users will call <see cref="RetrieveTerms(TextReader, string)"/> directly.
/// </summary>
/// <param name="r"> the source document </param>
/// <param name="fieldName"> field passed to analyzer to use when analyzing the content </param>
/// <returns> the most interesting words in the document </returns>
- /// <seealso cref= #retrieveTerms(java.io.Reader, String) </seealso>
- /// <seealso cref= #setMaxQueryTerms </seealso>
- public string[] RetrieveInterestingTerms(Reader r, string fieldName)
+ /// <seealso cref="RetrieveTerms(TextReader, string)"/>
+ /// <seealso cref="MaxQueryTerms"/>
+ public string[] RetrieveInterestingTerms(TextReader r, string fieldName)
{
var al = new List<string>(MaxQueryTerms);
Util.PriorityQueue<object[]> pq = RetrieveTerms(r, fieldName);
@@ -738,7 +712,7 @@ namespace Lucene.Net.Queries.Mlt
}
/// <summary>
- /// PriorityQueue that orders words by score.
+ /// <see cref="Util.PriorityQueue{object[]}"/> that orders words by score.
/// </summary>
private class FreqQ : Util.PriorityQueue<object[]>
{
@@ -756,7 +730,7 @@ namespace Lucene.Net.Queries.Mlt
}
/// <summary>
- /// Use for frequencies and to avoid renewing Integers.
+ /// Use for frequencies and to avoid renewing <see cref="int"/>s.
/// </summary>
private class Int
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs
index 3344adc..a0c9746 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs
@@ -28,9 +28,9 @@ namespace Lucene.Net.Queries.Mlt
*/
/// <summary>
- /// A simple wrapper for MoreLikeThis for use in scenarios where a Query object is required eg
- /// in custom QueryParser extensions. At query.rewrite() time the reader is used to construct the
- /// actual MoreLikeThis object and obtain the real Query object.
+ /// A simple wrapper for <see cref="MoreLikeThis"/> for use in scenarios where a <see cref="Query"/> object is required eg
+ /// in custom QueryParser extensions. At query.Rewrite() time the reader is used to construct the
+ /// actual <see cref="MoreLikeThis"/> object and obtain the real <see cref="Query"/> object.
/// </summary>
public class MoreLikeThisQuery : Query
{
@@ -75,9 +75,9 @@ namespace Lucene.Net.Queries.Mlt
return bq;
}
- /* (non-Javadoc)
- * @see org.apache.lucene.search.Query#toString(java.lang.String)
- */
+ /// <summary>
+ /// <see cref="Query.ToString(string)"/>
+ /// </summary>
public override string ToString(string field)
{
return "like:" + LikeText;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/TermFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermFilter.cs b/src/Lucene.Net.Queries/TermFilter.cs
index 880ddfb..a3a48a8 100644
--- a/src/Lucene.Net.Queries/TermFilter.cs
+++ b/src/Lucene.Net.Queries/TermFilter.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Queries
this.term = term;
}
- /// <returns> The term this filter includes documents with. </returns>
+ /// <summary> Gets the term this filter includes documents with. </summary>
public Term Term
{
get
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/TermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index 3cff069..73a2611 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.Queries
/// Unlike a RangeFilter this can be used for filtering on multiple terms that are not necessarily in
/// a sequence. An example might be a collection of primary keys from a database query result or perhaps
/// a choice of "category" labels picked by the end user. As a filter, this is much faster than the
- /// equivalent query (a BooleanQuery with many "should" TermQueries)
+ /// equivalent query (a <see cref="BooleanQuery"/> with many "should" <see cref="TermQuery"/>s)
/// </summary>
public sealed class TermsFilter : Filter
{
@@ -52,7 +52,7 @@ namespace Lucene.Net.Queries
private const int PRIME = 31;
/// <summary>
- /// Creates a new <seealso cref="TermsFilter"/> from the given list. The list
+ /// Creates a new <see cref="TermsFilter"/> from the given list. The list
/// can contain duplicate terms and multiple fields.
/// </summary>
public TermsFilter(List<Term> terms)
@@ -91,7 +91,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Creates a new <seealso cref="TermsFilter"/> from the given <seealso cref="BytesRef"/> list for
+ /// Creates a new <see cref="TermsFilter"/> from the given <see cref="BytesRef"/> list for
/// a single field.
/// </summary>
public TermsFilter(string field, List<BytesRef> terms)
@@ -129,7 +129,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Creates a new <seealso cref="TermsFilter"/> from the given <seealso cref="BytesRef"/> array for
+ /// Creates a new <see cref="TermsFilter"/> from the given <see cref="BytesRef"/> array for
/// a single field.
/// </summary>
public TermsFilter(string field, params BytesRef[] terms)
@@ -139,7 +139,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Creates a new <seealso cref="TermsFilter"/> from the given array. The array can
+ /// Creates a new <see cref="TermsFilter"/> from the given array. The array can
/// contain duplicate terms and multiple fields.
/// </summary>
public TermsFilter(params Term[] terms)
[09/22] lucenenet git commit: Lucene.Net.Queries.Mlt.MoreLikeThis
refactor: MaxDocFreqPct (setter only) > SetMaxDocFreqPct(int)
Posted by ni...@apache.org.
Lucene.Net.Queries.Mlt.MoreLikeThis refactor: MaxDocFreqPct (setter only) > SetMaxDocFreqPct(int)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/34cde531
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/34cde531
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/34cde531
Branch: refs/heads/api-work
Commit: 34cde531814e712e7eeef596c914c3e35d73d565
Parents: 5d2ad90
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 08:02:48 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 08:02:48 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/34cde531/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 8f36026..4534bdc 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -307,12 +307,9 @@ namespace Lucene.Net.Queries.Mlt
/// </summary>
/// <param name="maxPercentage"> the maximum percentage of documents (0-100) that a term may appear
/// in to be still considered relevant </param>
- public int MaxDocFreqPct // LUCENENET TODO: Change to SetMaxDocFreqPct(int maxPercentage)
+ public void SetMaxDocFreqPct(int maxPercentage)
{
- set
- {
- this.MaxDocFreq = value * ir.NumDocs / 100;
- }
+ this.MaxDocFreq = maxPercentage * ir.NumDocs / 100;
}
[21/22] lucenenet git commit: Lucene.Net.Queries: documentation
comments
Posted by ni...@apache.org.
Lucene.Net.Queries: documentation comments
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/4438d239
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/4438d239
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/4438d239
Branch: refs/heads/api-work
Commit: 4438d2394c625cf11b8dc7c45b209f561fbe3970
Parents: 2a6c69e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 16:15:18 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 16:15:18 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/BooleanFilter.cs | 24 +-
src/Lucene.Net.Queries/BoostingQuery.cs | 10 +-
src/Lucene.Net.Queries/ChainedFilter.cs | 8 +-
src/Lucene.Net.Queries/CommonTermsQuery.cs | 46 ++--
src/Lucene.Net.Queries/CustomScoreProvider.cs | 67 +++--
src/Lucene.Net.Queries/CustomScoreQuery.cs | 77 +++---
src/Lucene.Net.Queries/FilterClause.cs | 16 +-
src/Lucene.Net.Queries/Function/BoostedQuery.cs | 2 +-
.../Function/DocValues/BoolDocValues.cs | 4 +-
.../DocValues/DocTermsIndexDocValues.cs | 4 +-
.../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 | 12 +-
.../Function/FunctionValues.cs | 18 +-
src/Lucene.Net.Queries/Function/ValueSource.cs | 30 +--
.../Function/ValueSourceScorer.cs | 2 +-
.../Function/ValueSources/BoolFunction.cs | 2 +-
.../Function/ValueSources/ByteFieldSource.cs | 7 +-
.../ValueSources/BytesRefFieldSource.cs | 2 +-
.../Function/ValueSources/ConstNumberSource.cs | 2 +-
.../Function/ValueSources/ConstValueSource.cs | 2 +-
.../Function/ValueSources/DefFunction.cs | 6 +-
.../Function/ValueSources/DocFreqValueSource.cs | 2 +-
.../Function/ValueSources/DoubleFieldSource.cs | 2 +-
.../Function/ValueSources/DualFloatFunction.cs | 5 +-
.../Function/ValueSources/EnumFieldSource.cs | 4 +-
.../Function/ValueSources/FieldCacheSource.cs | 6 +-
.../Function/ValueSources/FloatFieldSource.cs | 2 +-
.../Function/ValueSources/IDFValueSource.cs | 7 +-
.../Function/ValueSources/IfFunction.cs | 5 +-
.../Function/ValueSources/IntFieldSource.cs | 2 +-
.../ValueSources/LinearFloatFunction.cs | 10 +-
.../Function/ValueSources/LiteralValueSource.cs | 4 +-
.../Function/ValueSources/LongFieldSource.cs | 2 +-
.../Function/ValueSources/MaxDocValueSource.cs | 2 +-
.../Function/ValueSources/MaxFloatFunction.cs | 2 +-
.../Function/ValueSources/MinFloatFunction.cs | 2 +-
.../Function/ValueSources/MultiBoolFunction.cs | 5 +-
.../Function/ValueSources/MultiFloatFunction.cs | 5 +-
.../Function/ValueSources/MultiFunction.cs | 6 +-
.../Function/ValueSources/MultiValueSource.cs | 3 +-
.../Function/ValueSources/NormValueSource.cs | 7 +-
.../Function/ValueSources/NumDocsValueSource.cs | 2 +-
.../Function/ValueSources/OrdFieldSource.cs | 29 ++-
.../ValueSources/ProductFloatFunction.cs | 2 +-
.../Function/ValueSources/QueryValueSource.cs | 2 +-
.../ValueSources/RangeMapFloatFunction.cs | 10 +-
.../ValueSources/ReciprocalFloatFunction.cs | 23 +-
.../ValueSources/ReverseOrdFieldSource.cs | 26 +-
.../Function/ValueSources/ScaleFloatFunction.cs | 8 +-
.../Function/ValueSources/ShortFieldSource.cs | 5 +-
.../Function/ValueSources/SimpleBoolFunction.cs | 6 +-
.../ValueSources/SimpleFloatFunction.cs | 2 +-
.../Function/ValueSources/SumFloatFunction.cs | 2 +-
.../ValueSources/SumTotalTermFreqValueSource.cs | 2 +-
.../Function/ValueSources/TFValueSource.cs | 7 +-
.../ValueSources/TermFreqValueSource.cs | 5 +-
.../ValueSources/TotalTermFreqValueSource.cs | 2 +-
.../Function/ValueSources/VectorValueSource.cs | 4 +-
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 260 +++++++++----------
src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs | 12 +-
src/Lucene.Net.Queries/TermFilter.cs | 2 +-
src/Lucene.Net.Queries/TermsFilter.cs | 10 +-
66 files changed, 407 insertions(+), 468 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/BooleanFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/BooleanFilter.cs b/src/Lucene.Net.Queries/BooleanFilter.cs
index 950d572..fdcc15f 100644
--- a/src/Lucene.Net.Queries/BooleanFilter.cs
+++ b/src/Lucene.Net.Queries/BooleanFilter.cs
@@ -26,20 +26,20 @@ namespace Lucene.Net.Queries
*/
/// <summary>
- /// A container Filter that allows Boolean composition of Filters.
- /// Filters are allocated into one of three logical constructs;
+ /// A container <see cref="Filter"/> that allows Boolean composition of <see cref="Filter"/>s.
+ /// <see cref="Filter"/>s are allocated into one of three logical constructs;
/// SHOULD, MUST NOT, MUST
- /// The results Filter BitSet is constructed as follows:
+ /// The results <see cref="Filter"/> BitSet is constructed as follows:
/// SHOULD Filters are OR'd together
- /// The resulting Filter is NOT'd with the NOT Filters
- /// The resulting Filter is AND'd with the MUST Filters
+ /// The resulting <see cref="Filter"/> is NOT'd with the NOT <see cref="Filter"/>s
+ /// The resulting <see cref="Filter"/> is AND'd with the MUST <see cref="Filter"/>s
/// </summary>
public class BooleanFilter : Filter, IEnumerable<FilterClause>
{
private readonly IList<FilterClause> clauses = new List<FilterClause>();
/// <summary>
- /// Returns the a DocIdSetIterator representing the Boolean composition
+ /// Returns the a <see cref="DocIdSetIterator"/> representing the Boolean composition
/// of the filters that have been added.
/// </summary>
public override DocIdSet GetDocIdSet(AtomicReaderContext context, IBits acceptDocs)
@@ -121,8 +121,8 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Adds a new FilterClause to the Boolean Filter container </summary>
- /// <param name="filterClause"> A FilterClause object containing a Filter and an Occur parameter </param>
+ /// Adds a new <see cref="FilterClause"/> to the Boolean <see cref="Filter"/> container </summary>
+ /// <param name="filterClause"> A <see cref="FilterClause"/> object containing a <see cref="Filter"/> and an <see cref="Occur"/> parameter </param>
public virtual void Add(FilterClause filterClause)
{
clauses.Add(filterClause);
@@ -134,7 +134,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns the list of clauses
+ /// Gets the list of clauses
/// </summary>
public virtual IList<FilterClause> Clauses
{
@@ -142,9 +142,9 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns an iterator on the clauses in this query. It implements the <seealso cref="Iterable"/> interface to
+ /// Returns an iterator on the clauses in this query. It implements the <see cref="IEnumerable{T}"/> interface to
/// make it possible to do:
- /// <pre class="prettyprint">for (FilterClause clause : booleanFilter) {}</pre>
+ /// <code>for (FilterClause clause : booleanFilter) {}</code>
/// </summary>
public IEnumerator<FilterClause> GetEnumerator()
{
@@ -173,7 +173,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Prints a user-readable version of this Filter. </summary>
+ /// Prints a user-readable version of this <see cref="Filter"/>. </summary>
public override string ToString()
{
var buffer = new StringBuilder("BooleanFilter(");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/BoostingQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/BoostingQuery.cs b/src/Lucene.Net.Queries/BoostingQuery.cs
index d74870a..364bfc5 100644
--- a/src/Lucene.Net.Queries/BoostingQuery.cs
+++ b/src/Lucene.Net.Queries/BoostingQuery.cs
@@ -21,20 +21,22 @@ namespace Lucene.Net.Queries
* limitations under the License.
*/
+
/// <summary>
- /// The BoostingQuery class can be used to effectively demote results that match a given query.
+ /// The <see cref="BoostingQuery"/> class can be used to effectively demote results that match a given query.
/// Unlike the "NOT" clause, this still selects documents that contain undesirable terms,
/// but reduces their overall score:
- ///
+ /// <code>
/// Query balancedQuery = new BoostingQuery(positiveQuery, negativeQuery, 0.01f);
+ /// </code>
/// In this scenario the positiveQuery contains the mandatory, desirable criteria which is used to
/// select all matching documents, and the negativeQuery contains the undesirable elements which
/// are simply used to lessen the scores. Documents that match the negativeQuery have their score
/// multiplied by the supplied "boost" parameter, so this should be less than 1 to achieve a
/// demoting effect
///
- /// This code was originally made available here: [WWW] http://marc.theaimsgroup.com/?l=lucene-user&m=108058407130459&w=2
- /// and is documented here: http://wiki.apache.org/lucene-java/CommunityContributions
+ /// This code was originally made available here: <c>[WWW] http://marc.theaimsgroup.com/?l=lucene-user&m=108058407130459&w=2 </c>
+ /// and is documented here: <c>http://wiki.apache.org/lucene-java/CommunityContributions</c>
/// </summary>
public class BoostingQuery : Query
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/ChainedFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/ChainedFilter.cs b/src/Lucene.Net.Queries/ChainedFilter.cs
index 01cefb7..2107d89 100644
--- a/src/Lucene.Net.Queries/ChainedFilter.cs
+++ b/src/Lucene.Net.Queries/ChainedFilter.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Queries
/// <summary>
/// <para>
- /// Allows multiple <seealso cref="Filter"/>s to be chained.
+ /// Allows multiple <see cref="Filter"/>s to be chained.
/// Logical operations such as <b>NOT</b> and <b>XOR</b>
/// are applied between filters. One operation can be used
/// for all filters, or a specific operation can be declared
@@ -33,8 +33,8 @@ namespace Lucene.Net.Queries
/// <para>
/// Order in which filters are called depends on
/// the position of the filter in the chain. It's probably
- /// more efficient to place the most restrictive filters
- /// /least computationally-intensive filters first.
+ /// more efficient to place the most restrictive filters/least
+ /// computationally-intensive filters first.
/// </para>
/// </summary>
public class ChainedFilter : Filter
@@ -89,7 +89,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// <seealso cref="Filter#GetDocIdSet"/>.
+ /// <seealso cref="Filter.GetDocIdSet"/>.
/// </summary>
public override DocIdSet GetDocIdSet(AtomicReaderContext context, IBits acceptDocs)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index 422f56b..efab160 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -31,18 +31,18 @@ namespace Lucene.Net.Queries
/// <summary>
/// A query that executes high-frequency terms in a optional sub-query to prevent
/// slow queries due to "common" terms like stopwords. This query
- /// builds 2 queries off the <seealso cref="#add(Term) added"/> terms: low-frequency
+ /// builds 2 queries off the <see cref="Add(Term) added"/> terms: low-frequency
/// terms are added to a required boolean clause and high-frequency terms are
/// added to an optional boolean clause. The optional clause is only executed if
/// the required "low-frequency" clause matches. Scores produced by this query
- /// will be slightly different than plain <seealso cref="BooleanQuery"/> scorer mainly due to
- /// differences in the <seealso cref="Similarity#coord(int,int) number of leaf queries"/>
+ /// will be slightly different than plain <see cref="BooleanQuery"/> scorer mainly due to
+ /// differences in the <see cref="Search.Similarities.Similarity.Coord(int,int) number of leaf queries"/>
/// in the required boolean clause. In most cases, high-frequency terms are
/// unlikely to significantly contribute to the document score unless at least
/// one of the low-frequency terms are matched. This query can improve
/// query execution times significantly if applicable.
/// <para>
- /// <seealso cref="CommonTermsQuery"/> has several advantages over stopword filtering at
+ /// <see cref="CommonTermsQuery"/> has several advantages over stopword filtering at
/// index or query time since a term can be "classified" based on the actual
/// document frequency in the index and can prevent slow queries even across
/// domains without specialized stopword files.
@@ -71,41 +71,41 @@ namespace Lucene.Net.Queries
protected float m_highFreqMinNrShouldMatch = 0;
/// <summary>
- /// Creates a new <seealso cref="CommonTermsQuery"/>
+ /// Creates a new <see cref="CommonTermsQuery"/>
/// </summary>
/// <param name="highFreqOccur">
- /// <seealso cref="Occur"/> used for high frequency terms </param>
+ /// <see cref="Occur"/> used for high frequency terms </param>
/// <param name="lowFreqOccur">
- /// <seealso cref="Occur"/> used for low frequency terms </param>
+ /// <see cref="Occur"/> used for low frequency terms </param>
/// <param name="maxTermFrequency">
/// a value in [0..1) (or absolute number >=1) representing the
/// maximum threshold of a terms document frequency to be considered a
/// low frequency term. </param>
/// <exception cref="ArgumentException">
- /// if <seealso cref="Occur#MUST_NOT"/> is pass as lowFreqOccur or
- /// highFreqOccur </exception>
+ /// if <see cref="Occur.MUST_NOT"/> is pass as <paramref name="lowFreqOccur"/> or
+ /// <paramref name="highFreqOccur"/> </exception>
public CommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur, float maxTermFrequency)
: this(highFreqOccur, lowFreqOccur, maxTermFrequency, false)
{
}
/// <summary>
- /// Creates a new <seealso cref="CommonTermsQuery"/>
+ /// Creates a new <see cref="CommonTermsQuery"/>
/// </summary>
/// <param name="highFreqOccur">
- /// <seealso cref="Occur"/> used for high frequency terms </param>
+ /// <see cref="Occur"/> used for high frequency terms </param>
/// <param name="lowFreqOccur">
- /// <seealso cref="Occur"/> used for low frequency terms </param>
+ /// <see cref="Occur"/> used for low frequency terms </param>
/// <param name="maxTermFrequency">
/// a value in [0..1) (or absolute number >=1) representing the
/// maximum threshold of a terms document frequency to be considered a
/// low frequency term. </param>
/// <param name="disableCoord">
- /// disables <seealso cref="Similarity#coord(int,int)"/> in scoring for the low
+ /// disables <see cref="Search.Similarities.Similarity.Coord(int,int)"/> in scoring for the low
/// / high frequency sub-queries </param>
/// <exception cref="ArgumentException">
- /// if <seealso cref="Occur#MUST_NOT"/> is pass as lowFreqOccur or
- /// highFreqOccur </exception>
+ /// if <see cref="Occur.MUST_NOT"/> is pass as <paramref name="lowFreqOccur"/> or
+ /// <paramref name="highFreqOccur"/> </exception>
public CommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur,
float maxTermFrequency, bool disableCoord)
{
@@ -124,7 +124,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Adds a term to the <seealso cref="CommonTermsQuery"/>
+ /// Adds a term to the <see cref="CommonTermsQuery"/>
/// </summary>
/// <param name="term">
/// the term to add </param>
@@ -291,7 +291,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns true iff <seealso cref="Similarity#coord(int,int)"/> is disabled in scoring
+ /// Returns true iff <see cref="Search.Similarities.Similarity.Coord(int,int)"/> is disabled in scoring
/// for the high and low frequency query instance. The top level query will
/// always disable coords.
/// </summary>
@@ -304,7 +304,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Specifies a minimum number of the low frequent optional BooleanClauses which must be
+ /// Gets or Sets a minimum number of the low frequent optional BooleanClauses which must be
/// satisfied in order to produce a match on the low frequency terms query
/// part. This method accepts a float value in the range [0..1) as a fraction
/// of the actual query terms in the low frequent clause or a number
@@ -316,8 +316,6 @@ namespace Lucene.Net.Queries
/// clauses is required.
/// </para>
/// </summary>
- /// <param name="min">
- /// the number of optional clauses that must match </param>
public virtual float LowFreqMinimumNumberShouldMatch
{
get { return m_lowFreqMinNrShouldMatch; }
@@ -326,7 +324,7 @@ namespace Lucene.Net.Queries
/// <summary>
- /// Specifies a minimum number of the high frequent optional BooleanClauses which must be
+ /// Gets or Sets a minimum number of the high frequent optional BooleanClauses which must be
/// satisfied in order to produce a match on the low frequency terms query
/// part. This method accepts a float value in the range [0..1) as a fraction
/// of the actual query terms in the low frequent clause or a number
@@ -467,11 +465,11 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Builds a new TermQuery instance.
+ /// Builds a new <see cref="TermQuery"/> instance.
/// <para>This is intended for subclasses that wish to customize the generated queries.</para> </summary>
/// <param name="term"> term </param>
- /// <param name="context"> the TermContext to be used to create the low level term query. Can be <code>null</code>. </param>
- /// <returns> new TermQuery instance </returns>
+ /// <param name="context"> the <see cref="TermContext"/> to be used to create the low level term query. Can be <c>null</c>. </param>
+ /// <returns> new <see cref="TermQuery"/> instance </returns>
protected virtual Query NewTermQuery(Term term, TermContext context)
{
return context == null ? new TermQuery(term) : new TermQuery(term, context);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/CustomScoreProvider.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CustomScoreProvider.cs b/src/Lucene.Net.Queries/CustomScoreProvider.cs
index 8f32365..bef2eb1 100644
--- a/src/Lucene.Net.Queries/CustomScoreProvider.cs
+++ b/src/Lucene.Net.Queries/CustomScoreProvider.cs
@@ -23,23 +23,22 @@ namespace Lucene.Net.Queries
/// <summary>
/// An instance of this subclass should be returned by
- /// <seealso cref="CustomScoreQuery#getCustomScoreProvider"/>, if you want
- /// to modify the custom score calculation of a <seealso cref="CustomScoreQuery"/>.
- /// <para>Since Lucene 2.9, queries operate on each segment of an index separately,
- /// so the protected <seealso cref="#context"/> field can be used to resolve doc IDs,
- /// as the supplied <code>doc</code> ID is per-segment and without knowledge
- /// of the IndexReader you cannot access the document or <seealso cref="IFieldCache"/>.
+ /// <see cref="CustomScoreQuery.GetCustomScoreProvider"/>, if you want
+ /// to modify the custom score calculation of a <see cref="CustomScoreQuery"/>.
+ /// <para/>Since Lucene 2.9, queries operate on each segment of an index separately,
+ /// so the protected <see cref="m_context"/> field can be used to resolve doc IDs,
+ /// as the supplied <c>doc</c> ID is per-segment and without knowledge
+ /// of the <see cref="IndexReader"/> you cannot access the document or <see cref="IFieldCache"/>.
///
/// @lucene.experimental
/// @since 2.9.2
- /// </para>
/// </summary>
public class CustomScoreProvider
{
protected readonly AtomicReaderContext m_context;
/// <summary>
- /// Creates a new instance of the provider class for the given <seealso cref="IndexReader"/>.
+ /// Creates a new instance of the provider class for the given <see cref="IndexReader"/>.
/// </summary>
public CustomScoreProvider(AtomicReaderContext context)
{
@@ -48,29 +47,25 @@ namespace Lucene.Net.Queries
/// <summary>
/// Compute a custom score by the subQuery score and a number of
- /// <seealso cref="FunctionQuery"/> scores.
- /// <para>
+ /// <see cref="Function.FunctionQuery"/> scores.
+ /// <para/>
/// Subclasses can override this method to modify the custom score.
- /// </para>
- /// <para>
+ /// <para/>
/// If your custom scoring is different than the default herein you
- /// should override at least one of the two customScore() methods.
- /// If the number of <seealso cref="FunctionQuery function queries"/> is always < 2 it is
+ /// should override at least one of the two <see cref="CustomScore"/> methods.
+ /// If the number of <see cref="Function.FunctionQuery"/>s is always < 2 it is
/// sufficient to override the other
- /// <seealso cref="#customScore(int, float, float) customScore()"/>
+ /// <see cref="CustomScore(int, float, float)"/>
/// method, which is simpler.
- /// </para>
- /// <para>
+ /// <para/>
/// The default computation herein is a multiplication of given scores:
- /// <pre>
+ /// <code>
/// ModifiedScore = valSrcScore * valSrcScores[0] * valSrcScores[1] * ...
- /// </pre>
- ///
- /// </para>
+ /// </code>
/// </summary>
/// <param name="doc"> id of scored doc. </param>
/// <param name="subQueryScore"> score of that doc by the subQuery. </param>
- /// <param name="valSrcScores"> scores of that doc by the <seealso cref="FunctionQuery"/>. </param>
+ /// <param name="valSrcScores"> scores of that doc by the <see cref="Function.FunctionQuery"/>. </param>
/// <returns> custom score. </returns>
public virtual float CustomScore(int doc, float subQueryScore, float[] valSrcScores)
{
@@ -86,27 +81,23 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Compute a custom score by the subQuery score and the <seealso cref="FunctionQuery"/> score.
- /// <para>
+ /// Compute a custom score by the <paramref name="subQueryScore"/> and the <see cref="Function.FunctionQuery"/> score.
+ /// <para/>
/// Subclasses can override this method to modify the custom score.
- /// </para>
- /// <para>
+ /// <para/>
/// If your custom scoring is different than the default herein you
- /// should override at least one of the two customScore() methods.
- /// If the number of <seealso cref="FunctionQuery function queries"/> is always < 2 it is
- /// sufficient to override this customScore() method, which is simpler.
- /// </para>
- /// <para>
+ /// should override at least one of the two <see cref="CustomScore"/> methods.
+ /// If the number of <see cref="Function.FunctionQuery"/>s is always < 2 it is
+ /// sufficient to override this <see cref="CustomScore(int, float, float)"/> method, which is simpler.
+ /// <para/>
/// The default computation herein is a multiplication of the two scores:
- /// <pre>
+ /// <code>
/// ModifiedScore = subQueryScore * valSrcScore
- /// </pre>
- ///
- /// </para>
+ /// </code>
/// </summary>
/// <param name="doc"> id of scored doc. </param>
/// <param name="subQueryScore"> score of that doc by the subQuery. </param>
- /// <param name="valSrcScore"> score of that doc by the <seealso cref="FunctionQuery"/>. </param>
+ /// <param name="valSrcScore"> score of that doc by the <see cref="Function.FunctionQuery"/>. </param>
/// <returns> custom score. </returns>
public virtual float CustomScore(int doc, float subQueryScore, float valSrcScore)
{
@@ -115,7 +106,7 @@ namespace Lucene.Net.Queries
/// <summary>
/// Explain the custom score.
- /// Whenever overriding <seealso cref="#customScore(int, float, float[])"/>,
+ /// Whenever overriding <see cref="CustomScore(int, float, float[])"/>,
/// this method should also be overridden to provide the correct explanation
/// for the part of the custom scoring.
/// </summary>
@@ -149,7 +140,7 @@ namespace Lucene.Net.Queries
/// <summary>
/// Explain the custom score.
- /// Whenever overriding <seealso cref="#customScore(int, float, float)"/>,
+ /// Whenever overriding <see cref="CustomScore(int, float, float)"/>,
/// this method should also be overridden to provide the correct explanation
/// for the part of the custom scoring.
/// </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/CustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CustomScoreQuery.cs b/src/Lucene.Net.Queries/CustomScoreQuery.cs
index 461d258..6ff1e8c 100644
--- a/src/Lucene.Net.Queries/CustomScoreQuery.cs
+++ b/src/Lucene.Net.Queries/CustomScoreQuery.cs
@@ -27,11 +27,11 @@ namespace Lucene.Net.Queries
/// <summary>
/// Query that sets document score as a programmatic function of several (sub) scores:
- /// <ol>
- /// <li>the score of its subQuery (any query)</li>
- /// <li>(optional) the score of its <seealso cref="FunctionQuery"/> (or queries).</li>
- /// </ol>
- /// Subclasses can modify the computation by overriding <seealso cref="#getCustomScoreProvider"/>.
+ /// <list type="bullet">
+ /// <item>the score of its subQuery (any query)</item>
+ /// <item>(optional) the score of its <see cref="FunctionQuery"/> (or queries).</item>
+ /// </list>
+ /// Subclasses can modify the computation by overriding <see cref="GetCustomScoreProvider"/>.
///
/// @lucene.experimental
/// </summary>
@@ -42,16 +42,16 @@ namespace Lucene.Net.Queries
private bool strict = false; // if true, valueSource part of query does not take part in weights normalization.
/// <summary>
- /// Create a CustomScoreQuery over input subQuery. </summary>
- /// <param name="subQuery"> the sub query whose scored is being customized. Must not be null. </param>
+ /// Create a <see cref="CustomScoreQuery"/> over input <paramref name="subQuery"/>. </summary>
+ /// <param name="subQuery"> the sub query whose scored is being customized. Must not be <c>null</c>. </param>
public CustomScoreQuery(Query subQuery)
: this(subQuery, new FunctionQuery[0])
{
}
/// <summary>
- /// Create a CustomScoreQuery over input subQuery and a <seealso cref="FunctionQuery"/>. </summary>
- /// <param name="subQuery"> the sub query whose score is being customized. Must not be null. </param>
+ /// Create a <see cref="CustomScoreQuery"/> over input <paramref name="subQuery"/> and a <see cref="FunctionQuery"/>. </summary>
+ /// <param name="subQuery"> the sub query whose score is being customized. Must not be <c>null</c>. </param>
/// <param name="scoringQuery"> a value source query whose scores are used in the custom score
/// computation. This parameter is optional - it can be null. </param>
public CustomScoreQuery(Query subQuery, FunctionQuery scoringQuery)
@@ -61,8 +61,8 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Create a CustomScoreQuery over input subQuery and a <seealso cref="FunctionQuery"/>. </summary>
- /// <param name="subQuery"> the sub query whose score is being customized. Must not be null. </param>
+ /// Create a <see cref="CustomScoreQuery"/> over input <paramref name="subQuery"/> and a <see cref="FunctionQuery"/>. </summary>
+ /// <param name="subQuery"> the sub query whose score is being customized. Must not be <c>null</c>. </param>
/// <param name="scoringQueries"> value source queries whose scores are used in the custom score
/// computation. This parameter is optional - it can be null or even an empty array. </param>
public CustomScoreQuery(Query subQuery, params FunctionQuery[] scoringQueries)
@@ -75,6 +75,9 @@ namespace Lucene.Net.Queries
}
}
+ /// <summary>
+ /// <seealso cref="Query.Rewrite(IndexReader)"/>
+ /// </summary>
public override Query Rewrite(IndexReader reader)
{
CustomScoreQuery clone = null;
@@ -102,6 +105,9 @@ namespace Lucene.Net.Queries
return clone ?? this;
}
+ /// <summary>
+ /// <seealso cref="Query.ExtractTerms(ISet{Term})"/>
+ /// </summary>
public override void ExtractTerms(ISet<Term> terms)
{
subQuery.ExtractTerms(terms);
@@ -111,8 +117,9 @@ namespace Lucene.Net.Queries
}
}
- /*(non-Javadoc) @see org.apache.lucene.search.Query#clone() */
-
+ /// <summary>
+ /// <seealso cref="Query.Clone"/>
+ /// </summary>
public override object Clone()
{
var clone = (CustomScoreQuery)base.Clone();
@@ -125,8 +132,9 @@ namespace Lucene.Net.Queries
return clone;
}
- /* (non-Javadoc) @see org.apache.lucene.search.Query#toString(java.lang.String) */
-
+ /// <summary>
+ /// <seealso cref="Query.ToString(string)"/>
+ /// </summary>
public override string ToString(string field)
{
StringBuilder sb = (new StringBuilder(Name)).Append("(");
@@ -141,7 +149,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns true if <code>o</code> is equal to this. </summary>
+ /// Returns true if <paramref name="o"/> is equal to this. </summary>
public override bool Equals(object o)
{
if (this == o)
@@ -174,12 +182,12 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns a <seealso cref="CustomScoreProvider"/> that calculates the custom scores
- /// for the given <seealso cref="IndexReader"/>. The default implementation returns a default
- /// implementation as specified in the docs of <seealso cref="CustomScoreProvider"/>.
+ /// Returns a <see cref="CustomScoreProvider"/> that calculates the custom scores
+ /// for the given <see cref="IndexReader"/>. The default implementation returns a default
+ /// implementation as specified in the docs of <see cref="CustomScoreProvider"/>.
/// @since 2.9.2
/// </summary>
- protected virtual CustomScoreProvider GetCustomScoreProvider(AtomicReaderContext context)
+ protected internal virtual CustomScoreProvider GetCustomScoreProvider(AtomicReaderContext context) // LUCENENET NOTE: Marked internal for documentation comments in CustomScoreProvider
{
return new CustomScoreProvider(context);
}
@@ -207,8 +215,9 @@ namespace Lucene.Net.Queries
this.qStrict = outerInstance.strict;
}
- /*(non-Javadoc) @see org.apache.lucene.search.Weight#getQuery() */
-
+ /// <summary>
+ /// <seealso cref="Weight.Query"/>
+ /// </summary>
public override Query Query
{
get { return outerInstance; }
@@ -232,8 +241,9 @@ namespace Lucene.Net.Queries
return sum;
}
- /*(non-Javadoc) @see org.apache.lucene.search.Weight#normalize(float) */
-
+ /// <summary>
+ /// <seealso cref="Weight.Normalize(float, float)"/>
+ /// </summary>
public override void Normalize(float norm, float topLevelBoost)
{
// note we DONT incorporate our boost, nor pass down any topLevelBoost
@@ -354,8 +364,9 @@ namespace Lucene.Net.Queries
get { return subQueryScorer.DocID; }
}
- /*(non-Javadoc) @see org.apache.lucene.search.Scorer#score() */
-
+ /// <summary>
+ /// <seealso cref="Scorer.GetScore"/>
+ /// </summary>
public override float GetScore()
{
for (int i = 0; i < valSrcScorers.Length; i++)
@@ -401,25 +412,25 @@ namespace Lucene.Net.Queries
/// <summary>
/// Checks if this is strict custom scoring.
- /// In strict custom scoring, the <seealso cref="ValueSource"/> part does not participate in weight normalization.
+ /// In strict custom scoring, the <see cref="ValueSource"/> part does not participate in weight normalization.
/// This may be useful when one wants full control over how scores are modified, and does
- /// not care about normalizing by the <seealso cref="ValueSource"/> part.
+ /// not care about normalizing by the <see cref="ValueSource"/> part.
/// One particular case where this is useful if for testing this query.
- /// <P>
- /// Note: only has effect when the <seealso cref="ValueSource"/> part is not null.
+ /// <para/>
+ /// Note: only has effect when the <see cref="ValueSource"/> part is not <c>null</c>.
/// </summary>
public virtual bool IsStrict { get; set; }
/// <summary>
- /// The sub-query that CustomScoreQuery wraps, affecting both the score and which documents match. </summary>
+ /// The sub-query that <see cref="CustomScoreQuery"/> wraps, affecting both the score and which documents match. </summary>
public virtual Query SubQuery
{
get { return subQuery; }
}
/// <summary>
- /// The scoring queries that only affect the score of CustomScoreQuery. </summary>
+ /// The scoring queries that only affect the score of <see cref="CustomScoreQuery"/>. </summary>
[WritableArray]
public virtual Query[] ScoringQueries
{
@@ -427,7 +438,7 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// A short name of this query, used in <seealso cref="#toString(String)"/>.
+ /// A short name of this query, used in <see cref="ToString(string)"/>.
/// </summary>
public virtual string Name
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/FilterClause.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/FilterClause.cs b/src/Lucene.Net.Queries/FilterClause.cs
index 0cbb370..2b4785b 100644
--- a/src/Lucene.Net.Queries/FilterClause.cs
+++ b/src/Lucene.Net.Queries/FilterClause.cs
@@ -20,9 +20,9 @@ namespace Lucene.Net.Queries
*/
/// <summary>
- /// A Filter that wrapped with an indication of how that filter
+ /// A <see cref="Search.Filter"/> that wrapped with an indication of how that filter
/// is used when composed with another filter.
- /// (Follows the boolean logic in BooleanClause for composition
+ /// (Follows the boolean logic in <see cref="BooleanClause"/> for composition
/// of queries.)
/// </summary>
public sealed class FilterClause
@@ -31,8 +31,8 @@ namespace Lucene.Net.Queries
private readonly Filter filter;
/// <summary>
- /// Create a new FilterClause </summary>
- /// <param name="filter"> A Filter object containing a BitSet </param>
+ /// Create a new <see cref="FilterClause"/> </summary>
+ /// <param name="filter"> A <see cref="Search.Filter"/> object containing a BitSet </param>
/// <param name="occur"> A parameter implementation indicating SHOULD, MUST or MUST NOT </param>
public FilterClause(Filter filter, Occur occur)
{
@@ -41,8 +41,8 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns this FilterClause's filter </summary>
- /// <returns> A Filter object </returns>
+ /// Returns this <see cref="FilterClause"/>'s filter </summary>
+ /// <returns> A <see cref="Search.Filter"/> object </returns>
public Filter Filter
{
get
@@ -52,8 +52,8 @@ namespace Lucene.Net.Queries
}
/// <summary>
- /// Returns this FilterClause's occur parameter </summary>
- /// <returns> An Occur object </returns>
+ /// Returns this <see cref="FilterClause"/>'s occur parameter </summary>
+ /// <returns> An <see cref="Search.Occur"/> object </returns>
public Occur Occur
{
get
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/BoostedQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/BoostedQuery.cs b/src/Lucene.Net.Queries/Function/BoostedQuery.cs
index 9efb4f6..7afdd5c 100644
--- a/src/Lucene.Net.Queries/Function/BoostedQuery.cs
+++ b/src/Lucene.Net.Queries/Function/BoostedQuery.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Queries.Function
*/
/// <summary>
- /// Query that is boosted by a ValueSource
+ /// Query that is boosted by a <see cref="Function.ValueSource"/>
/// </summary>
// TODO: BoostedQuery and BoostingQuery in the same module?
// something has to give
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 417f8ee..2efbd85 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -21,8 +21,8 @@ namespace Lucene.Net.Queries.Function.DocValues
*/
/// <summary>
- /// Abstract <seealso cref="FunctionValues"/> implementation which supports retrieving boolean values.
- /// Implementations can control how the boolean values are loaded through <seealso cref="#BoolVal(int)"/>}
+ /// Abstract <see cref="FunctionValues"/> implementation which supports retrieving <see cref="bool"/> values.
+ /// Implementations can control how the <see cref="bool"/> values are loaded through <see cref="BoolVal(int)"/>
/// </summary>
public abstract class BoolDocValues : FunctionValues
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 bd337d1..41f6d5e 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
@@ -24,7 +24,7 @@ namespace Lucene.Net.Queries.Function.DocValues
*/
/// <summary>
- /// Serves as base class for FunctionValues based on DocTermsIndex.
+ /// Serves as base class for <see cref="FunctionValues"/> based on DocTermsIndex.
/// @lucene.internal
/// </summary>
public abstract class DocTermsIndexDocValues : FunctionValues
@@ -200,7 +200,7 @@ namespace Lucene.Net.Queries.Function.DocValues
}
/// <summary>
- /// Custom Exception to be thrown when the DocTermsIndex for a field cannot be generated
+ /// Custom <see cref="Exception"/> to be thrown when the DocTermsIndex for a field cannot be generated
/// </summary>
// LUCENENET: All exeption classes should be marked serializable
#if FEATURE_SERIALIZABLE
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 3468b64..03bc61c 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -20,10 +20,10 @@ namespace Lucene.Net.Queries.Function.DocValues
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
- /// Abstract <seealso cref="FunctionValues"/> implementation which supports retrieving double values.
- /// Implementations can control how the double values are loaded through <seealso cref="#DoubleVal(int)"/>}
+ /// Abstract <see cref="FunctionValues"/> implementation which supports retrieving <see cref="double"/> values.
+ /// Implementations can control how the <see cref="double"/> values are loaded through <see cref="DoubleVal(int)"/>
/// </summary>
public abstract class DoubleDocValues : FunctionValues
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 561240f..a0927af 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -19,10 +19,10 @@ namespace Lucene.Net.Queries.Function.DocValues
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
- /// Abstract <seealso cref="FunctionValues"/> implementation which supports retrieving float values.
- /// Implementations can control how the float values are loaded through <seealso cref="#FloatVal(int)"/>}
+ /// Abstract <see cref="FunctionValues"/> implementation which supports retrieving <see cref="float"/> values.
+ /// Implementations can control how the <see cref="float"/> values are loaded through <see cref="FloatVal(int)"/>
/// </summary>
public abstract class FloatDocValues : FunctionValues
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 60a24ef..a8c1f3b 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -20,10 +20,10 @@ namespace Lucene.Net.Queries.Function.DocValues
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
- /// Abstract <seealso cref="FunctionValues"/> implementation which supports retrieving int values.
- /// Implementations can control how the int values are loaded through <seealso cref="#IntVal(int)"/>
+ /// Abstract <see cref="FunctionValues"/> implementation which supports retrieving <see cref="int"/> values.
+ /// Implementations can control how the <see cref="int"/> values are loaded through <see cref="IntVal(int)"/>
/// </summary>
public abstract class IntDocValues : FunctionValues
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 8fecaff..081d710 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -20,10 +20,10 @@ namespace Lucene.Net.Queries.Function.DocValues
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
- /// Abstract <seealso cref="FunctionValues"/> implementation which supports retrieving long values.
- /// Implementations can control how the long values are loaded through <seealso cref="#LongVal(int)"/>}
+ /// Abstract <see cref="FunctionValues"/> implementation which supports retrieving <see cref="long"/> values.
+ /// Implementations can control how the <see cref="long"/> values are loaded through <see cref="LongVal(int)"/>
/// </summary>
public abstract class LongDocValues : FunctionValues
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 7b05226..e8a52b1 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
@@ -18,10 +18,10 @@ namespace Lucene.Net.Queries.Function.DocValues
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
- /// Abstract <seealso cref="FunctionValues"/> implementation which supports retrieving String values.
- /// Implementations can control how the String values are loaded through <seealso cref="#StrVal(int)"/>}
+ /// Abstract <see cref="FunctionValues"/> implementation which supports retrieving <see cref="string"/> values.
+ /// Implementations can control how the <see cref="string"/> values are loaded through <see cref="StrVal(int)"/>
/// </summary>
public abstract class StrDocValues : FunctionValues
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 11ad039..0b088e2 100644
--- a/src/Lucene.Net.Queries/Function/FunctionQuery.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionQuery.cs
@@ -25,12 +25,10 @@ namespace Lucene.Net.Queries.Function
*/
/// <summary>
- /// Returns a score for each document based on a ValueSource,
+ /// Returns a score for each document based on a <see cref="Function.ValueSource"/>,
/// often some function of the value of a field.
///
/// <b>Note: This API is experimental and may change in non backward-compatible ways in the future</b>
- ///
- ///
/// </summary>
public class FunctionQuery : Query
{
@@ -42,7 +40,7 @@ namespace Lucene.Net.Queries.Function
this.func = func;
}
- /// <returns> The associated ValueSource </returns>
+ /// <returns> The associated <see cref="Function.ValueSource"/> </returns>
public virtual ValueSource ValueSource
{
get
@@ -215,7 +213,8 @@ namespace Lucene.Net.Queries.Function
/// <summary>
- /// Returns true if <code>o</code> is equal to this. </summary>
+ /// Returns true if <paramref name="o"/> is equal to this.
+ /// </summary>
public override bool Equals(object o)
{
var other = o as FunctionQuery;
@@ -228,7 +227,8 @@ namespace Lucene.Net.Queries.Function
}
/// <summary>
- /// Returns a hash code value for this object. </summary>
+ /// Returns a hash code value for this object.
+ /// </summary>
public override int GetHashCode()
{
return func.GetHashCode() * 31 + Number.FloatToIntBits(Boost);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/FunctionValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionValues.cs b/src/Lucene.Net.Queries/Function/FunctionValues.cs
index 550f856..4ead9c8 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -25,9 +25,7 @@ namespace Lucene.Net.Queries.Function
/// <summary>
/// Represents field values as different types.
- /// Normally created via a <seealso cref="ValueSource"/> for a particular field and reader.
- ///
- ///
+ /// Normally created via a <see cref="ValueSource"/> for a particular field and reader.
/// </summary>
// FunctionValues is distinct from ValueSource because
@@ -94,7 +92,7 @@ namespace Lucene.Net.Queries.Function
}
/// <summary>
- /// Native Object representation of the value </summary>
+ /// Native <see cref="object"/> representation of the value </summary>
public virtual object ObjectVal(int doc)
{
// most FunctionValues are functions, so by default return a Float()
@@ -102,7 +100,7 @@ namespace Lucene.Net.Queries.Function
}
/// <summary>
- /// Returns true if there is a value for this document </summary>
+ /// Returns <c>true</c> if there is a value for this document </summary>
public virtual bool Exists(int doc)
{
return true;
@@ -126,20 +124,20 @@ namespace Lucene.Net.Queries.Function
/// <summary>
/// Abstraction of the logic required to fill the value of a specified doc into
- /// a reusable <seealso cref="MutableValue"/>. Implementations of <seealso cref="FunctionValues"/>
- /// are encouraged to define their own implementations of ValueFiller if their
- /// value is not a float.
+ /// a reusable <see cref="MutableValue"/>. Implementations of <see cref="FunctionValues"/>
+ /// are encouraged to define their own implementations of <see cref="ValueFiller"/> if their
+ /// value is not a <see cref="float"/>.
///
/// @lucene.experimental
/// </summary>
public abstract class ValueFiller
{
/// <summary>
- /// MutableValue will be reused across calls </summary>
+ /// <see cref="MutableValue"/> will be reused across calls </summary>
public abstract MutableValue Value { get; }
/// <summary>
- /// MutableValue will be reused across calls. Returns true if the value exists. </summary>
+ /// <see cref="MutableValue"/> will be reused across calls. Returns <c>true</c> if the value exists. </summary>
public abstract void FillValue(int doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSource.cs
index e76a288..25616b4 100644
--- a/src/Lucene.Net.Queries/Function/ValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSource.cs
@@ -24,17 +24,15 @@ namespace Lucene.Net.Queries.Function
*/
/// <summary>
- /// Instantiates <seealso cref="FunctionValues"/> for a particular reader.
- /// <br>
- /// Often used when creating a <seealso cref="FunctionQuery"/>.
- ///
- ///
+ /// Instantiates <see cref="FunctionValues"/> for a particular reader.
+ /// <para/>
+ /// Often used when creating a <see cref="FunctionQuery"/>.
/// </summary>
public abstract class ValueSource
{
/// <summary>
/// Gets the values for this reader and the context that was previously
- /// passed to CreateWeight()
+ /// passed to <see cref="CreateWeight"/>
/// </summary>
public abstract FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext);
@@ -43,7 +41,7 @@ namespace Lucene.Net.Queries.Function
public override abstract int GetHashCode();
/// <summary>
- /// description of field, used in explain()
+ /// description of field, used in Explain()
/// </summary>
public abstract string GetDescription();
@@ -79,14 +77,12 @@ namespace Lucene.Net.Queries.Function
/// <summary>
/// EXPERIMENTAL: This method is subject to change.
- /// <para>
- /// Get the SortField for this ValueSource. Uses the <seealso cref="#GetValues(java.util.Map, AtomicReaderContext)"/>
- /// to populate the SortField.
- ///
- /// </para>
+ /// <para/>
+ /// Get the <see cref="SortField"/> for this <see cref="ValueSource"/>. Uses the <see cref="GetValues(IDictionary, AtomicReaderContext)"/>
+ /// to populate the <see cref="SortField"/>.
/// </summary>
- /// <param name="reverse"> true if this is a reverse sort. </param>
- /// <returns> The <seealso cref="org.apache.lucene.search.SortField"/> for the ValueSource </returns>
+ /// <param name="reverse"> <c>true</c> if this is a reverse sort. </param>
+ /// <returns> The <see cref="SortField"/> for the <see cref="ValueSource"/> </returns>
public virtual SortField GetSortField(bool reverse)
{
return new ValueSourceSortField(this, reverse);
@@ -129,9 +125,9 @@ namespace Lucene.Net.Queries.Function
}
/// <summary>
- /// Implement a <seealso cref="org.apache.lucene.search.FieldComparer"/> that works
- /// off of the <seealso cref="FunctionValues"/> for a ValueSource
- /// instead of the normal Lucene FieldComparer that works off of a FieldCache.
+ /// Implement a <see cref="FieldComparer"/> that works
+ /// off of the <see cref="FunctionValues"/> for a <see cref="ValueSource"/>
+ /// instead of the normal Lucene <see cref="FieldComparer"/> that works off of a <see cref="FieldCache"/>.
/// </summary>
internal class ValueSourceComparer : FieldComparer<double?>
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 59ef2f9..cd2f0a7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Queries.Function
*/
/// <summary>
- /// <seealso cref="Scorer"/> which returns the result of <seealso cref="FunctionValues#FloatVal(int)"/> as
+ /// <see cref="Scorer"/> which returns the result of <see cref="FunctionValues.FloatVal(int)"/> as
/// the score for a document.
/// </summary>
public class ValueSourceScorer : Scorer
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/BoolFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/BoolFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/BoolFunction.cs
index 73390b9..3470fb3 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/BoolFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/BoolFunction.cs
@@ -18,7 +18,7 @@
*/
/// <summary>
- /// Abstract parent class for those <seealso cref="ValueSource"/> implementations which
+ /// Abstract parent class for those <see cref="ValueSource"/> implementations which
/// apply boolean logic to their values
/// </summary>
public abstract class BoolFunction : ValueSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 6623c41..b040454 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
@@ -23,16 +23,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains int field values from the <seealso cref="org.apache.lucene.search.FieldCache"/>
- /// using <code>getInts()</code>
+ /// Obtains <see cref="int"/> field values from the <see cref="Search.FieldCache"/>
+ /// using <see cref="IFieldCache.GetInts"/>
/// and makes those values available as other numeric types, casting as needed. *
- ///
- ///
/// </summary>
[Obsolete]
public class ByteFieldSource : FieldCacheSource
{
-
private readonly FieldCache.IByteParser parser;
public ByteFieldSource(string field)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 dc10900..2e137c9 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// An implementation for retrieving <seealso cref="FunctionValues"/> instances for str based fields.
+ /// An implementation for retrieving <see cref="FunctionValues"/> instances for <see cref="string"/> based fields.
/// </summary>
public class BytesRefFieldSource : FieldCacheSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs
index 5445296..90edc0a 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs
@@ -18,7 +18,7 @@
*/
/// <summary>
- /// <code>ConstNumberSource</code> is the base class for all constant numbers
+ /// <see cref="ConstNumberSource"/> is the base class for all constant numbers
/// </summary>
public abstract class ConstNumberSource : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs
index 507f14a..1aee2db 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>ConstValueSource</code> returns a constant for all documents
+ /// <see cref="ConstValueSource"/> returns a constant for all documents
/// </summary>
public class ConstValueSource : ConstNumberSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 05ed020..9f3aba2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -24,9 +24,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <seealso cref="ValueSource"/> implementation which only returns the values from the provided
- /// ValueSources which are available for a particular docId. Consequently, when combined
- /// with a <seealso cref="ConstValueSource"/>, this function serves as a way to return a default
+ /// <see cref="ValueSource"/> implementation which only returns the values from the provided
+ /// <see cref="ValueSource"/>s which are available for a particular docId. Consequently, when combined
+ /// with a <see cref="ConstValueSource"/>, this function serves as a way to return a default
/// value when the values for a field are unavailable.
/// </summary>
public class DefFunction : MultiFunction
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 acd6036..fd29bf4 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
@@ -118,7 +118,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// <summary>
- /// <code>DocFreqValueSource</code> returns the number of documents containing the term.
+ /// <see cref="DocFreqValueSource"/> returns the number of documents containing the term.
/// @lucene.internal
/// </summary>
public class DocFreqValueSource : ValueSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 54e70f8..c986142 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains double field values from <seealso cref="IFieldCache#getDoubles"/> and makes
+ /// Obtains <see cref="double"/> field values from <see cref="IFieldCache.GetDoubles"/> and makes
/// those values available as other numeric types, casting as needed.
/// </summary>
public class DoubleFieldSource : FieldCacheSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 feec489..0b46252 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
@@ -23,9 +23,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Abstract <seealso cref="ValueSource"/> implementation which wraps two ValueSources
- /// and applies an extendible float function to their values.
- ///
+ /// Abstract <see cref="ValueSource"/> implementation which wraps two <see cref="ValueSource"/>s
+ /// and applies an extendible <see cref="float"/> function to their values.
/// </summary>
public abstract class DualFloatFunction : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 2bec9d4..4e4f32b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -28,9 +28,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains int field values from <seealso cref="IFieldCache#getInts"/> and makes
+ /// Obtains <see cref="int"/> field values from <see cref="IFieldCache.GetInts"/> and makes
/// those values available as other numeric types, casting as needed.
- /// StrVal of the value is not the int value, but its str (displayed) value
+ /// StrVal of the value is not the <see cref="int"/> value, but its <see cref="string"/> (displayed) value
/// </summary>
public class EnumFieldSource : FieldCacheSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 09efeff..cc05c64 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
@@ -20,10 +20,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// A base class for ValueSource implementations that retrieve values for
- /// a single field from the <seealso cref="org.apache.lucene.search.FieldCache"/>.
- ///
- ///
+ /// A base class for <see cref="ValueSource"/> implementations that retrieve values for
+ /// a single field from the <see cref="Search.FieldCache"/>.
/// </summary>
public abstract class FieldCacheSource : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 43ffeac..5143b5c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains float field values from <seealso cref="IFieldCache#getFloats"/> and makes those
+ /// Obtains <see cref="float"/> field values from <see cref="IFieldCache.GetFloats"/> and makes those
/// values available as other numeric types, casting as needed.
/// </summary>
public class FloatFieldSource : FieldCacheSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 0b14ff5..699f191 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
@@ -25,13 +25,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Function that returns <seealso cref="TFIDFSimilarity #idf(long, long)"/>
+ /// Function that returns <see cref="TFIDFSimilarity.Idf(long, long)"/>
/// for every document.
- /// <para>
+ /// <para/>
/// Note that the configured Similarity for the field must be
- /// a subclass of <seealso cref="TFIDFSimilarity"/>
+ /// a subclass of <see cref="TFIDFSimilarity"/>
/// @lucene.internal
- /// </para>
/// </summary>
[ExceptionToClassNameConvention]
public class IDFValueSource : DocFreqValueSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
index e748b83..621449f 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -23,8 +23,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Depending on the boolean value of the <code>ifSource</code> function,
- /// returns the value of the <code>trueSource</code> or <code>falseSource</code> function.
+ /// Depending on the <see cref="bool"/> value of the <paramref name="ifSource"/> function,
+ /// returns the value of the <paramref name="trueSource"/> or <paramref name="falseSource"/> function.
/// </summary>
public class IfFunction : BoolFunction
{
@@ -32,7 +32,6 @@ namespace Lucene.Net.Queries.Function.ValueSources
private readonly ValueSource trueSource;
private readonly ValueSource falseSource;
-
public IfFunction(ValueSource ifSource, ValueSource trueSource, ValueSource falseSource)
{
this.ifSource = ifSource;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 dc2a634..5d13611 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains int field values from <seealso cref="FieldCache#getInts"/> and makes those
+ /// Obtains <see cref="int"/> field values from <see cref="IFieldCache.GetInts"/> and makes those
/// values available as other numeric types, casting as needed.
/// </summary>
public class IntFieldSource : FieldCacheSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 bcc115c..d7cf53f 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
@@ -24,12 +24,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>LinearFloatFunction</code> implements a linear function over
- /// another <seealso cref="ValueSource"/>.
- /// <br>
- /// Normally Used as an argument to a <seealso cref="FunctionQuery"/>
- ///
- ///
+ /// <see cref="LinearFloatFunction"/> implements a linear function over
+ /// another <see cref="ValueSource"/>.
+ /// <para/>
+ /// Normally Used as an argument to a <see cref="FunctionQuery"/>
/// </summary>
public class LinearFloatFunction : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 f640c45..f6ca6ff 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
@@ -23,9 +23,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Pass a the field value through as a String, no matter the type // Q: doesn't this mean it's a "str"?
- ///
- ///
+ /// Pass a the field value through as a <see cref="string"/>, no matter the type // Q: doesn't this mean it's a "str"?
/// </summary>
public class LiteralValueSource : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 7f5e349..d13862a 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains long field values from <seealso cref="FieldCache#getLongs"/> and makes those
+ /// Obtains <see cref="long"/> field values from <see cref="IFieldCache.GetLongs"/> and makes those
/// values available as other numeric types, casting as needed.
/// </summary>
public class LongFieldSource : FieldCacheSource
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs
index 3439686..f231997 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Returns the value of <seealso cref="IndexReader#maxDoc()"/>
+ /// Returns the value of <see cref="IndexReader.MaxDoc"/>
/// for every document. This is the number of documents
/// including deletions.
/// </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
index 97affed..7e8913e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>MaxFloatFunction</code> returns the max of it's components.
+ /// <see cref="MaxFloatFunction"/> returns the max of it's components.
/// </summary>
public class MaxFloatFunction : MultiFloatFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
index daff8b1..ca5cf7b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>MinFloatFunction</code> returns the min of it's components.
+ /// <see cref="MinFloatFunction"/> returns the min of it's components.
/// </summary>
public class MinFloatFunction : MultiFloatFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 80e734c..ad1caec 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
@@ -25,9 +25,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Abstract <seealso cref="ValueSource"/> implementation which wraps multiple ValueSources
- /// and applies an extendible boolean function to their values.
- ///
+ /// Abstract <see cref="ValueSource"/> implementation which wraps multiple <see cref="ValueSource"/>s
+ /// and applies an extendible <see cref="bool"/> function to their values.
/// </summary>
public abstract class MultiBoolFunction : BoolFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 1e0a189..c3bd1c8 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
@@ -25,9 +25,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Abstract <seealso cref="ValueSource"/> implementation which wraps multiple ValueSources
- /// and applies an extendible float function to their values.
- ///
+ /// Abstract <see cref="ValueSource"/> implementation which wraps multiple <see cref="ValueSource"/>s
+ /// and applies an extendible <see cref="float"/> function to their values.
/// </summary>
public abstract class MultiFloatFunction : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 0769519..23d909a 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
@@ -22,10 +22,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/// <summary>
- /// Abstract parent class for <seealso cref="ValueSource"/> implementations that wrap multiple
- /// ValueSources and apply their own logic.
+ /// Abstract parent class for <see cref="ValueSource"/> implementations that wrap multiple
+ /// <see cref="ValueSource"/>s and apply their own logic.
/// </summary>
public abstract class MultiFunction : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs
index fe59cf9..48c440b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs
@@ -18,9 +18,8 @@
*/
/// <summary>
- /// A <seealso cref="ValueSource"/> that abstractly represents <seealso cref="ValueSource"/>s for
+ /// A <see cref="ValueSource"/> that abstractly represents <see cref="ValueSource"/>s for
/// poly fields, and other things.
- ///
/// </summary>
public abstract class MultiValueSource : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 79794cd..a6fcd89 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
@@ -24,13 +24,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Function that returns <seealso cref="TFIDFSimilarity#decodeNormValue(long)"/>
+ /// Function that returns <see cref="TFIDFSimilarity.DecodeNormValue(long)"/>
/// for every document.
- /// <para>
+ /// <para/>
/// Note that the configured Similarity for the field must be
- /// a subclass of <seealso cref="TFIDFSimilarity"/>
+ /// a subclass of <see cref="TFIDFSimilarity"/>
/// @lucene.internal
- /// </para>
/// </summary>
public class NormValueSource : ValueSource
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs
index 86b77a5..f0d6531 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Returns the value of <seealso cref="IndexReader#numDocs()"/>
+ /// Returns the value of <see cref="IndexReader.NumDocs"/>
/// for every document. This is the number of documents
/// excluding deletions.
/// </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/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 27cc836..cb016d7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -24,24 +24,25 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// Obtains the ordinal of the field value from the default Lucene <seealso cref="FieldCache"/> using getStringIndex().
- /// <br>
+ /// Obtains the ordinal of the field value from the default Lucene <see cref="FieldCache"/> using StringIndex.
+ /// <para/>
/// The native lucene index order is used to assign an ordinal value for each field value.
- /// <br>Field values (terms) are lexicographically ordered by unicode value, and numbered starting at 1.
- /// <br>
- /// Example:<br>
- /// If there were only three field values: "apple","banana","pear"
- /// <br>then ord("apple")=1, ord("banana")=2, ord("pear")=3
- /// <para>
- /// WARNING: ord() depends on the position in an index and can thus change when other documents are inserted or deleted,
- /// or if a MultiSearcher is used.
- /// <br>WARNING: as of Solr 1.4, ord() and rord() can cause excess memory use since they must use a FieldCache entry
+ /// <para/>
+ /// Field values (terms) are lexicographically ordered by unicode value, and numbered starting at 1.
+ /// <para/>
+ /// Example:
+ /// <code>
+ /// If there were only three field values: "apple","banana","pear"
+ /// then ord("apple")=1, ord("banana")=2, ord("pear")=3
+ /// </code>
+ /// <para/>
+ /// WARNING: Ord depends on the position in an index and can thus change when other documents are inserted or deleted,
+ /// or if a MultiSearcher is used.
+ /// <para/>
+ /// WARNING: as of Solr 1.4, ord() and rord() can cause excess memory use since they must use a FieldCache entry
/// at the top level reader, while sorting and function queries now use entries at the segment level. Hence sorting
/// or using a different function query, in addition to ord()/rord() will double memory use.
- ///
- /// </para>
/// </summary>
-
public class OrdFieldSource : ValueSource
{
protected readonly string m_field;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
index b922228..87673f9 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>ProductFloatFunction</code> returns the product of it's components.
+ /// <see cref="ProductFloatFunction"/> returns the product of it's components.
/// </summary>
public class ProductFloatFunction : MultiFloatFunction
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4438d239/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
index 9da8e20..833f72d 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
*/
/// <summary>
- /// <code>QueryValueSource</code> returns the relevance score of the query
+ /// <see cref="QueryValueSource"/> returns the relevance score of the query
/// </summary>
public class QueryValueSource : ValueSource
{
[06/22] lucenenet git commit:
Lucene.Net.Grouping.Function.FunctionValues refactor: Renamed class
AbstractValueFiller > ValueFiller
Posted by ni...@apache.org.
Lucene.Net.Grouping.Function.FunctionValues refactor: Renamed class AbstractValueFiller > ValueFiller
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d0f7e402
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d0f7e402
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d0f7e402
Branch: refs/heads/api-work
Commit: d0f7e402908e6113e97ab1640358c42e2d36f1f9
Parents: dffc898
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:55:24 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:55:24 2017 +0700
----------------------------------------------------------------------
.../Function/FunctionAllGroupHeadsCollector.cs | 2 +-
src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs | 2 +-
.../Function/FunctionDistinctValuesCollector.cs | 4 ++--
.../Function/FunctionFirstPassGroupingCollector.cs | 2 +-
.../Function/FunctionSecondPassGroupingCollector.cs | 2 +-
src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs | 4 ++--
.../Function/DocValues/DocTermsIndexDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/FunctionValues.cs | 6 +++---
src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs | 2 +-
.../Function/ValueSources/DoubleFieldSource.cs | 4 ++--
.../Function/ValueSources/EnumFieldSource.cs | 4 ++--
.../Function/ValueSources/FloatFieldSource.cs | 4 ++--
src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs | 2 +-
src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs | 4 ++--
.../Function/ValueSources/LongFieldSource.cs | 4 ++--
src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs | 4 ++--
.../Function/ValueSources/QueryValueSource.cs | 4 ++--
22 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
index c8a42be..5c6804b 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search.Grouping.Function
private readonly IDictionary<MutableValue, GroupHead> groups;
private readonly Sort sortWithinGroup;
- private FunctionValues.AbstractValueFiller filler;
+ private FunctionValues.ValueFiller filler;
private MutableValue mval;
private AtomicReaderContext readerContext;
private Scorer scorer;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
index 0381eeb..44f4cad 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search.Grouping.Function
private readonly ValueSource groupBy;
private readonly SortedSet<MutableValue> groups = new SortedSet<MutableValue>();
- private FunctionValues.AbstractValueFiller filler;
+ private FunctionValues.ValueFiller filler;
private MutableValue mval;
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
index f1f0e5c..3e17ce5 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
@@ -36,8 +36,8 @@ namespace Lucene.Net.Search.Grouping.Function
private readonly ValueSource countSource;
private readonly IDictionary<MutableValue, GroupCount> groupMap;
- private FunctionValues.AbstractValueFiller groupFiller;
- private FunctionValues.AbstractValueFiller countFiller;
+ private FunctionValues.ValueFiller groupFiller;
+ private FunctionValues.ValueFiller countFiller;
private MutableValue groupMval;
private MutableValue countMval;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
index 20441f7..224db45 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Search.Grouping.Function
private readonly ValueSource groupByVS;
private readonly IDictionary /* Map<?, ?> */ vsContext;
- private FunctionValues.AbstractValueFiller filler;
+ private FunctionValues.ValueFiller filler;
private MutableValue mval;
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
index be66fe4..b4982ae 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.Search.Grouping.Function
private readonly ValueSource groupByVS;
private readonly IDictionary /* Map<?, ?> */ vsContext;
- private FunctionValues.AbstractValueFiller filler;
+ private FunctionValues.ValueFiller filler;
private MutableValue mval;
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 c64c7be..22c5231 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -80,12 +80,12 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + '=' + StrVal(doc);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly BoolDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 9583dd3..2e98a64 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
@@ -156,12 +156,12 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + '=' + StrVal(doc);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly DocTermsIndexDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 245e8af..1f5f674 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -213,12 +213,12 @@ namespace Lucene.Net.Queries.Function.DocValues
}
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly DoubleDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 a587453..76b6471 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -75,12 +75,12 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + '=' + StrVal(doc);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly FloatDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 4c46547..8107155 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -138,12 +138,12 @@ namespace Lucene.Net.Queries.Function.DocValues
}
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly IntDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 9d4edbe..4fd8a32 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -148,12 +148,12 @@ namespace Lucene.Net.Queries.Function.DocValues
}
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly LongDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 7258ea5..0d1418d 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
@@ -49,12 +49,12 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + "='" + StrVal(doc) + "'";
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly StrDocValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Queries/Function/FunctionValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionValues.cs b/src/Lucene.Net.Queries/Function/FunctionValues.cs
index e7b4446..bbecbc4 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -132,7 +132,7 @@ namespace Lucene.Net.Queries.Function
///
/// @lucene.experimental
/// </summary>
- public abstract class AbstractValueFiller // LUCENENET TODO: Rename ValueFiller (after renaming property ValueFiller)
+ public abstract class ValueFiller
{
/// <summary>
/// MutableValue will be reused across calls </summary>
@@ -145,12 +145,12 @@ namespace Lucene.Net.Queries.Function
/// <summary>
/// @lucene.experimental </summary>
- public virtual AbstractValueFiller GetValueFiller()
+ public virtual ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly FunctionValues outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 20dc76c..139b65a 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return valsArr.Any(vals => vals.Exists(doc));
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
// TODO: need ValueSource.type() to determine correct type
return base.GetValueFiller();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 ecdec6e..ed78163 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
@@ -77,12 +77,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
return arr.Get(doc) != 0 || valid.Get(doc);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly DoubleDocValuesAnonymousInnerClassHelper outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 02f91bc..3b28473 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -241,12 +241,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly IntDocValuesAnonymousInnerClassHelper outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 2cb9171..26844c1 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -83,12 +83,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
return arr.Get(doc) != 0 || valid.Get(doc);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly FloatDocValuesAnonymousInnerClassHelper outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
index a17c6d2..3d19eb2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return true; // TODO: flow through to any sub-sources?
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
// TODO: we need types of trueSource / falseSource to handle this
// for now, use float.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 0dbe02e..d54ed49 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -115,12 +115,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
return outerInstance.GetDescription() + '=' + IntVal(doc);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly IntDocValuesAnonymousInnerClassHelper outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 1f3efb3..eceeb41 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -111,12 +111,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
return outerInstance.ExternalToLong(extVal);
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly LongDocValuesAnonymousInnerClassHelper outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/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 9be4993..ae45334 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -104,12 +104,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
return sindex.GetOrd(doc + off) != 0;
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly IntDocValuesAnonymousInnerClassHelper outerInstance;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0f7e402/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
index 4f4feda..9da8e20 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
@@ -233,7 +233,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override AbstractValueFiller GetValueFiller()
+ public override ValueFiller GetValueFiller()
{
//
// TODO: if we want to support more than one value-filler or a value-filler in conjunction with
@@ -243,7 +243,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return new ValueFillerAnonymousInnerClassHelper(this);
}
- private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
+ private class ValueFillerAnonymousInnerClassHelper : ValueFiller
{
private readonly QueryDocValues outerInstance;
[12/22] lucenenet git commit: Lucene.Net.Tests.Queries: added API
consistency tests
Posted by ni...@apache.org.
Lucene.Net.Tests.Queries: added API consistency tests
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2ba32521
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2ba32521
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2ba32521
Branch: refs/heads/api-work
Commit: 2ba32521f0c0a4426f0c3e48dffd5cd441b9b95d
Parents: ee734c7
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 09:14:00 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 09:14:00 2017 +0700
----------------------------------------------------------------------
.../Lucene.Net.Tests.Queries.csproj | 1 +
.../TestApiConsistency.cs | 108 +++++++++++++++++++
2 files changed, 109 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ba32521/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
index afb5db7..2848055 100644
--- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
+++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
@@ -55,6 +55,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TermFilterTest.cs" />
<Compile Include="TermsFilterTest.cs" />
+ <Compile Include="TestApiConsistency.cs" />
<Compile Include="TestCustomScoreQuery.cs" />
</ItemGroup>
<ItemGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2ba32521/src/Lucene.Net.Tests.Queries/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TestApiConsistency.cs b/src/Lucene.Net.Tests.Queries/TestApiConsistency.cs
new file mode 100644
index 0000000..fafa08b
--- /dev/null
+++ b/src/Lucene.Net.Tests.Queries/TestApiConsistency.cs
@@ -0,0 +1,108 @@
+\ufeffusing Lucene.Net.Attributes;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Lucene.Net.Tests.Queries
+{
+ /// <summary>
+ /// LUCENENET specific tests for ensuring API conventions are followed
+ /// </summary>
+ public class TestApiConsistency : ApiScanTestBase
+ {
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestProtectedFieldNames(Type typeFromTargetAssembly)
+ {
+ base.TestProtectedFieldNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestPrivateFieldNames(Type typeFromTargetAssembly)
+ {
+ base.TestPrivateFieldNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestPublicFields(Type typeFromTargetAssembly)
+ {
+ base.TestPublicFields(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestMethodParameterNames(Type typeFromTargetAssembly)
+ {
+ base.TestMethodParameterNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestInterfaceNames(Type typeFromTargetAssembly)
+ {
+ base.TestInterfaceNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestClassNames(Type typeFromTargetAssembly)
+ {
+ base.TestClassNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForPropertiesWithNoGetter(Type typeFromTargetAssembly)
+ {
+ base.TestForPropertiesWithNoGetter(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForPropertiesThatReturnArray(Type typeFromTargetAssembly)
+ {
+ base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
+ {
+ base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForPublicMembersContainingComparer(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersContainingComparer(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForPublicMembersNamedSize(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersNamedSize(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForPublicMembersContainingNonNetNumeric(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersContainingNonNetNumeric(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
+ public override void TestForPublicMembersWithNullableEnum(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersWithNullableEnum(typeFromTargetAssembly);
+ }
+ }
+}
[22/22] lucenenet git commit: Lucene.Net.Queries: added TODO about
changing List to IList
Posted by ni...@apache.org.
Lucene.Net.Queries: added TODO about changing List<T> to IList<T>
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/28604030
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/28604030
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/28604030
Branch: refs/heads/api-work
Commit: 2860403008cbf5e1a2048ca206b73c1ee88ccc8c
Parents: 4438d23
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 17:14:46 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 17:14:46 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/TermsFilter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/28604030/src/Lucene.Net.Queries/TermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index 73a2611..8f9e17b 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -94,7 +94,7 @@ namespace Lucene.Net.Queries
/// Creates a new <see cref="TermsFilter"/> from the given <see cref="BytesRef"/> list for
/// a single field.
/// </summary>
- public TermsFilter(string field, List<BytesRef> terms)
+ public TermsFilter(string field, List<BytesRef> terms) // LUCENENET TODO: Change to IList<BytesRef>
: this(new FieldAndTermEnumAnonymousInnerClassHelper2(field, terms), terms.Count)
{
}
[03/22] lucenenet git commit: Lucene.Net.Queries.CustomScoreQuery
refactor: Strict > IsStrict
Posted by ni...@apache.org.
Lucene.Net.Queries.CustomScoreQuery refactor: Strict > IsStrict
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/fd254c84
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/fd254c84
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/fd254c84
Branch: refs/heads/api-work
Commit: fd254c8480ebb5691349d4f5c18b055dea65b44f
Parents: 5fd4150
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:34:55 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:34:55 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/CustomScoreQuery.cs | 2 +-
src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fd254c84/src/Lucene.Net.Queries/CustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CustomScoreQuery.cs b/src/Lucene.Net.Queries/CustomScoreQuery.cs
index 26b4a02..461d258 100644
--- a/src/Lucene.Net.Queries/CustomScoreQuery.cs
+++ b/src/Lucene.Net.Queries/CustomScoreQuery.cs
@@ -408,7 +408,7 @@ namespace Lucene.Net.Queries
/// <P>
/// Note: only has effect when the <seealso cref="ValueSource"/> part is not null.
/// </summary>
- public virtual bool Strict { get; set; } // LUCENENET TODO: Rename IsStrict
+ public virtual bool IsStrict { get; set; }
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fd254c84/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
index e18a41f..2971df9 100644
--- a/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
+++ b/src/Lucene.Net.Tests.Queries/TestCustomScoreQuery.cs
@@ -287,19 +287,19 @@ namespace Lucene.Net.Tests.Queries
// custom query, that should (by default) multiply the scores of q1 by that of the field
CustomScoreQuery q3CustomMul = new CustomScoreQuery(q1, functionQuery);
- q3CustomMul.Strict = true;
+ q3CustomMul.IsStrict = true;
q3CustomMul.Boost = boost;
Log(q3CustomMul);
// custom query, that should add the scores of q1 to that of the field
CustomScoreQuery q4CustomAdd = new CustomAddQuery(q1, functionQuery);
- q4CustomAdd.Strict = true;
+ q4CustomAdd.IsStrict = true;
q4CustomAdd.Boost = boost;
Log(q4CustomAdd);
// custom query, that multiplies and adds the field score to that of q1
CustomScoreQuery q5CustomMulAdd = new CustomMulAddQuery(q1, functionQuery, functionQuery);
- q5CustomMulAdd.Strict = true;
+ q5CustomMulAdd.IsStrict = true;
q5CustomMulAdd.Boost = boost;
Log(q5CustomMulAdd);
[13/22] lucenenet git commit:
Lucene.Net.Queries.Function.ValueSources.IDFValueSource: added
ExceptionToClassNameConvention attribute
Posted by ni...@apache.org.
Lucene.Net.Queries.Function.ValueSources.IDFValueSource: added ExceptionToClassNameConvention attribute
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0d8a7ed7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0d8a7ed7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0d8a7ed7
Branch: refs/heads/api-work
Commit: 0d8a7ed7c3fd28bb9c8de7b40b7362f841be15ab
Parents: 2ba3252
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 09:16:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 09:16:17 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0d8a7ed7/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 21df491..dd1ccc2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
@@ -1,6 +1,7 @@
\ufeffusing Lucene.Net.Index;
using Lucene.Net.Search;
using Lucene.Net.Search.Similarities;
+using Lucene.Net.Support;
using Lucene.Net.Util;
using System.Collections;
@@ -32,6 +33,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
/// @lucene.internal
/// </para>
/// </summary>
+ [ExceptionToClassNameConvention]
public class IDFValueSource : DocFreqValueSource
{
public IDFValueSource(string field, string val, string indexedField, BytesRef indexedBytes)
[02/22] lucenenet git commit: Lucene.Net.Queries.CommonTermsQuery
refactor: CoordDisabled > IsCoordDisabled
Posted by ni...@apache.org.
Lucene.Net.Queries.CommonTermsQuery refactor: CoordDisabled > IsCoordDisabled
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5fd41505
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5fd41505
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5fd41505
Branch: refs/heads/api-work
Commit: 5fd41505aee8d086f371d68deb9a5025b3ddc802
Parents: f94ecf7
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:34:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:34:26 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/CommonTermsQuery.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5fd41505/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index e0429ac..01e33fc 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -295,7 +295,7 @@ namespace Lucene.Net.Queries
/// for the high and low frequency query instance. The top level query will
/// always disable coords.
/// </summary>
- public virtual bool CoordDisabled // LUCENENET TODO: Rename IsCoordDisabled
+ public virtual bool IsCoordDisabled
{
get
{
[17/22] lucenenet git commit: Lucene.Net.Queries refactor: Changed
sbyte > byte for CLS compliance
Posted by ni...@apache.org.
Lucene.Net.Queries refactor: Changed sbyte > byte for CLS compliance
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3a686b51
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3a686b51
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3a686b51
Branch: refs/heads/api-work
Commit: 3a686b5163fca9727b0855a3bf4f2f13d9696b44
Parents: d60b93d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 10:09:19 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 10:09:19 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/FunctionValues.cs | 4 ++--
src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs | 4 ++--
src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs | 2 +-
src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs | 2 +-
src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs | 4 ++--
.../Function/ValueSources/VectorValueSource.cs | 4 ++--
11 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 55b01a7..417f8ee 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -35,9 +35,9 @@ namespace Lucene.Net.Queries.Function.DocValues
public override abstract bool BoolVal(int doc);
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return BoolVal(doc) ? (sbyte)1 : (sbyte)0;
+ return BoolVal(doc) ? (byte)1 : (byte)0;
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 f457267..3468b64 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -34,9 +34,9 @@ namespace Lucene.Net.Queries.Function.DocValues
this.m_vs = vs;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return (sbyte)DoubleVal(doc);
+ return (byte)DoubleVal(doc);
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 8417433..561240f 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -33,9 +33,9 @@ namespace Lucene.Net.Queries.Function.DocValues
this.m_vs = vs;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return (sbyte)FloatVal(doc);
+ return (byte)FloatVal(doc);
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 7091e9b..60a24ef 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -34,9 +34,9 @@ namespace Lucene.Net.Queries.Function.DocValues
this.m_vs = vs;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return (sbyte)IntVal(doc);
+ return (byte)IntVal(doc);
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 f5fa22c..8fecaff 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -34,9 +34,9 @@ namespace Lucene.Net.Queries.Function.DocValues
this.m_vs = vs;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return (sbyte)LongVal(doc);
+ return (byte)LongVal(doc);
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/src/Lucene.Net.Queries/Function/FunctionValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionValues.cs b/src/Lucene.Net.Queries/Function/FunctionValues.cs
index bbecbc4..550f856 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Queries.Function
// want the Query carrying around big objects
public abstract class FunctionValues
{
- public virtual sbyte ByteVal(int doc)
+ public virtual byte ByteVal(int doc)
{
throw new System.NotSupportedException();
}
@@ -174,7 +174,7 @@ namespace Lucene.Net.Queries.Function
}
//For Functions that can work with multiple values from the same document. This does not apply to all functions
- public virtual void ByteVal(int doc, sbyte[] vals)
+ public virtual void ByteVal(int doc, byte[] vals)
{
throw new System.NotSupportedException();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 b175070..6623c41 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
@@ -69,9 +69,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.arr = arr;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return arr.Get(doc);
+ return (byte)arr.Get(doc);
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/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 3917d14..05ed020 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
return valsArr[upto];
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
return Get(doc).ByteVal(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
index 3d19eb2..e748b83 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.falseVals = falseVals;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
return ifVals.BoolVal(doc) ? trueVals.ByteVal(doc) : falseVals.ByteVal(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
index 6398604..f590948 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
@@ -66,9 +66,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.arr = arr;
}
- public override sbyte ByteVal(int doc)
+ public override byte ByteVal(int doc)
{
- return (sbyte)arr.Get(doc);
+ return (byte)arr.Get(doc);
}
public override short ShortVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3a686b51/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
index d8a6911..31706cf 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
@@ -90,7 +90,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.y = y;
}
- public override void ByteVal(int doc, sbyte[] vals)
+ public override void ByteVal(int doc, byte[] vals)
{
vals[0] = x.ByteVal(doc);
vals[1] = y.ByteVal(doc);
@@ -143,7 +143,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.valsArr = valsArr;
}
- public override void ByteVal(int doc, sbyte[] vals)
+ public override void ByteVal(int doc, byte[] vals)
{
for (int i = 0; i < valsArr.Length; i++)
{
[08/22] lucenenet git commit:
Lucene.Net.Queries.Function.ValueSourceScorer refactor: CheckDeletes (setter
only) > SetCheckDeletes(bool)
Posted by ni...@apache.org.
Lucene.Net.Queries.Function.ValueSourceScorer refactor: CheckDeletes (setter only) > SetCheckDeletes(bool)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5d2ad90f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5d2ad90f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5d2ad90f
Branch: refs/heads/api-work
Commit: 5d2ad90f56bca7313f1f25c426cb0c931220bb7f
Parents: d11d4da
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 08:00:59 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 08:00:59 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Function/ValueSourceScorer.cs | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5d2ad90f/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 d7ad046..66bcf0b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSourceScorer.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Queries.Function
this.reader = reader;
this.maxDoc = reader.MaxDoc;
this.values = values;
- CheckDeletes = true;
+ SetCheckDeletes(true);
this.liveDocs = MultiFields.GetLiveDocs(reader);
}
@@ -52,12 +52,9 @@ namespace Lucene.Net.Queries.Function
}
}
- public virtual bool CheckDeletes // LUCENENET TODO: Change to SetCheckDeletes(bool checkDeletes) (has side-effect)
+ public virtual void SetCheckDeletes(bool checkDeletes)
{
- set
- {
- this.checkDeletes = value && reader.HasDeletions;
- }
+ this.checkDeletes = checkDeletes && reader.HasDeletions;
}
public virtual bool Matches(int doc)
[16/22] lucenenet git commit: Lucene.Net.Queries refactor: renamed
protected fields camelCase prefixed with m_
Posted by ni...@apache.org.
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
[05/22] lucenenet git commit:
Lucene.Net.Queries.Function.DocValues.DocTermsIndexDocValues refactor:
toTerm() > ToTerm(), NumOrd() > NumOrd (property)
Posted by ni...@apache.org.
Lucene.Net.Queries.Function.DocValues.DocTermsIndexDocValues refactor: toTerm() > ToTerm(), NumOrd() > NumOrd (property)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a1e84947
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a1e84947
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a1e84947
Branch: refs/heads/api-work
Commit: a1e84947b0ccb2933a32042138b82999f43dd540
Parents: fd254c8
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:38:45 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:47:12 2017 +0700
----------------------------------------------------------------------
.../Function/DocValues/DocTermsIndexDocValues.cs | 10 +++++-----
src/Lucene.Net.Queries/Function/FunctionValues.cs | 4 ++--
.../Function/ValueSources/BytesRefFieldSource.cs | 2 +-
.../Function/ValueSources/OrdFieldSource.cs | 4 ++--
.../Function/TestDocValuesFieldSources.cs | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a1e84947/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 4cf5e94..728f62b 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Queries.Function.DocValues
this.vs = vs;
}
- protected abstract string toTerm(string readableValue); // LUCENENET TODO: Rename ToTerm(string readableValue)
+ protected abstract string ToTerm(string readableValue);
public override bool Exists(int doc)
{
@@ -60,9 +60,9 @@ namespace Lucene.Net.Queries.Function.DocValues
return termsIndex.GetOrd(doc);
}
- public override int NumOrd() // LUCENENET TODO: Make property
+ public override int NumOrd
{
- return termsIndex.ValueCount;
+ get { return termsIndex.ValueCount; }
}
public override bool BytesVal(int doc, BytesRef target)
@@ -92,8 +92,8 @@ namespace Lucene.Net.Queries.Function.DocValues
public override ValueSourceScorer GetRangeScorer(IndexReader reader, string lowerVal, string upperVal, bool includeLower, bool includeUpper)
{
// TODO: are lowerVal and upperVal in indexed form or not?
- lowerVal = lowerVal == null ? null : toTerm(lowerVal);
- upperVal = upperVal == null ? null : toTerm(upperVal);
+ lowerVal = lowerVal == null ? null : ToTerm(lowerVal);
+ upperVal = upperVal == null ? null : ToTerm(upperVal);
int lower = int.MinValue;
if (lowerVal != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a1e84947/src/Lucene.Net.Queries/Function/FunctionValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionValues.cs b/src/Lucene.Net.Queries/Function/FunctionValues.cs
index b282657..a14ce75 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -117,9 +117,9 @@ namespace Lucene.Net.Queries.Function
}
/// <returns> the number of unique sort ordinals this instance has </returns>
- public virtual int NumOrd() // LUCENENET TODO: Make property ?
+ public virtual int NumOrd
{
- throw new System.NotSupportedException();
+ get { throw new System.NotSupportedException(); }
}
public abstract string ToString(int doc);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a1e84947/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 d796419..9199cd4 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/BytesRefFieldSource.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
- protected override string toTerm(string readableValue)
+ protected override string ToTerm(string readableValue)
{
return readableValue;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a1e84947/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 4867a00..035c3f3 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -94,9 +94,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return sindex.GetOrd(doc + off);
}
- public override int NumOrd()
+ public override int NumOrd
{
- return sindex.ValueCount;
+ get { return sindex.ValueCount; }
}
public override bool Exists(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a1e84947/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs b/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs
index 32fd58a..b8afb3f 100644
--- a/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs
@@ -113,7 +113,7 @@ namespace Lucene.Net.Tests.Queries.Function
{
case DocValuesType.SORTED:
values.OrdVal(i); // no exception
- assertTrue(values.NumOrd() >= 1);
+ assertTrue(values.NumOrd >= 1);
goto case DocValuesType.BINARY;
case DocValuesType.BINARY:
assertEquals(expected, values.ObjectVal(i));
[11/22] lucenenet git commit: Lucene.Net.Queries.Mlt.MoreLikeThis
refactor: Boost >ApplyBoost
Posted by ni...@apache.org.
Lucene.Net.Queries.Mlt.MoreLikeThis refactor: Boost >ApplyBoost
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ee734c71
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ee734c71
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ee734c71
Branch: refs/heads/api-work
Commit: ee734c71e5f08c1c6c2ec340243346ab565809d1
Parents: 62ea103
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 09:06:17 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 09:06:17 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 13 ++++++-------
src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ee734c71/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 4237302..9258ff3 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -252,7 +252,7 @@ namespace Lucene.Net.Queries.Mlt
MinTermFreq = DEFAULT_MIN_TERM_FREQ;
MinDocFreq = DEFAULT_MIN_DOC_FREQ;
MaxDocFreq = DEFAULT_MAX_DOC_FREQ;
- Boost = DEFAULT_BOOST;
+ ApplyBoost = DEFAULT_BOOST;
FieldNames = DEFAULT_FIELD_NAMES;
MaxNumTokensParsed = DEFAULT_MAX_NUM_TOKENS_PARSED;
MinWordLen = DEFAULT_MIN_WORD_LENGTH;
@@ -314,12 +314,11 @@ namespace Lucene.Net.Queries.Mlt
/// <summary>
- /// Returns whether to boost terms in query based on "score" or not. The default is
- /// <seealso cref="#DEFAULT_BOOST"/>.
+ /// Gets or Sets whether to boost terms in query based on "score" or not. The default is
+ /// <see cref="DEFAULT_BOOST"/>.
/// </summary>
/// <returns> whether to boost terms in query based on "score" or not. </returns>
- /// <seealso cref= #setBoost </seealso>
- public bool Boost { get; set; } // LUCENENET TODO: Rename ApplyBoost ? IsBoost seems a bit odd
+ public bool ApplyBoost { get; set; }
/// <summary>
@@ -412,7 +411,7 @@ namespace Lucene.Net.Queries.Mlt
var ar = (object[])cur;
var tq = new TermQuery(new Term((string)ar[1], (string)ar[0]));
- if (Boost)
+ if (ApplyBoost)
{
if (qterms == 0)
{
@@ -512,7 +511,7 @@ namespace Lucene.Net.Queries.Mlt
delim = ", ";
}
sb.Append("\n");
- sb.Append("\t").Append("boost : ").Append(Boost).Append("\n");
+ sb.Append("\t").Append("boost : ").Append(ApplyBoost).Append("\n");
sb.Append("\t").Append("minTermFreq : ").Append(MinTermFreq).Append("\n");
sb.Append("\t").Append("minDocFreq : ").Append(MinDocFreq).Append("\n");
return sb.ToString();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ee734c71/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
index bed7c26..665c324 100644
--- a/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
+++ b/src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
mlt.MinTermFreq = 1;
mlt.MinWordLen = 1;
mlt.FieldNames = new[] { "text" };
- mlt.Boost = true;
+ mlt.ApplyBoost = true;
// this mean that every term boost factor will be multiplied by this
// number
@@ -93,7 +93,7 @@ namespace Lucene.Net.Tests.Queries.Mlt
mlt.MinTermFreq = 1;
mlt.MinWordLen = 1;
mlt.FieldNames = new[] { "text" };
- mlt.Boost = true;
+ mlt.ApplyBoost = true;
BooleanQuery query = (BooleanQuery)mlt.Like(new StringReader("lucene release"), "text");
IList<BooleanClause> clauses = query.Clauses;
[04/22] lucenenet git commit:
Lucene.Net.Queries.Function.FunctionValues refactor: ValueFiller >
GetValueFiller()
Posted by ni...@apache.org.
Lucene.Net.Queries.Function.FunctionValues refactor: ValueFiller > GetValueFiller()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/dffc898c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/dffc898c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/dffc898c
Branch: refs/heads/api-work
Commit: dffc898c9ff40a60de585c397b828d5d8a370338
Parents: a1e8494
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sat Jan 28 07:46:03 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Sat Jan 28 07:47:12 2017 +0700
----------------------------------------------------------------------
.../Function/FunctionAllGroupHeadsCollector.cs | 2 +-
.../Function/FunctionAllGroupsCollector.cs | 2 +-
.../Function/FunctionDistinctValuesCollector.cs | 4 ++--
.../Function/FunctionFirstPassGroupingCollector.cs | 2 +-
.../FunctionSecondPassGroupingCollector.cs | 2 +-
.../Function/DocValues/BoolDocValues.cs | 7 ++-----
.../Function/DocValues/DocTermsIndexDocValues.cs | 7 ++-----
.../Function/DocValues/DoubleDocValues.cs | 7 ++-----
.../Function/DocValues/FloatDocValues.cs | 7 ++-----
.../Function/DocValues/IntDocValues.cs | 7 ++-----
.../Function/DocValues/LongDocValues.cs | 7 ++-----
.../Function/DocValues/StrDocValues.cs | 7 ++-----
src/Lucene.Net.Queries/Function/FunctionValues.cs | 4 ++--
.../Function/ValueSources/DefFunction.cs | 9 +++------
.../Function/ValueSources/DoubleFieldSource.cs | 7 ++-----
.../Function/ValueSources/EnumFieldSource.cs | 7 ++-----
.../Function/ValueSources/FloatFieldSource.cs | 7 ++-----
.../Function/ValueSources/IfFunction.cs | 11 ++++-------
.../Function/ValueSources/IntFieldSource.cs | 7 ++-----
.../Function/ValueSources/LongFieldSource.cs | 7 ++-----
.../Function/ValueSources/OrdFieldSource.cs | 7 ++-----
.../Function/ValueSources/QueryValueSource.cs | 17 +++++++----------
22 files changed, 48 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
index 17a4142..c8a42be 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupHeadsCollector.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search.Grouping.Function
{
this.readerContext = context;
FunctionValues values = groupBy.GetValues(vsContext, context);
- filler = values.ValueFiller;
+ filler = values.GetValueFiller();
mval = filler.Value;
foreach (GroupHead groupHead in groups.Values)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
index fc5848b..0381eeb 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionAllGroupsCollector.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Search.Grouping.Function
public override void SetNextReader(AtomicReaderContext context)
{
FunctionValues values = groupBy.GetValues(vsContext, context);
- filler = values.ValueFiller;
+ filler = values.GetValueFiller();
mval = filler.Value;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
index dc882bf..f1f0e5c 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionDistinctValuesCollector.cs
@@ -72,10 +72,10 @@ namespace Lucene.Net.Search.Grouping.Function
public override void SetNextReader(AtomicReaderContext context)
{
FunctionValues values = groupSource.GetValues(vsContext, context);
- groupFiller = values.ValueFiller;
+ groupFiller = values.GetValueFiller();
groupMval = groupFiller.Value;
values = countSource.GetValues(vsContext, context);
- countFiller = values.ValueFiller;
+ countFiller = values.GetValueFiller();
countMval = countFiller.Value;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
index 3821319..20441f7 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionFirstPassGroupingCollector.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Grouping.Function
{
base.SetNextReader(context);
FunctionValues values = groupByVS.GetValues(vsContext, context);
- filler = values.ValueFiller;
+ filler = values.GetValueFiller();
mval = filler.Value;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs b/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
index 5953839..be66fe4 100644
--- a/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/Function/FunctionSecondPassGroupingCollector.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Search.Grouping.Function
{
base.SetNextReader(context);
FunctionValues values = groupByVS.GetValues(vsContext, context);
- filler = values.ValueFiller;
+ filler = values.GetValueFiller();
mval = filler.Value;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 05611e9..c64c7be 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -80,12 +80,9 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + '=' + StrVal(doc);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 728f62b..9583dd3 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DocTermsIndexDocValues.cs
@@ -156,12 +156,9 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + '=' + StrVal(doc);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 400681d..245e8af 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -213,12 +213,9 @@ namespace Lucene.Net.Queries.Function.DocValues
}
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 ab41ba0..a587453 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -75,12 +75,9 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + '=' + StrVal(doc);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 a306656..4c46547 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -138,12 +138,9 @@ namespace Lucene.Net.Queries.Function.DocValues
}
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 6bf1813..9d4edbe 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -148,12 +148,9 @@ namespace Lucene.Net.Queries.Function.DocValues
}
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 8601f78..7258ea5 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/StrDocValues.cs
@@ -49,12 +49,9 @@ namespace Lucene.Net.Queries.Function.DocValues
return vs.GetDescription() + "='" + StrVal(doc) + "'";
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/FunctionValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/FunctionValues.cs b/src/Lucene.Net.Queries/Function/FunctionValues.cs
index a14ce75..e7b4446 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -145,9 +145,9 @@ namespace Lucene.Net.Queries.Function
/// <summary>
/// @lucene.experimental </summary>
- public virtual AbstractValueFiller ValueFiller // LUCENENET TODO: Make GetValueFiller() (returns new object)
+ public virtual AbstractValueFiller GetValueFiller()
{
- get { return new ValueFillerAnonymousInnerClassHelper(this); }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 5f90ada..20dc76c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -128,13 +128,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
return valsArr.Any(vals => vals.Exists(doc));
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- // TODO: need ValueSource.type() to determine correct type
- return base.ValueFiller;
- }
+ // TODO: need ValueSource.type() to determine correct type
+ return base.GetValueFiller();
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 6b35d47..ecdec6e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
@@ -77,12 +77,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
return arr.Get(doc) != 0 || valid.Get(doc);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 84a89c0..02f91bc 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -241,12 +241,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 b1aa5ba..2cb9171 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -83,12 +83,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
return arr.Get(doc) != 0 || valid.Get(doc);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
index 208d259..a17c6d2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -117,14 +117,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
return true; // TODO: flow through to any sub-sources?
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- // TODO: we need types of trueSource / falseSource to handle this
- // for now, use float.
- return base.ValueFiller;
- }
+ // TODO: we need types of trueSource / falseSource to handle this
+ // for now, use float.
+ return base.GetValueFiller();
}
public override string ToString(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 45a7c74..0dbe02e 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -115,12 +115,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
return outerInstance.GetDescription() + '=' + IntVal(doc);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 8623c3d..1f3efb3 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -111,12 +111,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
return outerInstance.ExternalToLong(extVal);
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/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 035c3f3..9be4993 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -104,12 +104,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
return sindex.GetOrd(doc + off) != 0;
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/dffc898c/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
index 4630094..4f4feda 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
@@ -233,17 +233,14 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override AbstractValueFiller ValueFiller
+ public override AbstractValueFiller GetValueFiller()
{
- get
- {
- //
- // TODO: if we want to support more than one value-filler or a value-filler in conjunction with
- // the FunctionValues, then members like "scorer" should be per ValueFiller instance.
- // Or we can say that the user should just instantiate multiple FunctionValues.
- //
- return new ValueFillerAnonymousInnerClassHelper(this);
- }
+ //
+ // TODO: if we want to support more than one value-filler or a value-filler in conjunction with
+ // the FunctionValues, then members like "scorer" should be per ValueFiller instance.
+ // Or we can say that the user should just instantiate multiple FunctionValues.
+ //
+ return new ValueFillerAnonymousInnerClassHelper(this);
}
private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller