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/02/08 14:31:57 UTC
[18/53] [abbrv] lucenenet git commit: Lucene.Net.Queries: Renamed all
type-derived properties and methods from Short, Int, Long,
and Float to match CLR types Int16, Int32, Int64, and Single, respectively.
Lucene.Net.Queries: Renamed all type-derived properties and methods from Short, Int, Long, and Float to match CLR types Int16, Int32, Int64, and Single, respectively.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ec70857f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ec70857f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ec70857f
Branch: refs/heads/api-work
Commit: ec70857f3c41e1fa663487b6ab8446cf085096e4
Parents: bb41cd1
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 8 00:29:57 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 8 21:08:21 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Facet/Range/LongRange.cs | 2 +-
.../Range/LongRangeFacetCounts.cs | 4 +-
src/Lucene.Net.Queries/Function/BoostedQuery.cs | 6 +-
.../Function/DocValues/BoolDocValues.cs | 20 ++++--
.../Function/DocValues/DoubleDocValues.cs | 20 ++++--
.../Function/DocValues/FloatDocValues.cs | 38 +++++++----
.../Function/DocValues/IntDocValues.cs | 40 ++++++++----
.../Function/DocValues/LongDocValues.cs | 48 ++++++++------
.../Function/FunctionQuery.cs | 4 +-
.../Function/FunctionValues.cs | 56 +++++++++++-----
.../Function/ValueSourceScorer.cs | 4 +-
.../Function/ValueSources/ByteFieldSource.cs | 20 ++++--
.../Function/ValueSources/ConstNumberSource.cs | 17 ++++-
.../Function/ValueSources/ConstValueSource.cs | 32 ++++++++--
.../Function/ValueSources/DefFunction.cs | 28 +++++---
.../Function/ValueSources/DivFloatFunction.cs | 2 +-
.../Function/ValueSources/DocFreqValueSource.cs | 34 ++++++++--
.../ValueSources/DoubleConstValueSource.cs | 30 +++++++--
.../Function/ValueSources/DualFloatFunction.cs | 5 +-
.../Function/ValueSources/EnumFieldSource.cs | 38 ++++++++---
.../Function/ValueSources/FloatFieldSource.cs | 5 +-
.../Function/ValueSources/IfFunction.cs | 28 +++++---
.../Function/ValueSources/IntFieldSource.cs | 17 +++--
.../ValueSources/JoinDocFreqValueSource.cs | 5 +-
.../ValueSources/LinearFloatFunction.cs | 7 +-
.../Function/ValueSources/LongFieldSource.cs | 40 ++++++++----
.../Function/ValueSources/MaxFloatFunction.cs | 2 +-
.../Function/ValueSources/MinFloatFunction.cs | 2 +-
.../Function/ValueSources/MultiFloatFunction.cs | 5 +-
.../Function/ValueSources/NormValueSource.cs | 5 +-
.../Function/ValueSources/OrdFieldSource.cs | 6 +-
.../Function/ValueSources/PowFloatFunction.cs | 2 +-
.../ValueSources/ProductFloatFunction.cs | 2 +-
.../Function/ValueSources/QueryValueSource.cs | 7 +-
.../ValueSources/RangeMapFloatFunction.cs | 9 ++-
.../ValueSources/ReciprocalFloatFunction.cs | 7 +-
.../ValueSources/ReverseOrdFieldSource.cs | 5 +-
.../Function/ValueSources/ScaleFloatFunction.cs | 9 ++-
.../Function/ValueSources/ShortFieldSource.cs | 22 +++++--
.../ValueSources/SimpleFloatFunction.cs | 5 +-
.../Function/ValueSources/SumFloatFunction.cs | 2 +-
.../ValueSources/SumTotalTermFreqValueSource.cs | 5 +-
.../Function/ValueSources/TFValueSource.cs | 5 +-
.../ValueSources/TermFreqValueSource.cs | 5 +-
.../ValueSources/TotalTermFreqValueSource.cs | 5 +-
.../Function/ValueSources/VectorValueSource.cs | 67 ++++++++++++++------
.../Util/CachingDoubleValueSource.cs | 5 +-
.../Util/ShapeFieldCacheDistanceValueSource.cs | 7 +-
.../Vector/DistanceValueSource.cs | 7 +-
.../Suggest/DocumentValueSourceDictionary.cs | 2 +-
.../TestExpressionValueSource.cs | 24 +++----
.../Function/TestDocValuesFieldSources.cs | 4 +-
52 files changed, 556 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Facet/Range/LongRange.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/LongRange.cs b/src/Lucene.Net.Facet/Range/LongRange.cs
index e8eec95..8267328 100644
--- a/src/Lucene.Net.Facet/Range/LongRange.cs
+++ b/src/Lucene.Net.Facet/Range/LongRange.cs
@@ -214,7 +214,7 @@ namespace Lucene.Net.Facet.Range
{
return false;
}
- return outerInstance.outerInstance.outerInstance.Accept(outerInstance.values.LongVal(docID));
+ return outerInstance.outerInstance.outerInstance.Accept(outerInstance.values.Int64Val(docID));
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs b/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
index 7d5954e..81debc7 100644
--- a/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
+++ b/src/Lucene.Net.Facet/Range/LongRangeFacetCounts.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.Facet.Range
/// <summary>
/// <see cref="Facets"/> implementation that computes counts for
/// dynamic long ranges from a provided <see cref="ValueSource"/>,
- /// using <see cref="FunctionValues.LongVal(int)"/> or <see cref="FunctionValues.LongVal(int, long[])"/>. Use
+ /// using <see cref="FunctionValues.Int64Val(int)"/> or <see cref="FunctionValues.Int64Val(int, long[])"/>. Use
/// this for dimensions that change in real-time (e.g. a
/// relative time based dimension like "Past day", "Past 2
/// days", etc.) or that change for each request (e.g.
@@ -120,7 +120,7 @@ namespace Lucene.Net.Facet.Range
// Skip missing docs:
if (fv.Exists(doc))
{
- counter.Add(fv.LongVal(doc));
+ counter.Add(fv.Int64Val(doc));
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 1cd591e..a82f01b 100644
--- a/src/Lucene.Net.Queries/Function/BoostedQuery.cs
+++ b/src/Lucene.Net.Queries/Function/BoostedQuery.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Queries.Function
return subQueryExpl;
}
FunctionValues vals = outerInstance.boostVal.GetValues(fcontext, readerContext);
- float sc = subQueryExpl.Value * vals.FloatVal(doc);
+ float sc = subQueryExpl.Value * vals.SingleVal(doc);
Explanation res = new ComplexExplanation(true, sc, outerInstance.ToString() + ", product of:");
res.AddDetail(subQueryExpl);
res.AddDetail(vals.Explain(doc));
@@ -180,7 +180,7 @@ namespace Lucene.Net.Queries.Function
public override float GetScore()
{
- float score = qWeight * scorer.GetScore() * vals.FloatVal(scorer.DocID);
+ float score = qWeight * scorer.GetScore() * vals.SingleVal(scorer.DocID);
// Current Lucene priority queues can't handle NaN and -Infinity, so
// map to -Float.MAX_VALUE. This conditional handles both -infinity
@@ -205,7 +205,7 @@ namespace Lucene.Net.Queries.Function
{
return subQueryExpl;
}
- float sc = subQueryExpl.Value * vals.FloatVal(doc);
+ float sc = subQueryExpl.Value * vals.SingleVal(doc);
Explanation res = new ComplexExplanation(true, sc, outerInstance.ToString() + ", product of:");
res.AddDetail(subQueryExpl);
res.AddDetail(vals.Explain(doc));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 2efbd85..233d55e 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/BoolDocValues.cs
@@ -40,22 +40,34 @@ namespace Lucene.Net.Queries.Function.DocValues
return BoolVal(doc) ? (byte)1 : (byte)0;
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
return BoolVal(doc) ? (short)1 : (short)0;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return BoolVal(doc) ? 1f : 0f;
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return BoolVal(doc) ? 1 : 0;
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return BoolVal(doc) ? 1 : 0;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 03bc61c..98e6b67 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/DoubleDocValues.cs
@@ -39,22 +39,34 @@ namespace Lucene.Net.Queries.Function.DocValues
return (byte)DoubleVal(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
return (short)DoubleVal(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)DoubleVal(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return (int)DoubleVal(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return (long)DoubleVal(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 a0927af..6b0d93d 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/FloatDocValues.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Queries.Function.DocValues
/// <summary>
/// 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)"/>
+ /// Implementations can control how the <see cref="float"/> values are loaded through <see cref="SingleVal(int)"/>
/// </summary>
public abstract class FloatDocValues : FunctionValues
{
@@ -35,39 +35,51 @@ namespace Lucene.Net.Queries.Function.DocValues
public override byte ByteVal(int doc)
{
- return (byte)FloatVal(doc);
+ return (byte)SingleVal(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
- return (short)FloatVal(doc);
+ return (short)SingleVal(doc);
}
- public override abstract float FloatVal(int doc);
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override abstract float SingleVal(int doc);
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
- return (int)FloatVal(doc);
+ return (int)SingleVal(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
- return (long)FloatVal(doc);
+ return (long)SingleVal(doc);
}
public override double DoubleVal(int doc)
{
- return (double)FloatVal(doc);
+ return (double)SingleVal(doc);
}
public override string StrVal(int doc)
{
- return Convert.ToString(FloatVal(doc));
+ return Convert.ToString(SingleVal(doc));
}
public override object ObjectVal(int doc)
{
- return Exists(doc) ? FloatVal(doc) : (float?)null;
+ return Exists(doc) ? SingleVal(doc) : (float?)null;
}
public override string ToString(int doc)
@@ -102,7 +114,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override void FillValue(int doc)
{
- mval.Value = outerInstance.FloatVal(doc);
+ mval.Value = outerInstance.SingleVal(doc);
mval.Exists = outerInstance.Exists(doc);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 a8c1f3b..1b78344 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/IntDocValues.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Queries.Function.DocValues
/// <summary>
/// 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)"/>
+ /// Implementations can control how the <see cref="int"/> values are loaded through <see cref="Int32Val(int)"/>
/// </summary>
public abstract class IntDocValues : FunctionValues
{
@@ -36,39 +36,51 @@ namespace Lucene.Net.Queries.Function.DocValues
public override byte ByteVal(int doc)
{
- return (byte)IntVal(doc);
+ return (byte)Int32Val(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
- return (short)IntVal(doc);
+ return (short)Int32Val(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return (float)IntVal(doc);
+ return (float)Int32Val(doc);
}
- public override abstract int IntVal(int doc);
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override abstract int Int32Val(int doc);
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
- return (long)IntVal(doc);
+ return (long)Int32Val(doc);
}
public override double DoubleVal(int doc)
{
- return (double)IntVal(doc);
+ return (double)Int32Val(doc);
}
public override string StrVal(int doc)
{
- return Convert.ToString(IntVal(doc));
+ return Convert.ToString(Int32Val(doc));
}
public override object ObjectVal(int doc)
{
- return Exists(doc) ? IntVal(doc) : (int?)null;
+ return Exists(doc) ? Int32Val(doc) : (int?)null;
}
public override string ToString(int doc)
@@ -131,7 +143,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override bool MatchesValue(int doc)
{
- int val = outerInstance.IntVal(doc);
+ int val = outerInstance.Int32Val(doc);
// only check for deleted if it's the default value
// if (val==0 && reader.isDeleted(doc)) return false;
return val >= ll && val <= uu;
@@ -165,7 +177,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override void FillValue(int doc)
{
- mval.Value = outerInstance.IntVal(doc);
+ mval.Value = outerInstance.Int32Val(doc);
mval.Exists = outerInstance.Exists(doc);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 081d710..851db41 100644
--- a/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
+++ b/src/Lucene.Net.Queries/Function/DocValues/LongDocValues.cs
@@ -23,7 +23,7 @@ namespace Lucene.Net.Queries.Function.DocValues
/// <summary>
/// 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)"/>
+ /// Implementations can control how the <see cref="long"/> values are loaded through <see cref="Int64Val(int)"/>
/// </summary>
public abstract class LongDocValues : FunctionValues
{
@@ -36,44 +36,53 @@ namespace Lucene.Net.Queries.Function.DocValues
public override byte ByteVal(int doc)
{
- return (byte)LongVal(doc);
+ return (byte)Int64Val(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
- return (short)LongVal(doc);
+ return (short)Int64Val(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return (float)LongVal(doc);
+ return (float)Int64Val(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
- return (int)LongVal(doc);
+ return (int)Int64Val(doc);
}
- public override abstract long LongVal(int doc);
+ public override abstract long Int64Val(int doc);
public override double DoubleVal(int doc)
{
- return (double)LongVal(doc);
+ return (double)Int64Val(doc);
}
public override bool BoolVal(int doc)
{
- return LongVal(doc) != 0;
+ return Int64Val(doc) != 0;
}
public override string StrVal(int doc)
{
- return Convert.ToString(LongVal(doc));
+ return Convert.ToString(Int64Val(doc));
}
public override object ObjectVal(int doc)
{
- return Exists(doc) ? LongVal(doc) : (long?)null;
+ return Exists(doc) ? Int64Val(doc) : (long?)null;
}
public override string ToString(int doc)
@@ -81,7 +90,10 @@ namespace Lucene.Net.Queries.Function.DocValues
return m_vs.GetDescription() + '=' + StrVal(doc);
}
- protected virtual long ExternalToLong(string extVal)
+ /// <summary>
+ /// NOTE: This was externalToLong() in Lucene
+ /// </summary>
+ protected virtual long ExternalToInt64(string extVal)
{
return Convert.ToInt64(extVal);
}
@@ -98,7 +110,7 @@ namespace Lucene.Net.Queries.Function.DocValues
}
else
{
- lower = ExternalToLong(lowerVal);
+ lower = ExternalToInt64(lowerVal);
if (!includeLower && lower < long.MaxValue)
{
lower++;
@@ -111,7 +123,7 @@ namespace Lucene.Net.Queries.Function.DocValues
}
else
{
- upper = ExternalToLong(upperVal);
+ upper = ExternalToInt64(upperVal);
if (!includeUpper && upper > long.MinValue)
{
upper--;
@@ -141,7 +153,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override bool MatchesValue(int doc)
{
- long val = outerInstance.LongVal(doc);
+ long val = outerInstance.Int64Val(doc);
// only check for deleted if it's the default value
// if (val==0 && reader.isDeleted(doc)) return false;
return val >= ll && val <= uu;
@@ -175,7 +187,7 @@ namespace Lucene.Net.Queries.Function.DocValues
public override void FillValue(int doc)
{
- mval.Value = outerInstance.LongVal(doc);
+ mval.Value = outerInstance.Int64Val(doc);
mval.Exists = outerInstance.Exists(doc);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 a82ec72..10a16fc 100644
--- a/src/Lucene.Net.Queries/Function/FunctionQuery.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionQuery.cs
@@ -166,7 +166,7 @@ namespace Lucene.Net.Queries.Function
public override float GetScore()
{
- float score = qWeight * vals.FloatVal(doc);
+ float score = qWeight * vals.SingleVal(doc);
// Current Lucene priority queues can't handle NaN and -Infinity, so
// map to -Float.MAX_VALUE. This conditional handles both -infinity
@@ -186,7 +186,7 @@ namespace Lucene.Net.Queries.Function
public virtual Explanation Explain(int d)
{
- float sc = qWeight * vals.FloatVal(d);
+ float sc = qWeight * vals.SingleVal(d);
Explanation result = new ComplexExplanation(true, sc, "FunctionQuery(" + outerInstance.func + "), product of:");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 4ead9c8..d2f4063 100644
--- a/src/Lucene.Net.Queries/Function/FunctionValues.cs
+++ b/src/Lucene.Net.Queries/Function/FunctionValues.cs
@@ -41,22 +41,34 @@ namespace Lucene.Net.Queries.Function
throw new System.NotSupportedException();
}
- public virtual short ShortVal(int doc) // LUCENENET TODO: Rename Int16Val ?
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public virtual short Int16Val(int doc)
{
throw new System.NotSupportedException();
}
- public virtual float FloatVal(int doc) // LUCENENET TODO: Rename SingleVal ?
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public virtual float SingleVal(int doc)
{
throw new System.NotSupportedException();
}
- public virtual int IntVal(int doc) // LUCENENET TODO: Rename Int32Val ?
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public virtual int Int32Val(int doc)
{
throw new System.NotSupportedException();
}
- public virtual long LongVal(int doc) // LUCENENET TODO: Rename Int64Val ?
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public virtual long Int64Val(int doc)
{
throw new System.NotSupportedException();
}
@@ -74,7 +86,7 @@ namespace Lucene.Net.Queries.Function
public virtual bool BoolVal(int doc)
{
- return IntVal(doc) != 0;
+ return Int32Val(doc) != 0;
}
/// <summary>
@@ -96,7 +108,7 @@ namespace Lucene.Net.Queries.Function
public virtual object ObjectVal(int doc)
{
// most FunctionValues are functions, so by default return a Float()
- return FloatVal(doc);
+ return SingleVal(doc);
}
/// <summary>
@@ -167,7 +179,7 @@ namespace Lucene.Net.Queries.Function
public override void FillValue(int doc)
{
- mval.Value = outerInstance.FloatVal(doc);
+ mval.Value = outerInstance.SingleVal(doc);
}
}
@@ -177,22 +189,34 @@ namespace Lucene.Net.Queries.Function
throw new System.NotSupportedException();
}
- public virtual void ShortVal(int doc, short[] vals) // LUCENENET TODO: Rename Int16Val ?
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public virtual void Int16Val(int doc, short[] vals)
{
throw new System.NotSupportedException();
}
- public virtual void FloatVal(int doc, float[] vals) // LUCENENET TODO: Rename SingleVal ?
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public virtual void SingleVal(int doc, float[] vals)
{
throw new System.NotSupportedException();
}
- public virtual void IntVal(int doc, int[] vals) // LUCENENET TODO: Rename Int32Val ?
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public virtual void Int32Val(int doc, int[] vals)
{
throw new System.NotSupportedException();
}
- public virtual void LongVal(int doc, long[] vals) // LUCENENET TODO: Rename Int64Val ?
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public virtual void Int64Val(int doc, long[] vals)
{
throw new System.NotSupportedException();
}
@@ -210,7 +234,7 @@ namespace Lucene.Net.Queries.Function
public virtual Explanation Explain(int doc)
{
- return new Explanation(FloatVal(doc), ToString(doc));
+ return new Explanation(SingleVal(doc), ToString(doc));
}
public virtual ValueSourceScorer GetScorer(IndexReader reader)
@@ -284,7 +308,7 @@ namespace Lucene.Net.Queries.Function
public override bool MatchesValue(int doc)
{
- float docVal = outerInstance.FloatVal(doc);
+ float docVal = outerInstance.SingleVal(doc);
return docVal >= l && docVal <= u;
}
}
@@ -307,7 +331,7 @@ namespace Lucene.Net.Queries.Function
public override bool MatchesValue(int doc)
{
- float docVal = outerInstance.FloatVal(doc);
+ float docVal = outerInstance.SingleVal(doc);
return docVal >= l && docVal < u;
}
}
@@ -330,7 +354,7 @@ namespace Lucene.Net.Queries.Function
public override bool MatchesValue(int doc)
{
- float docVal = outerInstance.FloatVal(doc);
+ float docVal = outerInstance.SingleVal(doc);
return docVal > l && docVal <= u;
}
}
@@ -353,7 +377,7 @@ namespace Lucene.Net.Queries.Function
public override bool MatchesValue(int doc)
{
- float docVal = outerInstance.FloatVal(doc);
+ float docVal = outerInstance.SingleVal(doc);
return docVal > l && docVal < u;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 cd2f0a7..1702ecf 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>
- /// <see cref="Scorer"/> which returns the result of <see cref="FunctionValues.FloatVal(int)"/> as
+ /// <see cref="Scorer"/> which returns the result of <see cref="FunctionValues.SingleVal(int)"/> as
/// the score for a document.
/// </summary>
public class ValueSourceScorer : Scorer
@@ -97,7 +97,7 @@ namespace Lucene.Net.Queries.Function
public override float GetScore()
{
- return m_values.FloatVal(doc);
+ return m_values.SingleVal(doc);
}
public override int Freq
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 e915d36..f9cecc2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ByteFieldSource.cs
@@ -71,22 +71,34 @@ namespace Lucene.Net.Queries.Function.ValueSources
return (byte)arr.Get(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
return (short)arr.Get(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)arr.Get(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return (int)arr.Get(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return (long)arr.Get(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 90edc0a..3a33ae7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ConstNumberSource.cs
@@ -22,9 +22,20 @@
/// </summary>
public abstract class ConstNumberSource : ValueSource
{
- public abstract int Int { get; } // LUCENENET TODO: Rename Int32?
- public abstract long Long { get; } // LUCENENET TODO: Rename Int64?
- public abstract float Float { get; } // LUCENENET TODO: Rename Single?
+ /// <summary>
+ /// NOTE: This was getInt() in Lucene
+ /// </summary>
+ public abstract int Int32 { get; }
+
+ /// <summary>
+ /// NOTE: This was getLong() in Lucene
+ /// </summary>
+ public abstract long Int64 { get; }
+
+ /// <summary>
+ /// NOTE: This was getFloat() in Lucene
+ /// </summary>
+ public abstract float Single { get; }
public abstract double Double { get; }
//public abstract Number Number { get; }
public abstract bool Bool { get; }
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 bd9a8aa..a9bd1b5 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs
@@ -56,15 +56,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.outerInstance = outerInstance;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return outerInstance.constant;
}
- public override int IntVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return (int)outerInstance.constant;
}
- public override long LongVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return (long)outerInstance.constant;
}
@@ -101,7 +112,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
return this.constant == other.constant;
}
- public override int Int
+ /// <summary>
+ /// NOTE: This was getInt() in Lucene
+ /// </summary>
+ public override int Int32
{
get
{
@@ -109,7 +123,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override long Long
+ /// <summary>
+ /// NOTE: This was getLong() in Lucene
+ /// </summary>
+ public override long Int64
{
get
{
@@ -117,7 +134,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override float Float
+ /// <summary>
+ /// NOTE: This was getFloat() in Lucene
+ /// </summary>
+ public override float Single
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 9f3aba2..e0d1115 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs
@@ -77,24 +77,36 @@ namespace Lucene.Net.Queries.Function.ValueSources
return Get(doc).ByteVal(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
- return Get(doc).ShortVal(doc);
+ return Get(doc).Int16Val(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return Get(doc).FloatVal(doc);
+ return Get(doc).SingleVal(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
- return Get(doc).IntVal(doc);
+ return Get(doc).Int32Val(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
- return Get(doc).LongVal(doc);
+ return Get(doc).Int64Val(doc);
}
public override double DoubleVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs
index d52340d..1ee5d96 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs
@@ -36,7 +36,7 @@
protected override float Func(int doc, FunctionValues aVals, FunctionValues bVals)
{
- return aVals.FloatVal(doc) / bVals.FloatVal(doc);
+ return aVals.SingleVal(doc) / bVals.SingleVal(doc);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 fd29bf4..5e46da2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs
@@ -44,15 +44,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.parent = parent;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return fval;
}
- public override int IntVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return ival;
}
- public override long LongVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return lval;
}
@@ -90,15 +101,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.parent = parent;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return fval;
}
- public override int IntVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return ival;
}
- public override long LongVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return lval;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs
index 73407ae..618205d 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs
@@ -58,17 +58,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.outerInstance = outerInstance;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return outerInstance.fv;
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return (int)outerInstance.lv;
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return outerInstance.lv;
}
@@ -110,7 +119,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
return this.constant == other.constant;
}
- public override int Int
+ /// <summary>
+ /// NOTE: This was getInt() in Lucene
+ /// </summary>
+ public override int Int32
{
get
{
@@ -118,7 +130,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override long Long
+ /// <summary>
+ /// NOTE: This was getLong() in Lucene
+ /// </summary>
+ public override long Int64
{
get
{
@@ -126,7 +141,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override float Float
+ /// <summary>
+ /// NOTE: This was getFloat() in Lucene
+ /// </summary>
+ public override float Single
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 0b46252..7d43753 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
@@ -69,7 +69,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.bVals = bVals;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return outerInstance.Func(doc, aVals, bVals);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 a642ab8..747c0b4 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -48,7 +48,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.enumStringToIntMap = enumStringToIntMap;
}
- private static int? TryParseInt(string valueStr) // LUCENENET TODO: Rename TryParseInt32 ?
+ /// <summary>
+ /// NOTE: This was tryParseInt() in Lucene
+ /// </summary>
+ private static int? TryParseInt32(string valueStr)
{
int? intValue = null;
try
@@ -61,7 +64,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
return intValue;
}
- private string IntValueToStringValue(int? intVal) // LUCENENET TODO: Rename Int32ToStringValue ?
+ /// <summary>
+ /// NOTE: This was intValueToStringValue() in Lucene
+ /// </summary>
+ private string Int32ValueToStringValue(int? intVal)
{
if (intVal == null)
{
@@ -77,7 +83,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
return DEFAULT_VALUE.ToString(CultureInfo.InvariantCulture);
}
- private int? StringValueToIntValue(string stringVal) // LUCENENET TODO: Rename StringValueToInt32Value ?
+ /// <summary>
+ /// NOTE: This was stringValueToIntValue() in Lucene
+ /// </summary>
+ private int? StringValueToInt32Value(string stringVal)
{
if (stringVal == null)
{
@@ -92,7 +101,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
//enum int not found for str
- intValue = TryParseInt(stringVal);
+ intValue = TryParseInt32(stringVal);
if (intValue == null) //not Integer
{
intValue = DEFAULT_VALUE;
@@ -138,17 +147,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
private readonly MutableValueInt val;
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)arr.Get(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return arr.Get(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return (long)arr.Get(doc);
}
@@ -161,7 +179,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string StrVal(int doc)
{
int? intValue = arr.Get(doc);
- return outerInstance.IntValueToStringValue(intValue);
+ return outerInstance.Int32ValueToStringValue(intValue);
}
public override object ObjectVal(int doc)
@@ -182,8 +200,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override ValueSourceScorer GetRangeScorer(IndexReader reader, string lowerVal, string upperVal, bool includeLower, bool includeUpper)
{
- int? lower = outerInstance.StringValueToIntValue(lowerVal);
- int? upper = outerInstance.StringValueToIntValue(upperVal);
+ int? lower = outerInstance.StringValueToInt32Value(lowerVal);
+ int? upper = outerInstance.StringValueToInt32Value(upperVal);
// instead of using separate comparison functions, adjust the endpoints.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 3207939..7a14135 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -67,7 +67,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.valid = valid;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return arr.Get(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 605589e..39207eb 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -66,24 +66,36 @@ namespace Lucene.Net.Queries.Function.ValueSources
return ifVals.BoolVal(doc) ? trueVals.ByteVal(doc) : falseVals.ByteVal(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
- return ifVals.BoolVal(doc) ? trueVals.ShortVal(doc) : falseVals.ShortVal(doc);
+ return ifVals.BoolVal(doc) ? trueVals.Int16Val(doc) : falseVals.Int16Val(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return ifVals.BoolVal(doc) ? trueVals.FloatVal(doc) : falseVals.FloatVal(doc);
+ return ifVals.BoolVal(doc) ? trueVals.SingleVal(doc) : falseVals.SingleVal(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
- return ifVals.BoolVal(doc) ? trueVals.IntVal(doc) : falseVals.IntVal(doc);
+ return ifVals.BoolVal(doc) ? trueVals.Int32Val(doc) : falseVals.Int32Val(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
- return ifVals.BoolVal(doc) ? trueVals.LongVal(doc) : falseVals.LongVal(doc);
+ return ifVals.BoolVal(doc) ? trueVals.Int64Val(doc) : falseVals.Int64Val(doc);
}
public override double DoubleVal(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 e4af2e0..0d81135 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -75,17 +75,26 @@ namespace Lucene.Net.Queries.Function.ValueSources
private readonly MutableValueInt val;
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)arr.Get(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return arr.Get(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return (long)arr.Get(doc);
}
@@ -112,7 +121,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string ToString(int doc)
{
- return outerInstance.GetDescription() + '=' + IntVal(doc);
+ return outerInstance.GetDescription() + '=' + Int32Val(doc);
}
public override ValueFiller GetValueFiller()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 19cc714..a9ce522 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
@@ -75,7 +75,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
private readonly BytesRef @ref;
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 df56910..179995f 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
@@ -65,9 +65,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.vals = vals;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return vals.FloatVal(doc) * outerInstance.m_slope + outerInstance.m_intercept;
+ return vals.SingleVal(doc) * outerInstance.m_slope + outerInstance.m_intercept;
}
public override string ToString(int doc)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 c057651..fa0ad17 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -49,19 +49,28 @@ namespace Lucene.Net.Queries.Function.ValueSources
return "long(" + m_field + ')';
}
- public virtual long ExternalToLong(string extVal)
+ /// <summary>
+ /// NOTE: This was externalToLong() in Lucene
+ /// </summary>
+ public virtual long ExternalToInt64(string extVal)
{
return Convert.ToInt64(extVal);
}
- public virtual object LongToObject(long val)
+ /// <summary>
+ /// NOTE: This was longToObject() in Lucene
+ /// </summary>
+ public virtual object Int64ToObject(long val)
{
return val;
}
- public virtual string LongToString(long val)
+ /// <summary>
+ /// NOTE: This was longToString() in Lucene
+ /// </summary>
+ public virtual string Int64ToString(long val)
{
- return LongToObject(val).ToString();
+ return Int64ToObject(val).ToString();
}
public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
@@ -86,7 +95,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.valid = valid;
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return arr.Get(doc);
}
@@ -98,17 +110,20 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override object ObjectVal(int doc)
{
- return valid.Get(doc) ? outerInstance.LongToObject(arr.Get(doc)) : null;
+ return valid.Get(doc) ? outerInstance.Int64ToObject(arr.Get(doc)) : null;
}
public override string StrVal(int doc)
{
- return valid.Get(doc) ? outerInstance.LongToString(arr.Get(doc)) : null;
+ return valid.Get(doc) ? outerInstance.Int64ToString(arr.Get(doc)) : null;
}
- protected override long ExternalToLong(string extVal)
+ /// <summary>
+ /// NOTE: This was externalToLong() in Lucene
+ /// </summary>
+ protected override long ExternalToInt64(string extVal)
{
- return outerInstance.ExternalToLong(extVal);
+ return outerInstance.ExternalToInt64(extVal);
}
public override ValueFiller GetValueFiller()
@@ -123,7 +138,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public ValueFillerAnonymousInnerClassHelper(LongDocValuesAnonymousInnerClassHelper outerInstance)
{
this.outerInstance = outerInstance;
- mval = outerInstance.outerInstance.NewMutableValueLong();
+ mval = outerInstance.outerInstance.NewMutableValueInt64();
}
private readonly MutableValueLong mval;
@@ -144,7 +159,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- protected virtual MutableValueLong NewMutableValueLong()
+ /// <summary>
+ /// NOTE: This was longToString() in Lucene
+ /// </summary>
+ protected virtual MutableValueLong NewMutableValueInt64()
{
return new MutableValueLong();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 7e8913e..914df30 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return 0.0f;
}
- return valsArr.Select(vals => vals.FloatVal(doc)).Concat(new[] {float.NegativeInfinity}).Max();
+ return valsArr.Select(vals => vals.SingleVal(doc)).Concat(new[] {float.NegativeInfinity}).Max();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 ca5cf7b..83e6784 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return 0.0f;
}
- return valsArr.Select(vals => vals.FloatVal(doc)).Concat(new[] {float.PositiveInfinity}).Min();
+ return valsArr.Select(vals => vals.SingleVal(doc)).Concat(new[] {float.PositiveInfinity}).Min();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 c3bd1c8..a4ac19c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
@@ -86,7 +86,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.valsArr = valsArr;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return outerInstance.Func(doc, valsArr);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 a6fcd89..5fd0546 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
@@ -88,7 +88,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.norms = norms;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return similarity.DecodeNormValue(norms.Get(doc));
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 cb016d7..967045f 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -87,7 +87,11 @@ namespace Lucene.Net.Queries.Function.ValueSources
{
return readableValue;
}
- public override int IntVal(int doc)
+
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return sindex.GetOrd(doc + off);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs
index c2a8a93..8a2a10b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
protected override float Func(int doc, FunctionValues aVals, FunctionValues bVals)
{
- return (float)Math.Pow(aVals.FloatVal(doc), bVals.FloatVal(doc));
+ return (float)Math.Pow(aVals.SingleVal(doc), bVals.SingleVal(doc));
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 87673f9..1fda318 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
protected override float Func(int doc, FunctionValues[] valsArr)
{
- return valsArr.Aggregate(1.0f, (current, vals) => current * vals.FloatVal(doc));
+ return valsArr.Aggregate(1.0f, (current, vals) => current * vals.SingleVal(doc));
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 833f72d..b11a93c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
@@ -139,7 +139,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
weight = w;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
try
{
@@ -311,7 +314,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string ToString(int doc)
{
- return "query(" + q + ",def=" + defVal + ")=" + FloatVal(doc);
+ return "query(" + q + ",def=" + defVal + ")=" + SingleVal(doc);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 a3f1f19..3d7ecc6 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
@@ -81,10 +81,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.defaults = defaults;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- float val = vals.FloatVal(doc);
- return (val >= outerInstance.m_min && val <= outerInstance.m_max) ? targets.FloatVal(doc) : (outerInstance.m_defaultVal == null ? val : defaults.FloatVal(doc));
+ float val = vals.SingleVal(doc);
+ return (val >= outerInstance.m_min && val <= outerInstance.m_max) ? targets.SingleVal(doc) : (outerInstance.m_defaultVal == null ? val : defaults.SingleVal(doc));
}
public override string ToString(int doc)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 02de918..a803e8c 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
@@ -74,9 +74,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.vals = vals;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return outerInstance.m_a / (outerInstance.m_m * vals.FloatVal(doc) + outerInstance.m_b);
+ return outerInstance.m_a / (outerInstance.m_m * vals.SingleVal(doc) + outerInstance.m_b);
}
public override string ToString(int doc)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 01015f4..88c9d1b 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
@@ -91,7 +91,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.end = end;
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return (end - sindex.GetOrd(doc + off) - 1);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 2be917d..ffae7c7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
for (int i = 0; i < maxDoc; i++)
{
- float val = vals.FloatVal(i);
+ float val = vals.SingleVal(i);
if ((Number.SingleToRawInt32Bits(val) & (0xff << 23)) == 0xff << 23)
{
// if the exponent in the float is all ones, then this is +Inf, -Inf or NaN
@@ -137,9 +137,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.vals = vals;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
- return (vals.FloatVal(doc) - minSource) * scale + outerInstance.m_min;
+ return (vals.SingleVal(doc) - minSource) * scale + outerInstance.m_min;
}
public override string ToString(int doc)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 7419010..a1ef324 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs
@@ -70,22 +70,34 @@ namespace Lucene.Net.Queries.Function.ValueSources
return (byte)arr.Get(doc);
}
- public override short ShortVal(int doc)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override short Int16Val(int doc)
{
return arr.Get(doc);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)arr.Get(doc);
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
return (int)arr.Get(doc);
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return (long)arr.Get(doc);
}
@@ -102,7 +114,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
public override string ToString(int doc)
{
- return outerInstance.GetDescription() + '=' + ShortVal(doc);
+ return outerInstance.GetDescription() + '=' + Int16Val(doc);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 16809f7..400e496 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SimpleFloatFunction.cs
@@ -51,7 +51,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.vals = vals;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return outerInstance.Func(doc, vals);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 fcff158..90472a2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
protected override float Func(int doc, FunctionValues[] valsArr)
{
- return valsArr.Sum(vals => vals.FloatVal(doc));
+ return valsArr.Sum(vals => vals.SingleVal(doc));
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 f46ca0e..27de789 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs
@@ -96,7 +96,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.ttf = ttf;
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return ttf;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 1be78d0..e9bbee7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
@@ -149,7 +149,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 3019d79..749c208 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
@@ -134,7 +134,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override int IntVal(int doc)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override int Int32Val(int doc)
{
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 6da5703..86511b7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs
@@ -93,7 +93,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
this.ttf = ttf;
}
- public override long LongVal(int doc)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override long Int64Val(int doc)
{
return ttf;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/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 1bae536..90850d2 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs
@@ -96,25 +96,40 @@ namespace Lucene.Net.Queries.Function.ValueSources
vals[1] = y.ByteVal(doc);
}
- public override void ShortVal(int doc, short[] vals)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override void Int16Val(int doc, short[] vals)
{
- vals[0] = x.ShortVal(doc);
- vals[1] = y.ShortVal(doc);
+ vals[0] = x.Int16Val(doc);
+ vals[1] = y.Int16Val(doc);
}
- public override void IntVal(int doc, int[] vals)
+
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override void Int32Val(int doc, int[] vals)
{
- vals[0] = x.IntVal(doc);
- vals[1] = y.IntVal(doc);
+ vals[0] = x.Int32Val(doc);
+ vals[1] = y.Int32Val(doc);
}
- public override void LongVal(int doc, long[] vals)
+
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override void Int64Val(int doc, long[] vals)
{
- vals[0] = x.LongVal(doc);
- vals[1] = y.LongVal(doc);
+ vals[0] = x.Int64Val(doc);
+ vals[1] = y.Int64Val(doc);
}
- public override void FloatVal(int doc, float[] vals)
+
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override void SingleVal(int doc, float[] vals)
{
- vals[0] = x.FloatVal(doc);
- vals[1] = y.FloatVal(doc);
+ vals[0] = x.SingleVal(doc);
+ vals[1] = y.SingleVal(doc);
}
public override void DoubleVal(int doc, double[] vals)
{
@@ -151,35 +166,47 @@ namespace Lucene.Net.Queries.Function.ValueSources
}
}
- public override void ShortVal(int doc, short[] vals)
+ /// <summary>
+ /// NOTE: This was shortVal() in Lucene
+ /// </summary>
+ public override void Int16Val(int doc, short[] vals)
{
for (int i = 0; i < valsArr.Length; i++)
{
- vals[i] = valsArr[i].ShortVal(doc);
+ vals[i] = valsArr[i].Int16Val(doc);
}
}
- public override void FloatVal(int doc, float[] vals)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override void SingleVal(int doc, float[] vals)
{
for (int i = 0; i < valsArr.Length; i++)
{
- vals[i] = valsArr[i].FloatVal(doc);
+ vals[i] = valsArr[i].SingleVal(doc);
}
}
- public override void IntVal(int doc, int[] vals)
+ /// <summary>
+ /// NOTE: This was intVal() in Lucene
+ /// </summary>
+ public override void Int32Val(int doc, int[] vals)
{
for (int i = 0; i < valsArr.Length; i++)
{
- vals[i] = valsArr[i].IntVal(doc);
+ vals[i] = valsArr[i].Int32Val(doc);
}
}
- public override void LongVal(int doc, long[] vals)
+ /// <summary>
+ /// NOTE: This was longVal() in Lucene
+ /// </summary>
+ public override void Int64Val(int doc, long[] vals)
{
for (int i = 0; i < valsArr.Length; i++)
{
- vals[i] = valsArr[i].LongVal(doc);
+ vals[i] = valsArr[i].Int64Val(doc);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Spatial/Util/CachingDoubleValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Util/CachingDoubleValueSource.cs b/src/Lucene.Net.Spatial/Util/CachingDoubleValueSource.cs
index 7d9522c..eae1e4f 100644
--- a/src/Lucene.Net.Spatial/Util/CachingDoubleValueSource.cs
+++ b/src/Lucene.Net.Spatial/Util/CachingDoubleValueSource.cs
@@ -78,7 +78,10 @@ namespace Lucene.Net.Spatial.Util
return v;
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)DoubleVal(doc);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Util/ShapeFieldCacheDistanceValueSource.cs b/src/Lucene.Net.Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
index 642d689..ffb8c56 100644
--- a/src/Lucene.Net.Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
+++ b/src/Lucene.Net.Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
@@ -77,7 +77,10 @@ namespace Lucene.Net.Spatial.Util
nullValue = (enclosingInstance.ctx.IsGeo ? 180 * enclosingInstance.multiplier : double.MaxValue);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)DoubleVal(doc);
}
@@ -99,7 +102,7 @@ namespace Lucene.Net.Spatial.Util
public override string ToString(int doc)
{
- return enclosingInstance.GetDescription() + "=" + FloatVal(doc);
+ return enclosingInstance.GetDescription() + "=" + SingleVal(doc);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ec70857f/src/Lucene.Net.Spatial/Vector/DistanceValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Vector/DistanceValueSource.cs b/src/Lucene.Net.Spatial/Vector/DistanceValueSource.cs
index 36f5d53..327093e 100644
--- a/src/Lucene.Net.Spatial/Vector/DistanceValueSource.cs
+++ b/src/Lucene.Net.Spatial/Vector/DistanceValueSource.cs
@@ -90,7 +90,10 @@ namespace Lucene.Net.Spatial.Vector
nullValue = (outerInstance.strategy.SpatialContext.IsGeo ? 180 * outerInstance.multiplier : double.MaxValue);
}
- public override float FloatVal(int doc)
+ /// <summary>
+ /// NOTE: This was floatVal() in Lucene
+ /// </summary>
+ public override float SingleVal(int doc)
{
return (float)DoubleVal(doc);
}
@@ -108,7 +111,7 @@ namespace Lucene.Net.Spatial.Vector
public override string ToString(int doc)
{
- return outerInstance.GetDescription() + "=" + FloatVal(doc);
+ return outerInstance.GetDescription() + "=" + SingleVal(doc);
}
}