lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject [16/21] More work on Lucene.Net.Queries
Date Fri, 19 Sep 2014 14:19:49 GMT
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 97806b5..7a738f7 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs
@@ -16,8 +16,8 @@
  */
 using System;
 using System.Collections;
-using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
+using Lucene.Net.Index;
+using Lucene.Net.Queries.Function.DocValues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -37,14 +37,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		this.lv = (long)constant;
 	  }
 
-	  public override string description()
-	  {
-		return "const(" + constant + ")";
-	  }
+        public override string Description
+        {
+            get { return "const(" + constant + ")"; }
+        }
 
-//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 		return new DoubleDocValuesAnonymousInnerClassHelper(this, this);
 	  }
@@ -53,60 +51,60 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  {
 		  private readonly DoubleConstValueSource outerInstance;
 
-		  public DoubleDocValuesAnonymousInnerClassHelper(DoubleConstValueSource outerInstance, DoubleConstValueSource this) : base(this)
+		  public DoubleDocValuesAnonymousInnerClassHelper(DoubleConstValueSource outerInstance, DoubleConstValueSource @this) : base(@this)
 		  {
 			  this.outerInstance = outerInstance;
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
 			return outerInstance.fv;
 		  }
 
-		  public override int intVal(int doc)
+		  public override int IntVal(int doc)
 		  {
 			return (int) outerInstance.lv;
 		  }
 
-		  public override long longVal(int doc)
+		  public override long LongVal(int doc)
 		  {
 			return outerInstance.lv;
 		  }
 
-		  public override double doubleVal(int doc)
+		  public override double DoubleVal(int doc)
 		  {
 			return outerInstance.constant;
 		  }
 
-		  public override string strVal(int doc)
+		  public override string StrVal(int doc)
 		  {
 			return Convert.ToString(outerInstance.constant);
 		  }
 
-		  public override object objectVal(int doc)
+		  public override object ObjectVal(int doc)
 		  {
 			return outerInstance.constant;
 		  }
 
 		  public override string ToString(int doc)
 		  {
-			return outerInstance.description();
+			return outerInstance.Description;
 		  }
 	  }
 
 	  public override int GetHashCode()
 	  {
-		long bits = double.doubleToRawLongBits(constant);
+		long bits = NumberUtil.DoubleToRawLongBits(constant);
 		return (int)(bits ^ ((long)((ulong)bits >> 32)));
 	  }
 
 	  public override bool Equals(object o)
 	  {
-		if (!(o is DoubleConstValueSource))
+	      var other = o as DoubleConstValueSource;
+		if (other == null)
 		{
 			return false;
 		}
-		DoubleConstValueSource other = (DoubleConstValueSource) o;
 		return this.constant == other.constant;
 	  }
 
@@ -158,5 +156,4 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		  }
 	  }
 	}
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 d9c09dc..3965bca 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs
@@ -15,8 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
+using Lucene.Net.Index;
+using Lucene.Net.Queries.Function.DocValues;
+using Lucene.Net.Search;
+using Lucene.Net.Util;
+using Lucene.Net.Util.Mutable;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -27,7 +30,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	public class DoubleFieldSource : FieldCacheSource
 	{
 
-	  protected internal readonly FieldCache.DoubleParser parser;
+	  protected internal readonly FieldCache_Fields.DoubleParser parser;
 
 	  public DoubleFieldSource(string field) : this(field, null)
 	  {
@@ -38,21 +41,21 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		this.parser = parser;
 	  }
 
-	  public override string description()
-	  {
-		return "double(" + field + ')';
-	  }
+        public override string Description
+        {
+            get { return "double(" + field + ')'; }
+        }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.search.FieldCache.Doubles arr = cache.getDoubles(readerContext.reader(), field, parser, true);
 		FieldCache.Doubles arr = cache.getDoubles(readerContext.reader(), field, parser, true);
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.util.Bits valid = cache.getDocsWithField(readerContext.reader(), field);
-		Bits valid = cache.getDocsWithField(readerContext.reader(), field);
+		var valid = cache.getDocsWithField(readerContext.reader(), field);
 		return new DoubleDocValuesAnonymousInnerClassHelper(this, this, arr, valid);
 
 	  }
@@ -71,7 +74,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.valid = valid;
 		  }
 
-		  public override double doubleVal(int doc)
+		  public override double DoubleVal(int doc)
 		  {
 			return arr.get(doc);
 		  }
@@ -89,7 +92,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  }
 		  }
 
-		  private class ValueFillerAnonymousInnerClassHelper : ValueFiller
+		  private class ValueFillerAnonymousInnerClassHelper : AbstractValueFiller
 		  {
 			  private readonly DoubleDocValuesAnonymousInnerClassHelper outerInstance;
 
@@ -109,10 +112,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
 				  }
 			  }
 
-			  public override void fillValue(int doc)
+			  public override void FillValue(int doc)
 			  {
-				mval.value = outerInstance.arr.get(doc);
-				mval.exists = mval.value != 0 || outerInstance.valid.get(doc);
+				mval.Value = outerInstance.arr.Get(doc);
+				mval.Exists = mval.Value != 0 || outerInstance.valid.Get(doc);
 			  }
 		  }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 47a0b42..412d3cf 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs
@@ -15,102 +15,95 @@
  * limitations under the License.
  */
 using System.Collections;
-using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
+using Lucene.Net.Index;
+using Lucene.Net.Queries.Function.DocValues;
+using Lucene.Net.Search;
 
 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.
-	/// 
-	/// </summary>
-	public abstract class DualFloatFunction : ValueSource
-	{
-	  protected internal readonly ValueSource a;
-	  protected internal readonly ValueSource b;
+    /// Abstract <seealso cref="ValueSource"/> implementation which wraps two ValueSources
+    /// and applies an extendible float function to their values.
+    /// 
+    /// </summary>
+    public abstract class DualFloatFunction : ValueSource
+    {
+        protected internal readonly ValueSource a;
+        protected internal readonly ValueSource 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;
-	  }
+        /// <param name="a">  the base. </param>
+        /// <param name="b">  the exponent. </param>
+        protected DualFloatFunction(ValueSource a, ValueSource b)
+        {
+            this.a = a;
+            this.b = b;
+        }
 
-	  protected internal abstract string name();
-	  protected internal abstract float func(int doc, FunctionValues aVals, FunctionValues bVals);
+        protected abstract string Name { get; }
+        protected abstract float Func(int doc, FunctionValues aVals, FunctionValues bVals);
 
-	  public override string description()
-	  {
-		return name() + "(" + a.description() + "," + b.description() + ")";
-	  }
+        public override string Description
+        {
+            get { return Name + "(" + a.Description + "," + b.Description + ")"; }
+        }
 
-//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
-	  {
-//JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues aVals = a.getValues(context, readerContext);
-		FunctionValues aVals = a.getValues(context, readerContext);
-//JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues bVals = b.getValues(context, readerContext);
-		FunctionValues bVals = b.getValues(context, readerContext);
-		return new FloatDocValuesAnonymousInnerClassHelper(this, this, aVals, bVals);
-	  }
+        public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
+        {
+            FunctionValues aVals = a.GetValues(context, readerContext);
+            FunctionValues bVals = b.GetValues(context, readerContext);
+            return new FloatDocValuesAnonymousInnerClassHelper(this, this, aVals, bVals);
+        }
 
-	  private class FloatDocValuesAnonymousInnerClassHelper : FloatDocValues
-	  {
-		  private readonly DualFloatFunction outerInstance;
+        private class FloatDocValuesAnonymousInnerClassHelper : FloatDocValues
+        {
+            private readonly DualFloatFunction outerInstance;
 
-		  private FunctionValues aVals;
-		  private FunctionValues bVals;
+            private readonly FunctionValues aVals;
+            private readonly FunctionValues bVals;
 
-		  public FloatDocValuesAnonymousInnerClassHelper(DualFloatFunction outerInstance, DualFloatFunction this, FunctionValues aVals, FunctionValues bVals) : base(this)
-		  {
-			  this.outerInstance = outerInstance;
-			  this.aVals = aVals;
-			  this.bVals = bVals;
-		  }
+            public FloatDocValuesAnonymousInnerClassHelper(DualFloatFunction outerInstance, DualFloatFunction @this, FunctionValues aVals, FunctionValues bVals)
+                : base(@this)
+            {
+                this.outerInstance = outerInstance;
+                this.aVals = aVals;
+                this.bVals = bVals;
+            }
 
-		  public override float floatVal(int doc)
-		  {
-			return outerInstance.func(doc, aVals, bVals);
-		  }
+            public override float FloatVal(int doc)
+            {
+                return outerInstance.Func(doc, aVals, bVals);
+            }
 
-		  public override string ToString(int doc)
-		  {
-			return outerInstance.name() + '(' + aVals.ToString(doc) + ',' + bVals.ToString(doc) + ')';
-		  }
-	  }
+            public override string ToString(int doc)
+            {
+                return outerInstance.Name + '(' + aVals.ToString(doc) + ',' + bVals.ToString(doc) + ')';
+            }
+        }
 
-//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
-	  {
-		a.createWeight(context,searcher);
-		b.createWeight(context,searcher);
-	  }
+        public override void CreateWeight(IDictionary context, IndexSearcher searcher)
+        {
+            a.CreateWeight(context, searcher);
+            b.CreateWeight(context, searcher);
+        }
 
-	  public override int GetHashCode()
-	  {
-		int h = a.GetHashCode();
-		h ^= (h << 13) | ((int)((uint)h >> 20));
-		h += b.GetHashCode();
-		h ^= (h << 23) | ((int)((uint)h >> 10));
-		h += name().GetHashCode();
-		return h;
-	  }
-
-	  public override bool Equals(object o)
-	  {
-		if (this.GetType() != o.GetType())
-		{
-			return false;
-		}
-		DualFloatFunction other = (DualFloatFunction)o;
-		return this.a.Equals(other.a) && this.b.Equals(other.b);
-	  }
-	}
+        public override int GetHashCode()
+        {
+            int h = a.GetHashCode();
+            h ^= (h << 13) | ((int)((uint)h >> 20));
+            h += b.GetHashCode();
+            h ^= (h << 23) | ((int)((uint)h >> 10));
+            h += Name.GetHashCode();
+            return h;
+        }
 
+        public override bool Equals(object o)
+        {
+            var other = o as DualFloatFunction;
+            if (other == null)
+            {
+                return false;
+            }
+            return this.a.Equals(other.a) && this.b.Equals(other.b);
+        }
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 a7fe04c..ada4ecb 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/EnumFieldSource.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
+using System.Globalization;
+using Lucene.Net.Index;
+using Lucene.Net.Queries.Function.DocValues;
+using Lucene.Net.Search;
+using Lucene.Net.Util;
+using Lucene.Net.Util.Mutable;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -26,13 +30,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
     /// <summary>
 	/// Obtains int field values from <seealso cref="FieldCache#getInts"/> and makes
 	/// those values available as other numeric types, casting as needed.
-	/// strVal of the value is not the int value, but its string (displayed) value
+	/// StrVal of the value is not the int value, but its string (displayed) value
 	/// </summary>
 	public class EnumFieldSource : FieldCacheSource
 	{
-	  internal const int? DEFAULT_VALUE = -1;
+	  internal const int DEFAULT_VALUE = -1;
 
-	  internal readonly FieldCache.IntParser parser;
+	  internal readonly FieldCache_Fields.IntParser parser;
 	  internal readonly IDictionary<int?, string> enumIntToStringMap;
 	  internal readonly IDictionary<string, int?> enumStringToIntMap;
 
@@ -43,20 +47,20 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		this.enumStringToIntMap = enumStringToIntMap;
 	  }
 
-	  private static int? tryParseInt(string valueStr)
+	  private static int? TryParseInt(string valueStr)
 	  {
 		int? intValue = null;
 		try
 		{
 		  intValue = Convert.ToInt32(valueStr);
 		}
-		catch (NumberFormatException)
+		catch (FormatException)
 		{
 		}
 		return intValue;
 	  }
 
-	  private string intValueToStringValue(int? intVal)
+	  private string IntValueToStringValue(int? intVal)
 	  {
 		if (intVal == null)
 		{
@@ -71,10 +75,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		  return enumString;
 		}
 		// can't find matching enum name - return DEFAULT_VALUE.toString()
-		return DEFAULT_VALUE.ToString();
+		return DEFAULT_VALUE.ToString(CultureInfo.InvariantCulture);
 	  }
 
-	  private int? stringValueToIntValue(string stringVal)
+	  private int? StringValueToIntValue(string stringVal)
 	  {
 		if (stringVal == null)
 		{
@@ -91,7 +95,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		}
 
 		//enum int not found for string
-		intValue = tryParseInt(stringVal);
+		intValue = TryParseInt(stringVal);
 		if (intValue == null) //not Integer
 		{
 		  intValue = DEFAULT_VALUE;
@@ -114,8 +118,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.search.FieldCache.Ints arr = cache.getInts(readerContext.reader(), field, parser, true);
@@ -144,7 +148,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 		  internal readonly MutableValueInt val;
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
 			return (float) arr.get(doc);
 		  }
@@ -154,17 +158,17 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			return arr.get(doc);
 		  }
 
-		  public override long longVal(int doc)
+		  public override long LongVal(int doc)
 		  {
 			return (long) arr.get(doc);
 		  }
 
-		  public override double doubleVal(int doc)
+		  public override double DoubleVal(int doc)
 		  {
 			return (double) arr.get(doc);
 		  }
 
-		  public override string strVal(int doc)
+		  public override string StrVal(int doc)
 		  {
 			int? intValue = arr.get(doc);
 			return outerInstance.intValueToStringValue(intValue);
@@ -182,14 +186,14 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 		  public override string ToString(int doc)
 		  {
-			return outerInstance.description() + '=' + strVal(doc);
+			return outerInstance.description() + '=' + StrVal(doc);
 		  }
 
 
-		  public override ValueSourceScorer getRangeScorer(IndexReader reader, string lowerVal, string upperVal, bool includeLower, bool includeUpper)
+		  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.StringValueToIntValue(lowerVal);
+			int? upper = outerInstance.StringValueToIntValue(upperVal);
 
 			// instead of using separate comparison functions, adjust the endpoints.
 
@@ -241,7 +245,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 				  this.uu = uu;
 			  }
 
-			  public override bool matchesValue(int doc)
+			  public override bool MatchesValue(int doc)
 			  {
 				int val = outerInstance.arr.get(doc);
 				// only check for deleted if it's the default value

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 ab76bfa..0d9b7ad 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs
@@ -15,60 +15,60 @@
  * limitations under the License.
  */
 
+using Lucene.Net.Search;
+
 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"/>.
-	/// 
-	/// 
-	/// </summary>
-	public abstract class FieldCacheSource : ValueSource
-	{
-	  protected internal readonly string field;
-	  protected internal readonly FieldCache cache = FieldCache.DEFAULT;
-
-	  public FieldCacheSource(string field)
-	  {
-		this.field = field;
-	  }
-
-	  public virtual FieldCache FieldCache
-	  {
-		  get
-		  {
-			return cache;
-		  }
-	  }
+    /// A base class for ValueSource implementations that retrieve values for
+    /// a single field from the <seealso cref="org.apache.lucene.search.FieldCache"/>.
+    /// 
+    /// 
+    /// </summary>
+    public abstract class FieldCacheSource : ValueSource
+    {
+        protected internal readonly string field;
+        protected internal readonly FieldCache cache = FieldCache_Fields.DEFAULT;
 
-	  public virtual string Field
-	  {
-		  get
-		  {
-			return field;
-		  }
-	  }
+        public FieldCacheSource(string field)
+        {
+            this.field = field;
+        }
 
-	  public override string description()
-	  {
-		return field;
-	  }
+        public virtual FieldCache FieldCache
+        {
+            get
+            {
+                return cache;
+            }
+        }
 
-	  public override bool Equals(object o)
-	  {
-		if (!(o is FieldCacheSource))
-		{
-			return false;
-		}
-		FieldCacheSource other = (FieldCacheSource)o;
-		return this.field.Equals(other.field) && this.cache == other.cache;
-	  }
+        public virtual string Field
+        {
+            get
+            {
+                return field;
+            }
+        }
 
-	  public override int GetHashCode()
-	  {
-		return cache.GetHashCode() + field.GetHashCode();
-	  }
+        public override string Description
+        {
+            get { return field; }
+        }
 
-	}
+        public override bool Equals(object o)
+        {
+            var other = o as FieldCacheSource;
+            if (other == null)
+            {
+                return false;
+            }
+            return field.Equals(other.field) && cache == other.cache;
+        }
 
+        public override int GetHashCode()
+        {
+            return cache.GetHashCode() + field.GetHashCode();
+        }
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 a40f119..023b12a 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -44,8 +44,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.search.FieldCache.Floats arr = cache.getFloats(readerContext.reader(), field, parser, true);
@@ -71,7 +71,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.valid = valid;
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
 			return arr.get(doc);
 		  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 38532e2..80035fd 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Search.Similarities;
 using org.apache.lucene.queries.function;
 
 namespace Lucene.Net.Queries.Function.ValueSources
@@ -40,8 +41,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 		IndexSearcher searcher = (IndexSearcher)context["searcher"];
 		TFIDFSimilarity sim = asTFIDF(searcher.Similarity, field);
@@ -55,7 +56,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 	  // tries extra hard to cast the sim to TFIDFSimilarity
-	  internal static TFIDFSimilarity asTFIDF(Similarity sim, string field)
+	  internal static TFIDFSimilarity AsTFIDF(Similarity sim, string field)
 	  {
 		while (sim is PerFieldSimilarityWrapper)
 		{

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 8fee427..692dae1 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs
@@ -38,18 +38,18 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues ifVals = ifSource.getValues(context, readerContext);
-		FunctionValues ifVals = ifSource.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues ifVals = ifSource.GetValues(context, readerContext);
+		FunctionValues ifVals = ifSource.GetValues(context, readerContext);
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues trueVals = trueSource.getValues(context, readerContext);
-		FunctionValues trueVals = trueSource.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues trueVals = trueSource.GetValues(context, readerContext);
+		FunctionValues trueVals = trueSource.GetValues(context, readerContext);
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues falseVals = falseSource.getValues(context, readerContext);
-		FunctionValues falseVals = falseSource.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues falseVals = falseSource.GetValues(context, readerContext);
+		FunctionValues falseVals = falseSource.GetValues(context, readerContext);
 
 		return new FunctionValuesAnonymousInnerClassHelper(this, ifVals, trueVals, falseVals);
 
@@ -71,19 +71,19 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.falseVals = falseVals;
 		  }
 
-		  public override sbyte byteVal(int doc)
+		  public override sbyte ByteVal(int doc)
 		  {
-			return ifVals.boolVal(doc) ? trueVals.byteVal(doc) : falseVals.byteVal(doc);
+			return ifVals.boolVal(doc) ? trueVals.ByteVal(doc) : falseVals.ByteVal(doc);
 		  }
 
-		  public override short shortVal(int doc)
+		  public override short ShortVal(int doc)
 		  {
-			return ifVals.boolVal(doc) ? trueVals.shortVal(doc) : falseVals.shortVal(doc);
+			return ifVals.boolVal(doc) ? trueVals.ShortVal(doc) : falseVals.ShortVal(doc);
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
-			return ifVals.boolVal(doc) ? trueVals.floatVal(doc) : falseVals.floatVal(doc);
+			return ifVals.boolVal(doc) ? trueVals.FloatVal(doc) : falseVals.FloatVal(doc);
 		  }
 
 		  public override int intVal(int doc)
@@ -91,19 +91,19 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			return ifVals.boolVal(doc) ? trueVals.intVal(doc) : falseVals.intVal(doc);
 		  }
 
-		  public override long longVal(int doc)
+		  public override long LongVal(int doc)
 		  {
-			return ifVals.boolVal(doc) ? trueVals.longVal(doc) : falseVals.longVal(doc);
+			return ifVals.boolVal(doc) ? trueVals.LongVal(doc) : falseVals.LongVal(doc);
 		  }
 
-		  public override double doubleVal(int doc)
+		  public override double DoubleVal(int doc)
 		  {
-			return ifVals.boolVal(doc) ? trueVals.doubleVal(doc) : falseVals.doubleVal(doc);
+			return ifVals.boolVal(doc) ? trueVals.DoubleVal(doc) : falseVals.DoubleVal(doc);
 		  }
 
-		  public override string strVal(int doc)
+		  public override string StrVal(int doc)
 		  {
-			return ifVals.boolVal(doc) ? trueVals.strVal(doc) : falseVals.strVal(doc);
+			return ifVals.boolVal(doc) ? trueVals.StrVal(doc) : falseVals.StrVal(doc);
 		  }
 
 		  public override bool boolVal(int doc)
@@ -166,12 +166,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
-		ifSource.createWeight(context, searcher);
-		trueSource.createWeight(context, searcher);
-		falseSource.createWeight(context, searcher);
+		ifSource.CreateWeight(context, searcher);
+		trueSource.CreateWeight(context, searcher);
+		falseSource.CreateWeight(context, searcher);
 	  }
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 5ed7345..63a8e31 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs
@@ -16,8 +16,8 @@
  */
 using System;
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -45,8 +45,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.search.FieldCache.Ints arr = cache.getInts(readerContext.reader(), field, parser, true);
@@ -75,7 +75,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 		  internal readonly MutableValueInt val;
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
 			return (float)arr.get(doc);
 		  }
@@ -85,17 +85,17 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			return arr.get(doc);
 		  }
 
-		  public override long longVal(int doc)
+		  public override long LongVal(int doc)
 		  {
 			return (long)arr.get(doc);
 		  }
 
-		  public override double doubleVal(int doc)
+		  public override double DoubleVal(int doc)
 		  {
 			return (double)arr.get(doc);
 		  }
 
-		  public override string strVal(int doc)
+		  public override string StrVal(int doc)
 		  {
 			return Convert.ToString(arr.get(doc));
 		  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 3319eda..ba9572f 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
@@ -16,8 +16,8 @@
  */
 using System;
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -44,8 +44,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.index.BinaryDocValues terms = cache.getTerms(readerContext.reader(), field, false, org.apache.lucene.util.packed.PackedInts.FAST);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 7924547..bf92522 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -47,12 +47,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues vals = source.getValues(context, readerContext);
-		FunctionValues vals = source.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues vals = source.GetValues(context, readerContext);
+		FunctionValues vals = source.GetValues(context, readerContext);
 		return new FloatDocValuesAnonymousInnerClassHelper(this, this, vals);
 	  }
 
@@ -68,9 +68,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.vals = vals;
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
-			return vals.floatVal(doc) * outerInstance.slope + outerInstance.intercept;
+			return vals.FloatVal(doc) * outerInstance.slope + outerInstance.intercept;
 		  }
 		  public override string ToString(int doc)
 		  {
@@ -79,17 +79,17 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
-		source.createWeight(context, searcher);
+		source.CreateWeight(context, searcher);
 	  }
 
 	  public override int GetHashCode()
 	  {
-		int h = float.floatToIntBits(slope);
+		int h = Number.FloatToIntBits(slope);
 		h = ((int)((uint)h >> 2)) | (h << 30);
-		h += float.floatToIntBits(intercept);
+		h += Number.FloatToIntBits(intercept);
 		h ^= (h << 14) | ((int)((uint)h >> 19));
 		return h + source.GetHashCode();
 	  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 4b91199..0b7bcea 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs
@@ -1,6 +1,6 @@
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -47,8 +47,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 
 		return new StrDocValuesAnonymousInnerClassHelper(this, this);
@@ -63,7 +63,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.outerInstance = outerInstance;
 		  }
 
-		  public override string strVal(int doc)
+		  public override string StrVal(int doc)
 		  {
 			return outerInstance.@string;
 		  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 00b902f..9216c48 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs
@@ -16,8 +16,8 @@
  */
 using System;
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -60,8 +60,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.search.FieldCache.Longs arr = cache.getLongs(readerContext.reader(), field, parser, true);
@@ -87,7 +87,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.valid = valid;
 		  }
 
-		  public override long longVal(int doc)
+		  public override long LongVal(int doc)
 		  {
 			return arr.get(doc);
 		  }
@@ -102,7 +102,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			return valid.get(doc) ? outerInstance.longToObject(arr.get(doc)) : null;
 		  }
 
-		  public override string strVal(int doc)
+		  public override string StrVal(int doc)
 		  {
 			return valid.get(doc) ? outerInstance.longToString(arr.get(doc)) : null;
 		  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 0d65888..be0e939 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs
@@ -40,15 +40,15 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
 		context["searcher"] = searcher;
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 		IndexSearcher searcher = (IndexSearcher)context["searcher"];
 		return new ConstIntDocValues(searcher.IndexReader.maxDoc(), this);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 ba86891..417c4ba 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		float val = float.NegativeInfinity;
 		foreach (FunctionValues vals in valsArr)
 		{
-		  val = Math.Max(vals.floatVal(doc), val);
+		  val = Math.Max(vals.FloatVal(doc), val);
 		}
 		return val;
 	  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 8905f5b..9457ee1 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		float val = float.PositiveInfinity;
 		foreach (FunctionValues vals in valsArr)
 		{
-		  val = Math.Min(vals.floatVal(doc), val);
+		  val = Math.Min(vals.FloatVal(doc), val);
 		}
 		return val;
 	  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 5419e47..7e44df3 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs
@@ -17,8 +17,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -41,8 +41,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  protected internal abstract bool func(int doc, FunctionValues[] vals);
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.docvalues.BoolDocValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override BoolDocValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.docvalues.BoolDocValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override BoolDocValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues[] vals = new org.apache.lucene.queries.function.FunctionValues[sources.size()];
@@ -50,7 +50,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		int i = 0;
 		foreach (ValueSource source in sources)
 		{
-		  vals[i++] = source.getValues(context, readerContext);
+		  vals[i++] = source.GetValues(context, readerContext);
 		}
 
 		return new BoolDocValuesAnonymousInnerClassHelper(this, this, vals);
@@ -130,12 +130,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
 		foreach (ValueSource source in sources)
 		{
-		  source.createWeight(context, searcher);
+		  source.CreateWeight(context, searcher);
 		}
 	  }
 	}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 a32c2c0..98678c9 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Text;
-using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
+using Lucene.Net.Queries.Function.DocValues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -60,15 +59,15 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues[] valsArr = new org.apache.lucene.queries.function.FunctionValues[sources.length];
 		FunctionValues[] valsArr = new FunctionValues[sources.Length];
 		for (int i = 0; i < sources.Length; i++)
 		{
-		  valsArr[i] = sources[i].getValues(context, readerContext);
+		  valsArr[i] = sources[i].GetValues(context, readerContext);
 		}
 
 		return new FloatDocValuesAnonymousInnerClassHelper(this, this, valsArr);
@@ -86,7 +85,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.valsArr = valsArr;
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
 			return outerInstance.func(doc, valsArr);
 		  }
@@ -113,12 +112,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
 		foreach (ValueSource source in sources)
 		{
-		  source.createWeight(context, searcher);
+		  source.CreateWeight(context, searcher);
 		}
 	  }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 91a13fb..e45c77f 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFunction.cs
@@ -1,156 +1,140 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using org.apache.lucene.queries.function;
+using Lucene.Net.Index;
+using Lucene.Net.Search;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
-	/*
-	 * Licensed to the Apache Software Foundation (ASF) under one or more
-	 * contributor license agreements.  See the NOTICE file distributed with
-	 * this work for additional information regarding copyright ownership.
-	 * The ASF licenses this file to You under the Apache License, Version 2.0
-	 * (the "License"); you may not use this file except in compliance with
-	 * the License.  You may obtain a copy of the License at
-	 *
-	 *     http://www.apache.org/licenses/LICENSE-2.0
-	 *
-	 * Unless required by applicable law or agreed to in writing, software
-	 * distributed under the License is distributed on an "AS IS" BASIS,
-	 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	 * See the License for the specific language governing permissions and
-	 * limitations under the License.
-	 */
+    /*
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements.  See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * 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.
-	/// </summary>
-	public abstract class MultiFunction : ValueSource
-	{
-	  protected internal readonly IList<ValueSource> sources;
-
-	  public MultiFunction(IList<ValueSource> sources)
-	  {
-		this.sources = sources;
-	  }
-
-	  protected internal abstract string name();
-
-	  public override string description()
-	  {
-		return description(name(), sources);
-	  }
-
-	  public static string description(string name, IList<ValueSource> sources)
-	  {
-		StringBuilder sb = new StringBuilder();
-		sb.Append(name).Append('(');
-		bool firstTime = true;
-		foreach (ValueSource source in sources)
-		{
-		  if (firstTime)
-		  {
-			firstTime = false;
-		  }
-		  else
-		  {
-			sb.Append(',');
-		  }
-		  sb.Append((object) source);
-		}
-		sb.Append(')');
-		return sb.ToString();
-	  }
-
-//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: public static org.apache.lucene.queries.function.FunctionValues[] valsArr(java.util.List<org.apache.lucene.queries.function.ValueSource> sources, java.util.Map fcontext, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public static FunctionValues[] valsArr(IList<ValueSource> sources, IDictionary fcontext, AtomicReaderContext readerContext)
-	  {
-//JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues[] valsArr = new org.apache.lucene.queries.function.FunctionValues[sources.size()];
-		FunctionValues[] valsArr = new FunctionValues[sources.Count];
-		int i = 0;
-		foreach (ValueSource source in sources)
-		{
-		  valsArr[i++] = source.getValues(fcontext, readerContext);
-		}
-		return valsArr;
-	  }
-
-	  public class Values : FunctionValues
-	  {
-		  private readonly MultiFunction outerInstance;
-
-		internal readonly FunctionValues[] valsArr;
-
-		public Values(MultiFunction outerInstance, FunctionValues[] valsArr)
-		{
-			this.outerInstance = outerInstance;
-		  this.valsArr = valsArr;
-		}
-
-		public override string ToString(int doc)
-		{
-		  return MultiFunction.ToString(outerInstance.name(), valsArr, doc);
-		}
-
-		public override ValueFiller ValueFiller
-		{
-			get
-			{
-			  // TODO: need ValueSource.type() to determine correct type
-			  return base.ValueFiller;
-			}
-		}
-	  }
-
-
-	  public static string ToString(string name, FunctionValues[] valsArr, int doc)
-	  {
-		StringBuilder sb = new StringBuilder();
-		sb.Append(name).Append('(');
-		bool firstTime = true;
-		foreach (FunctionValues vals in valsArr)
-		{
-		  if (firstTime)
-		  {
-			firstTime = false;
-		  }
-		  else
-		  {
-			sb.Append(',');
-		  }
-		  sb.Append(vals.ToString(doc));
-		}
-		sb.Append(')');
-		return sb.ToString();
-	  }
-
-//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
-	  {
-		foreach (ValueSource source in sources)
-		{
-		  source.createWeight(context, searcher);
-		}
-	  }
-
-	  public override int GetHashCode()
-	  {
-		return sources.GetHashCode() + name().GetHashCode();
-	  }
-
-	  public override bool Equals(object o)
-	  {
-		if (this.GetType() != o.GetType())
-		{
-			return false;
-		}
-		MultiFunction other = (MultiFunction)o;
-		return this.sources.Equals(other.sources);
-	  }
-	}
-
-
+    /// Abstract parent class for <seealso cref="ValueSource"/> implementations that wrap multiple
+    /// ValueSources and apply their own logic.
+    /// </summary>
+    public abstract class MultiFunction : ValueSource
+    {
+        protected internal readonly IList<ValueSource> sources;
+
+        public MultiFunction(IList<ValueSource> sources)
+        {
+            this.sources = sources;
+        }
+
+        protected abstract string Name { get; }
+
+        public override string Description
+        {
+            get { return GetDescription(Name, sources); }
+        }
+
+        public static string GetDescription(string name, IList<ValueSource> sources)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(name).Append('(');
+            bool firstTime = true;
+            foreach (ValueSource source in sources)
+            {
+                if (firstTime)
+                {
+                    firstTime = false;
+                }
+                else
+                {
+                    sb.Append(',');
+                }
+                sb.Append((object)source);
+            }
+            sb.Append(')');
+            return sb.ToString();
+        }
+
+        public static FunctionValues[] ValsArr(IList<ValueSource> sources, IDictionary fcontext, AtomicReaderContext readerContext)
+        {
+            var valsArr = new FunctionValues[sources.Count];
+            int i = 0;
+            foreach (var source in sources)
+            {
+                valsArr[i++] = source.GetValues(fcontext, readerContext);
+            }
+            return valsArr;
+        }
+
+        public class Values : FunctionValues
+        {
+            private readonly MultiFunction outerInstance;
+
+            internal readonly FunctionValues[] valsArr;
+
+            public Values(MultiFunction outerInstance, FunctionValues[] valsArr)
+            {
+                this.outerInstance = outerInstance;
+                this.valsArr = valsArr;
+            }
+
+            public override string ToString(int doc)
+            {
+                return MultiFunction.ToString(outerInstance.Name, valsArr, doc);
+            }
+        }
+
+
+        public static string ToString(string name, FunctionValues[] valsArr, int doc)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(name).Append('(');
+            bool firstTime = true;
+            foreach (FunctionValues vals in valsArr)
+            {
+                if (firstTime)
+                {
+                    firstTime = false;
+                }
+                else
+                {
+                    sb.Append(',');
+                }
+                sb.Append(vals.ToString(doc));
+            }
+            sb.Append(')');
+            return sb.ToString();
+        }
+
+        public override void CreateWeight(IDictionary context, IndexSearcher searcher)
+        {
+            foreach (ValueSource source in sources)
+            {
+                source.CreateWeight(context, searcher);
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return sources.GetHashCode() + Name.GetHashCode();
+        }
+
+        public override bool Equals(object o)
+        {
+            if (this.GetType() != o.GetType())
+            {
+                return false;
+            }
+            var other = (MultiFunction)o;
+            return this.sources.Equals(other.sources);
+        }
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 babb01f..a948905 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -48,15 +48,15 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
 		context["searcher"] = searcher;
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 		IndexSearcher searcher = (IndexSearcher)context["searcher"];
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
@@ -92,7 +92,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.norms = norms;
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
 			return similarity.decodeNormValue(norms.get(doc));
 		  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 3a9014a..ea30074 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs
@@ -38,8 +38,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 		// Searcher has no numdocs so we must use the reader instead
 		return new ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader().numDocs(), this);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 4828d86..8a46432 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/OrdFieldSource.cs
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -56,8 +56,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 	  // TODO: this is trappy? perhaps this query instead should make you pass a slow reader yourself?
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final int off = readerContext.docBase;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 ec1be2a..da8c3bc 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 	  protected internal override float func(int doc, FunctionValues aVals, FunctionValues bVals)
 	  {
-		return (float)Math.Pow(aVals.floatVal(doc), bVals.floatVal(doc));
+		return (float)Math.Pow(aVals.FloatVal(doc), bVals.FloatVal(doc));
 	  }
 	}
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 85fb92b..2a21615 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
 		float val = 1.0f;
 		foreach (FunctionValues vals in valsArr)
 		{
-		  val *= vals.floatVal(doc);
+		  val *= vals.FloatVal(doc);
 		}
 		return val;
 	  }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 8ff11cb..2949747 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs
@@ -16,8 +16,8 @@
  */
 using System;
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -56,8 +56,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map fcontext, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary fcontext, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map fcontext, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary fcontext, AtomicReaderContext readerContext)
 	  {
 		return new QueryDocValues(this, readerContext, fcontext);
 	  }
@@ -78,8 +78,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
 		Weight w = searcher.createNormalizedWeight(q);
 		context[this] = w;
@@ -132,13 +132,13 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext));
 			}
 		  }
-		  vs.createWeight(fcontext, weightSearcher);
+		  vs.CreateWeight(fcontext, weightSearcher);
 		  w = (Weight)fcontext[vs];
 		}
 		weight = w;
 	  }
 
-	  public override float floatVal(int doc)
+	  public override float FloatVal(int doc)
 	  {
 		try
 		{
@@ -313,7 +313,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 + ")=" + FloatVal(doc);
 	  }
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 b5993a7..de729df 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -55,18 +55,18 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues vals = source.getValues(context, readerContext);
-		FunctionValues vals = source.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues vals = source.GetValues(context, readerContext);
+		FunctionValues vals = source.GetValues(context, readerContext);
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues targets = target.getValues(context, readerContext);
-		FunctionValues targets = target.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues targets = target.GetValues(context, readerContext);
+		FunctionValues targets = target.GetValues(context, readerContext);
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues defaults = (this.defaultVal == null) ? null : defaultVal.getValues(context, readerContext);
-		FunctionValues defaults = (this.defaultVal == null) ? null : defaultVal.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues defaults = (this.defaultVal == null) ? null : defaultVal.GetValues(context, readerContext);
+		FunctionValues defaults = (this.defaultVal == null) ? null : defaultVal.GetValues(context, readerContext);
 		return new FloatDocValuesAnonymousInnerClassHelper(this, this, vals, targets, defaults);
 	  }
 
@@ -86,10 +86,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.defaults = defaults;
 		  }
 
-		  public override float floatVal(int doc)
+		  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));
+			float val = vals.FloatVal(doc);
+			return (val >= outerInstance.min && val <= outerInstance.max) ? targets.FloatVal(doc) : (outerInstance.defaultVal == null ? val : defaults.FloatVal(doc));
 		  }
 		  public override string ToString(int doc)
 		  {
@@ -98,19 +98,19 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
-		source.createWeight(context, searcher);
+		source.CreateWeight(context, searcher);
 	  }
 
 	  public override int GetHashCode()
 	  {
 		int h = source.GetHashCode();
 		h ^= (h << 10) | ((int)((uint)h >> 23));
-		h += float.floatToIntBits(min);
+		h += Number.FloatToIntBits(min);
 		h ^= (h << 14) | ((int)((uint)h >> 19));
-		h += float.floatToIntBits(max);
+		h += Number.FloatToIntBits(max);
 		h += target.GetHashCode();
 		if (defaultVal != null)
 		{

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 bcd0ebf..6a4a248 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs
@@ -16,8 +16,8 @@
  */
 using System;
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -61,12 +61,12 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
-//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues vals = source.getValues(context, readerContext);
-		FunctionValues vals = source.getValues(context, readerContext);
+//ORIGINAL LINE: final org.apache.lucene.queries.function.FunctionValues vals = source.GetValues(context, readerContext);
+		FunctionValues vals = source.GetValues(context, readerContext);
 		return new FloatDocValuesAnonymousInnerClassHelper(this, this, vals);
 	  }
 
@@ -82,9 +82,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
 			  this.vals = vals;
 		  }
 
-		  public override float floatVal(int doc)
+		  public override float FloatVal(int doc)
 		  {
-			return outerInstance.a / (outerInstance.m * vals.floatVal(doc) + outerInstance.b);
+			return outerInstance.a / (outerInstance.m * vals.FloatVal(doc) + outerInstance.b);
 		  }
 		  public override string ToString(int doc)
 		  {
@@ -93,10 +93,10 @@ namespace Lucene.Net.Queries.Function.ValueSources
 	  }
 
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public void createWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
-	  public override void createWeight(IDictionary context, IndexSearcher searcher)
+//ORIGINAL LINE: @Override public void CreateWeight(java.util.Map context, org.apache.lucene.search.IndexSearcher searcher) throws java.io.IOException
+	  public override void CreateWeight(IDictionary context, IndexSearcher searcher)
 	  {
-		source.createWeight(context, searcher);
+		source.CreateWeight(context, searcher);
 	  }
 
 	  public override string description()
@@ -106,9 +106,9 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 	  public override int GetHashCode()
 	  {
-		int h = float.floatToIntBits(a) + float.floatToIntBits(m);
+		int h = Number.FloatToIntBits(a) + Number.FloatToIntBits(m);
 		h ^= (h << 13) | ((int)((uint)h >> 20));
-		return h + (float.floatToIntBits(b)) + source.GetHashCode();
+		return h + (Number.FloatToIntBits(b)) + source.GetHashCode();
 	  }
 
 	  public override bool Equals(object o)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ba0f3c7d/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 6628ea0..7a67668 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 using System.Collections;
+using Lucene.Net.Queries.Function.DocValues;
 using org.apache.lucene.queries.function;
-using org.apache.lucene.queries.function.docvalues;
 
 namespace Lucene.Net.Queries.Function.ValueSources
 {
@@ -58,8 +58,8 @@ namespace Lucene.Net.Queries.Function.ValueSources
 
 	  // TODO: this is trappy? perhaps this query instead should make you pass a slow reader yourself?
 //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
-//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues getValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
-	  public override FunctionValues getValues(IDictionary context, AtomicReaderContext readerContext)
+//ORIGINAL LINE: @Override public org.apache.lucene.queries.function.FunctionValues GetValues(java.util.Map context, org.apache.lucene.index.AtomicReaderContext readerContext) throws java.io.IOException
+	  public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext)
 	  {
 //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
 //ORIGINAL LINE: final org.apache.lucene.index.IndexReader topReader = org.apache.lucene.index.ReaderUtil.getTopLevelContext(readerContext).reader();


Mime
View raw message