lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [Lucene.Net] svn commit: r1167605 [1/2] - in /incubator/lucene.net/branches/Lucene.Net_2_9_4g: src/contrib/SpellChecker/Spell/ src/core/Search/ test/contrib/Analyzers/Miscellaneous/ test/contrib/IsolatedStorage/ test/contrib/Queries/ test/contrib/Spatial/ test/core...
Date Sat, 10 Sep 2011 21:00:00 GMT
Author: digy
Date: Sat Sep 10 20:59:58 2011
New Revision: 1167605

URL: http://svn.apache.org/viewvc?rev=1167605&view=rev
Log:
Not a big change as it seems to be.
ScoreDoc.doc -> ScoreDoc.Doc
ScoreDoc.score -> ScoreDoc.Score

Modified:
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldDocSortedHitQueue.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/HitQueue.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Hits.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/MultiSearcher.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ParallelMultiSearcher.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDoc.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDocComparator.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SortComparator.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopDocCollector.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopFieldDocCollector.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopScoreDocCollector.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Miscellaneous/ChainedFilterTest.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/IsolatedStorage/TestIsolatedStorageDirectory.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Queries/FuzzyLikeThisQueryTest.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/TestCartesian.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Document/TestDocument.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestBackwardsCompatibility.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReaderReopen.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestParallelReader.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/CheckHits.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestCustomScoreQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestFieldScoreQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestOrdValues.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestBoostingTermQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadNearQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadTermQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/SampleComparable.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/TestSpansAdvanced.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestBooleanMinShouldMatch.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestCustomSearcherSort.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDateSort.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDisjunctionMaxQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFilteredQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFuzzyQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMatchAllDocsQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcher.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcherRanking.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiTermConstantScore.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery32.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery64.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPhraseQuery.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPositiveScoresOnlyCollector.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSimpleExplanations.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSort.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestStressSort.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTermVectors.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopDocsCollector.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopScoreDocCollector.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestWildcard.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestDemo.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearch.cs
    incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearchForDuplicates.cs

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs Sat Sep 10 20:59:58 2011
@@ -263,7 +263,7 @@ namespace SpellChecker.Net.Search.Spell
                 for (int i = 0; i < stop; i++)
                 {
 
-                    sugWord.string_Renamed = indexSearcher.Doc(hits[i].doc).Get(F_WORD); // get orig word
+                    sugWord.string_Renamed = indexSearcher.Doc(hits[i].Doc).Get(F_WORD); // get orig word
 
                     // don't suggest a word for itself, that would be silly
                     if (sugWord.string_Renamed.Equals(word))

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldDocSortedHitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldDocSortedHitQueue.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldDocSortedHitQueue.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldDocSortedHitQueue.cs Sat Sep 10 20:59:58 2011
@@ -246,7 +246,7 @@ namespace Lucene.Net.Search
 			
 			// avoid random sort order that could lead to duplicates (bug #31241):
 			if (c == 0)
-				return docA.doc > docB.doc;
+				return docA.Doc > docB.Doc;
 			
 			return c > 0;
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/FieldSortedHitQueue.cs Sat Sep 10 20:59:58 2011
@@ -125,8 +125,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				int fi = fieldOrder[i.doc];
-				int fj = fieldOrder[j.doc];
+				int fi = fieldOrder[i.Doc];
+				int fj = fieldOrder[j.Doc];
 				if (fi < fj)
 					return - 1;
 				if (fi > fj)
@@ -136,7 +136,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return (sbyte) fieldOrder[i.doc];
+				return (sbyte) fieldOrder[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -158,8 +158,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				int fi = fieldOrder[i.doc];
-				int fj = fieldOrder[j.doc];
+				int fi = fieldOrder[i.Doc];
+				int fj = fieldOrder[j.Doc];
 				if (fi < fj)
 					return - 1;
 				if (fi > fj)
@@ -169,7 +169,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return (short) fieldOrder[i.doc];
+				return (short) fieldOrder[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -191,8 +191,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				int fi = fieldOrder[i.doc];
-				int fj = fieldOrder[j.doc];
+				int fi = fieldOrder[i.Doc];
+				int fj = fieldOrder[j.Doc];
 				if (fi < fj)
 					return - 1;
 				if (fi > fj)
@@ -202,7 +202,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return (System.Int32) fieldOrder[i.doc];
+				return (System.Int32) fieldOrder[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -224,8 +224,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				long li = fieldOrder[i.doc];
-				long lj = fieldOrder[j.doc];
+				long li = fieldOrder[i.Doc];
+				long lj = fieldOrder[j.Doc];
 				if (li < lj)
 					return - 1;
 				if (li > lj)
@@ -235,7 +235,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return (long) fieldOrder[i.doc];
+				return (long) fieldOrder[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -257,8 +257,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				float fi = fieldOrder[i.doc];
-				float fj = fieldOrder[j.doc];
+				float fi = fieldOrder[i.Doc];
+				float fj = fieldOrder[j.Doc];
 				if (fi < fj)
 					return - 1;
 				if (fi > fj)
@@ -268,7 +268,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return (float) fieldOrder[i.doc];
+				return (float) fieldOrder[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -290,8 +290,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				double di = fieldOrder[i.doc];
-				double dj = fieldOrder[j.doc];
+				double di = fieldOrder[i.Doc];
+				double dj = fieldOrder[j.Doc];
 				if (di < dj)
 					return - 1;
 				if (di > dj)
@@ -301,7 +301,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return (double) fieldOrder[i.doc];
+				return (double) fieldOrder[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -323,8 +323,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				int fi = index.Order[i.doc];
-				int fj = index.Order[j.doc];
+				int fi = index.Order[i.Doc];
+				int fj = index.Order[j.Doc];
 				if (fi < fj)
 					return - 1;
 				if (fi > fj)
@@ -334,7 +334,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return index.Lookup[index.Order[i.doc]];
+				return index.Lookup[index.Order[i.Doc]];
 			}
 			
 			public virtual int SortType()
@@ -358,8 +358,8 @@ namespace Lucene.Net.Search
 			
 			public int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				System.String is_Renamed = index[i.doc];
-				System.String js = index[j.doc];
+				System.String is_Renamed = index[i.Doc];
+				System.String js = index[j.Doc];
 				if ((System.Object) is_Renamed == (System.Object) js)
 				{
 					return 0;
@@ -380,7 +380,7 @@ namespace Lucene.Net.Search
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return index[i.doc];
+				return index[i.Doc];
 			}
 			
 			public virtual int SortType()
@@ -446,7 +446,7 @@ namespace Lucene.Net.Search
 		// Update maxscore.
 		private void  UpdateMaxScore(FieldDoc fdoc)
 		{
-			maxscore = System.Math.Max(maxscore, fdoc.score);
+			maxscore = System.Math.Max(maxscore, fdoc.Score);
 		}
 		
 		// The signature of this method takes a FieldDoc in order to avoid
@@ -494,7 +494,7 @@ namespace Lucene.Net.Search
 			}
 			// avoid random sort order that could lead to duplicates (bug #31241):
 			if (c == 0)
-				return docA.doc > docB.doc;
+				return docA.Doc > docB.Doc;
 			return c > 0;
 		}
 		

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/HitQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/HitQueue.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/HitQueue.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/HitQueue.cs Sat Sep 10 20:59:58 2011
@@ -83,10 +83,10 @@ namespace Lucene.Net.Search
 
         public override bool LessThan(ScoreDoc hitA, ScoreDoc hitB)
 		{
-			if (hitA.score == hitB.score)
-				return hitA.doc > hitB.doc;
+			if (hitA.Score == hitB.Score)
+				return hitA.Doc > hitB.Doc;
 			else
-				return hitA.score < hitB.score;
+				return hitA.Score < hitB.Score;
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Hits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Hits.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Hits.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/Hits.cs Sat Sep 10 20:59:58 2011
@@ -145,7 +145,7 @@ namespace Lucene.Net.Search
 				for (int i1 = 0; i1 < hitDocs.Count && i2 < scoreDocs.Length; i1++)
 				{
 					int id1 = ((HitDoc) hitDocs[i1]).id;
-					int id2 = scoreDocs[i2].doc;
+					int id2 = scoreDocs[i2].Doc;
 					if (id1 == id2)
 					{
 						i2++;
@@ -162,7 +162,7 @@ namespace Lucene.Net.Search
 			length += nDeletedHits;
 			for (int i = start; i < end; i++)
 			{
-				hitDocs.Add(new HitDoc(scoreDocs[i].score * scoreNorm, scoreDocs[i].doc));
+				hitDocs.Add(new HitDoc(scoreDocs[i].Score * scoreNorm, scoreDocs[i].Doc));
 			}
 			
 			nDeletions = nDels2;

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/MultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/MultiSearcher.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/MultiSearcher.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/MultiSearcher.cs Sat Sep 10 20:59:58 2011
@@ -278,7 +278,7 @@ namespace Lucene.Net.Search
 				{
 					// merge scoreDocs into hq
 					ScoreDoc scoreDoc = scoreDocs[j];
-					scoreDoc.doc += starts[i]; // convert doc
+					scoreDoc.Doc += starts[i]; // convert doc
 					if (!hq.Insert(scoreDoc))
 						break; // no more scores > minScore
 				}
@@ -289,7 +289,7 @@ namespace Lucene.Net.Search
 			// put docs in array
 				scoreDocs2[i] = (ScoreDoc) hq.Pop();
 			
-			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs2[0].score;
+			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs2[0].Score;
 			
 			return new TopDocs(totalHits, scoreDocs2, maxScore);
 		}
@@ -330,7 +330,7 @@ namespace Lucene.Net.Search
 				{
 					// merge scoreDocs into hq
 					ScoreDoc scoreDoc = scoreDocs[j];
-					scoreDoc.doc += starts[i]; // convert doc
+					scoreDoc.Doc += starts[i]; // convert doc
 					if (!hq.Insert((FieldDoc)scoreDoc))
 						break; // no more scores > minScore
 				}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ParallelMultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ParallelMultiSearcher.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ParallelMultiSearcher.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ParallelMultiSearcher.cs Sat Sep 10 20:59:58 2011
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search
 			// put docs in array
 				scoreDocs[i] = (ScoreDoc) hq.Pop();
 			
-			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs[0].score;
+			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs[0].Score;
 			
 			return new TopDocs(totalHits, scoreDocs, maxScore);
 		}
@@ -317,7 +317,7 @@ namespace Lucene.Net.Search
 				{
 					// merge scoreDocs into hq
 					ScoreDoc scoreDoc = scoreDocs[j];
-					scoreDoc.doc += starts[i]; // convert doc 
+					scoreDoc.Doc += starts[i]; // convert doc 
 					//it would be so nice if we had a thread-safe insert 
 					lock (hq)
 					{

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDoc.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDoc.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDoc.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDoc.cs Sat Sep 10 20:59:58 2011
@@ -27,24 +27,24 @@ namespace Lucene.Net.Search
 	public class ScoreDoc
 	{
 		/// <summary>Expert: The score of this document for the query. </summary>
-		public float score;
+		public float Score;
 		
 		/// <summary>Expert: A hit document's number.</summary>
 		/// <seealso cref="Searcher.Doc(int)">
 		/// </seealso>
-		public int doc;
+		public int Doc;
 		
 		/// <summary>Expert: Constructs a ScoreDoc. </summary>
 		public ScoreDoc(int doc, float score)
 		{
-			this.doc = doc;
-			this.score = score;
+			this.Doc = doc;
+			this.Score = score;
 		}
 		
 		// A convenience method for debugging.
 		public override System.String ToString()
 		{
-			return "doc=" + doc + " score=" + score;
+			return "doc=" + Doc + " score=" + Score;
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDocComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDocComparator.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDocComparator.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/ScoreDocComparator.cs Sat Sep 10 20:59:58 2011
@@ -47,15 +47,15 @@ namespace Lucene.Net.Search
 	{
 		public virtual int Compare(ScoreDoc i, ScoreDoc j)
 		{
-			if (i.score > j.score)
+			if (i.Score > j.Score)
 				return - 1;
-			if (i.score < j.score)
+			if (i.Score < j.Score)
 				return 1;
 			return 0;
 		}
 		public virtual System.IComparable SortValue(ScoreDoc i)
 		{
-			return (float) i.score;
+			return (float) i.Score;
 		}
 		public virtual int SortType()
 		{
@@ -66,15 +66,15 @@ namespace Lucene.Net.Search
 	{
 		public virtual int Compare(ScoreDoc i, ScoreDoc j)
 		{
-			if (i.doc < j.doc)
+			if (i.Doc < j.Doc)
 				return - 1;
-			if (i.doc > j.doc)
+			if (i.Doc > j.Doc)
 				return 1;
 			return 0;
 		}
 		public virtual System.IComparable SortValue(ScoreDoc i)
 		{
-			return (System.Int32) i.doc;
+			return (System.Int32) i.Doc;
 		}
 		public virtual int SortType()
 		{

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SortComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SortComparator.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SortComparator.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/SortComparator.cs Sat Sep 10 20:59:58 2011
@@ -79,12 +79,12 @@ namespace Lucene.Net.Search
 			
 			public virtual int Compare(ScoreDoc i, ScoreDoc j)
 			{
-				return cachedValues[i.doc].CompareTo(cachedValues[j.doc]);
+				return cachedValues[i.Doc].CompareTo(cachedValues[j.Doc]);
 			}
 			
 			public virtual System.IComparable SortValue(ScoreDoc i)
 			{
-				return cachedValues[i.doc];
+				return cachedValues[i.Doc];
 			}
 			
 			public virtual int SortType()

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopDocCollector.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopDocCollector.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopDocCollector.cs Sat Sep 10 20:59:58 2011
@@ -81,13 +81,13 @@ namespace Lucene.Net.Search
 				{
 					reusableSD = new ScoreDoc(doc, score);
 				}
-				else if (score >= reusableSD.score)
+				else if (score >= reusableSD.Score)
 				{
 					// reusableSD holds the last "rejected" entry, so, if
 					// this new score is not better than that, there's no
 					// need to try inserting it
-					reusableSD.doc = doc;
-					reusableSD.score = score;
+					reusableSD.Doc = doc;
+					reusableSD.Score = score;
 				}
 				else
 				{
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search
 			// put docs in array
 				scoreDocs[i] = (ScoreDoc) hq.Pop();
 			
-			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs[0].score;
+			float maxScore = (totalHits == 0)?System.Single.NegativeInfinity:scoreDocs[0].Score;
 			
 			return new TopDocs(totalHits, scoreDocs, maxScore);
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopFieldDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopFieldDocCollector.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopFieldDocCollector.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopFieldDocCollector.cs Sat Sep 10 20:59:58 2011
@@ -65,8 +65,8 @@ namespace Lucene.Net.Search
 					// comparators in the FieldSortedHitQueue.lessThan
 					// aren't in general congruent with "higher score
 					// wins"
-					reusableFD.score = score;
-					reusableFD.doc = doc;
+					reusableFD.Score = score;
+					reusableFD.Doc = doc;
 				}
 				reusableFD = (FieldDoc) hq.InsertWithOverflow(reusableFD);
 			}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopScoreDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopScoreDocCollector.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopScoreDocCollector.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/core/Search/TopScoreDocCollector.cs Sat Sep 10 20:59:58 2011
@@ -53,15 +53,15 @@ namespace Lucene.Net.Search
                 System.Diagnostics.Debug.Assert(!float.IsNaN(score));
 
 				totalHits++;
-				if (score <= pqTop.score)
+				if (score <= pqTop.Score)
 				{
 					// Since docs are returned in-order (i.e., increasing doc Id), a document
 					// with equal score to pqTop.score cannot compete since HitQueue favors
 					// documents with lower doc Ids. Therefore reject those docs too.
 					return ;
 				}
-				pqTop.doc = doc + docBase;
-				pqTop.score = score;
+				pqTop.Doc = doc + docBase;
+				pqTop.Score = score;
 				pqTop = (ScoreDoc) pq.UpdateTop();
 			}
 			
@@ -87,12 +87,12 @@ namespace Lucene.Net.Search
 
 				totalHits++;
 				doc += docBase;
-				if (score < pqTop.score || (score == pqTop.score && doc > pqTop.doc))
+				if (score < pqTop.Score || (score == pqTop.Score && doc > pqTop.Doc))
 				{
 					return ;
 				}
-				pqTop.doc = doc;
-				pqTop.score = score;
+				pqTop.Doc = doc;
+				pqTop.Score = score;
 				pqTop = (ScoreDoc) pq.UpdateTop();
 			}
 			
@@ -150,7 +150,7 @@ namespace Lucene.Net.Search
 			float maxScore = System.Single.NaN;
 			if (start == 0)
 			{
-				maxScore = results[0].score;
+				maxScore = results[0].Score;
 			}
 			else
 			{
@@ -158,7 +158,7 @@ namespace Lucene.Net.Search
 				{
 					pq.Pop();
 				}
-				maxScore = ((ScoreDoc) pq.Pop()).score;
+				maxScore = ((ScoreDoc) pq.Pop()).Score;
 			}
 			
 			return new TopDocs(totalHits, results, maxScore);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Miscellaneous/ChainedFilterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Miscellaneous/ChainedFilterTest.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Miscellaneous/ChainedFilterTest.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Miscellaneous/ChainedFilterTest.cs Sat Sep 10 20:59:58 2011
@@ -119,13 +119,13 @@ namespace Lucene.Net.Analysis.Miscellane
             TopDocs hits = searcher.Search(query, chain, 1000);
             numHits = hits.TotalHits;
             Assert.AreEqual(MAX / 2, numHits);
-            Assert.AreEqual("bob", searcher.Doc(hits.ScoreDocs[0].doc).Get("owner"));
+            Assert.AreEqual("bob", searcher.Doc(hits.ScoreDocs[0].Doc).Get("owner"));
 
             chain = GetChainedFilter(new Filter[] { bobFilter }, new ChainedFilter.Logic[] { ChainedFilter.Logic.ANDNOT });
             hits = searcher.Search(query, chain, 1000);
             numHits = hits.TotalHits;
             Assert.AreEqual(MAX / 2, numHits);
-            Assert.AreEqual("sue", searcher.Doc(hits.ScoreDocs[0].doc).Get("owner"));
+            Assert.AreEqual("sue", searcher.Doc(hits.ScoreDocs[0].Doc).Get("owner"));
         }
 
         [Test]
@@ -146,7 +146,7 @@ namespace Lucene.Net.Analysis.Miscellane
 
             TopDocs hits = searcher.Search(query, chain, 1000);
             Assert.AreEqual(MAX / 2, hits.TotalHits, "AND matches just bob");
-            Assert.AreEqual("bob", searcher.Doc(hits.ScoreDocs[0].doc).Get("owner"));
+            Assert.AreEqual("bob", searcher.Doc(hits.ScoreDocs[0].Doc).Get("owner"));
         }
 
         [Test]
@@ -157,7 +157,7 @@ namespace Lucene.Net.Analysis.Miscellane
 
             TopDocs hits = searcher.Search(query, chain, 1000);
             Assert.AreEqual(MAX / 2, hits.TotalHits, "XOR matches sue");
-            Assert.AreEqual("sue", searcher.Doc(hits.ScoreDocs[0].doc).Get("owner"));
+            Assert.AreEqual("sue", searcher.Doc(hits.ScoreDocs[0].Doc).Get("owner"));
         }
 
         [Test]
@@ -169,7 +169,7 @@ namespace Lucene.Net.Analysis.Miscellane
 
             TopDocs hits = searcher.Search(query, chain, 1000);
             Assert.AreEqual(MAX / 2, hits.TotalHits, "ANDNOT matches just bob");
-            Assert.AreEqual("bob", searcher.Doc(hits.ScoreDocs[0].doc).Get("owner"));
+            Assert.AreEqual("bob", searcher.Doc(hits.ScoreDocs[0].Doc).Get("owner"));
 
             chain = GetChainedFilter(
                 new Filter[] { bobFilter, bobFilter },
@@ -177,7 +177,7 @@ namespace Lucene.Net.Analysis.Miscellane
 
             hits = searcher.Search(query, chain, 1000);
             Assert.AreEqual(MAX / 2, hits.TotalHits, "ANDNOT bob ANDNOT bob matches all sues");
-            Assert.AreEqual("sue", searcher.Doc(hits.ScoreDocs[0].doc).Get("owner"));
+            Assert.AreEqual("sue", searcher.Doc(hits.ScoreDocs[0].Doc).Get("owner"));
         }
 
         /*

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/IsolatedStorage/TestIsolatedStorageDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/IsolatedStorage/TestIsolatedStorageDirectory.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/IsolatedStorage/TestIsolatedStorageDirectory.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/IsolatedStorage/TestIsolatedStorageDirectory.cs Sat Sep 10 20:59:58 2011
@@ -115,7 +115,7 @@ namespace Lucene.Net.Store
                         TopDocs hits = sfs.Search(q, 200);
                         for (int j = 0; j < hits.ScoreDocs.Length; j++)
                         {
-                            Document doc = reader.Document(hits.ScoreDocs[j].doc);
+                            Document doc = reader.Document(hits.ScoreDocs[j].Doc);
                             Fieldable f = doc.GetField("title");
                         }
                     }

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Queries/FuzzyLikeThisQueryTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Queries/FuzzyLikeThisQueryTest.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Queries/FuzzyLikeThisQueryTest.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Queries/FuzzyLikeThisQueryTest.cs Sat Sep 10 20:59:58 2011
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
             TopDocs topDocs = searcher.Search(flt, 1);
             ScoreDoc[] sd = topDocs.ScoreDocs;
             Assert.IsTrue((sd != null) && (sd.Length > 0), "score docs must match 1 doc");
-            Document doc = searcher.Doc(sd[0].doc);
+            Document doc = searcher.Doc(sd[0].Doc);
             Assert.AreEqual("2", doc.Get("id"), "Should match most similar not most rare variant");
         }
 
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search
             TopDocs topDocs = searcher.Search(flt, 1);
             ScoreDoc[] sd = topDocs.ScoreDocs;
             Assert.IsTrue((sd != null) && (sd.Length > 0), "score docs must match 1 doc");
-            Document doc = searcher.Doc(sd[0].doc);
+            Document doc = searcher.Doc(sd[0].Doc);
             Assert.AreEqual("2", doc.Get("id"), "Should match most similar when using 2 words");
         }
 
@@ -115,7 +115,7 @@ namespace Lucene.Net.Search
             TopDocs topDocs = searcher.Search(flt, 1);
             ScoreDoc[] sd = topDocs.ScoreDocs;
             Assert.IsTrue((sd != null) && (sd.Length > 0), "score docs must match 1 doc");
-            Document doc = searcher.Doc(sd[0].doc);
+            Document doc = searcher.Doc(sd[0].Doc);
             Assert.AreEqual("2", doc.Get("id"), "Should match most similar when using 2 words");
         }
 

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/TestCartesian.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/TestCartesian.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/TestCartesian.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/TestCartesian.cs Sat Sep 10 20:59:58 2011
@@ -162,12 +162,12 @@ namespace Lucene.Net.Spatial.Test
 			double lastDistance = 0;
 			for (int i = 0; i < results; i++)
 			{
-				Document d = _searcher.Doc(scoreDocs[i].doc);
+				Document d = _searcher.Doc(scoreDocs[i].Doc);
 
 				String name = d.Get("name");
 				double rsLat = NumericUtils.PrefixCodedToDouble(d.Get(LatField));
 				double rsLng = NumericUtils.PrefixCodedToDouble(d.Get(LngField));
-				Double geo_distance = distances[scoreDocs[i].doc];
+				Double geo_distance = distances[scoreDocs[i].Doc];
 
 				double distance = DistanceUtils.GetInstance().GetDistanceMi(_lat, _lng, rsLat, rsLng);
 				double llm = DistanceUtils.GetInstance().GetLLMDistance(_lat, _lng, rsLat, rsLng);
@@ -297,12 +297,12 @@ namespace Lucene.Net.Spatial.Test
             double lastDistance = 0;
             for (int i = 0; i < results; i++)
             {
-                Document d = _searcher.Doc(scoreDocs[i].doc);
+                Document d = _searcher.Doc(scoreDocs[i].Doc);
 
                 String name = d.Get("name");
                 double rsLat = NumericUtils.PrefixCodedToDouble(d.Get(LatField));
                 double rsLng = NumericUtils.PrefixCodedToDouble(d.Get(LngField));
-                Double geo_distance = distances[scoreDocs[i].doc];
+                Double geo_distance = distances[scoreDocs[i].Doc];
 
                 double distance = DistanceUtils.GetInstance().GetDistanceMi(_lat, _lng, rsLat, rsLng);
                 double llm = DistanceUtils.GetInstance().GetLLMDistance(_lat, _lng, rsLat, rsLng);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Document/TestDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Document/TestDocument.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Document/TestDocument.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Document/TestDocument.cs Sat Sep 10 20:59:58 2011
@@ -183,7 +183,7 @@ namespace Lucene.Net.Documents
 			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			
-			DoAssert(searcher.Doc(hits[0].doc), true);
+			DoAssert(searcher.Doc(hits[0].Doc), true);
 			searcher.Close();
 		}
 		
@@ -261,7 +261,7 @@ namespace Lucene.Net.Documents
 			int result = 0;
 			for (int i = 0; i < 3; i++)
 			{
-				Document doc2 = searcher.Doc(hits[i].doc);
+				Document doc2 = searcher.Doc(hits[i].Doc);
 				Field f = doc2.GetField("id");
 				if (f.StringValue().Equals("id1"))
 					result |= 1;

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestBackwardsCompatibility.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestBackwardsCompatibility.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestBackwardsCompatibility.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestBackwardsCompatibility.cs Sat Sep 10 20:59:58 2011
@@ -188,8 +188,8 @@ namespace Lucene.Net.Index
 			Assert.AreEqual(expectedCount, hitCount, "wrong number of hits");
 			for (int i = 0; i < hitCount; i++)
 			{
-				reader.Document(hits[i].doc);
-				reader.GetTermFreqVectors(hits[i].doc);
+				reader.Document(hits[i].Doc);
+				reader.GetTermFreqVectors(hits[i].Doc);
 			}
 		}
 		
@@ -244,7 +244,7 @@ namespace Lucene.Net.Index
 			
 			// First document should be #21 since it's norm was
 			// increased:
-			Document d2 = searcher.Doc(hits[0].doc);
+			Document d2 = searcher.Doc(hits[0].Doc);
 			Assert.AreEqual("21", d2.Get("id"), "didn't get the right document first");
 			
 			TestHits(hits, 34, searcher.GetIndexReader());
@@ -305,7 +305,7 @@ namespace Lucene.Net.Index
 			// make sure searching sees right # hits
 			IndexSearcher searcher = new IndexSearcher(dir);
 			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
-			Document d = searcher.Doc(hits[0].doc);
+			Document d = searcher.Doc(hits[0].Doc);
 			Assert.AreEqual("21", d.Get("id"), "wrong first document");
 			TestHits(hits, 44, searcher.GetIndexReader());
 			searcher.Close();
@@ -323,7 +323,7 @@ namespace Lucene.Net.Index
 			searcher = new IndexSearcher(dir);
 			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
 			Assert.AreEqual(43, hits.Length, "wrong number of hits");
-			d = searcher.Doc(hits[0].doc);
+			d = searcher.Doc(hits[0].Doc);
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");
 			TestHits(hits, 43, searcher.GetIndexReader());
 			searcher.Close();
@@ -336,7 +336,7 @@ namespace Lucene.Net.Index
 			searcher = new IndexSearcher(dir);
 			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
 			Assert.AreEqual(43, hits.Length, "wrong number of hits");
-			d = searcher.Doc(hits[0].doc);
+			d = searcher.Doc(hits[0].Doc);
 			TestHits(hits, 43, searcher.GetIndexReader());
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");
 			searcher.Close();
@@ -357,7 +357,7 @@ namespace Lucene.Net.Index
 			IndexSearcher searcher = new IndexSearcher(dir);
 			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
 			Assert.AreEqual(34, hits.Length, "wrong number of hits");
-			Document d = searcher.Doc(hits[0].doc);
+			Document d = searcher.Doc(hits[0].Doc);
 			Assert.AreEqual("21", d.Get("id"), "wrong first document");
 			searcher.Close();
 			
@@ -374,7 +374,7 @@ namespace Lucene.Net.Index
 			searcher = new IndexSearcher(dir);
 			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
 			Assert.AreEqual(33, hits.Length, "wrong number of hits");
-			d = searcher.Doc(hits[0].doc);
+			d = searcher.Doc(hits[0].Doc);
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");
 			TestHits(hits, 33, searcher.GetIndexReader());
 			searcher.Close();
@@ -387,7 +387,7 @@ namespace Lucene.Net.Index
 			searcher = new IndexSearcher(dir);
 			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
 			Assert.AreEqual(33, hits.Length, "wrong number of hits");
-			d = searcher.Doc(hits[0].doc);
+			d = searcher.Doc(hits[0].Doc);
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");
 			TestHits(hits, 33, searcher.GetIndexReader());
 			searcher.Close();

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReaderReopen.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReaderReopen.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReaderReopen.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestIndexReaderReopen.cs Sat Sep 10 20:59:58 2011
@@ -412,7 +412,7 @@ namespace Lucene.Net.Index
 						ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field1", "a" + rnd.Next(refreshed.MaxDoc()))), null, 1000).ScoreDocs;
 						if (hits.Length > 0)
 						{
-							searcher.Doc(hits[0].doc);
+							searcher.Doc(hits[0].Doc);
 						}
 						
 						// r might have changed because this is not a 

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestParallelReader.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestParallelReader.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Index/TestParallelReader.cs Sat Sep 10 20:59:58 2011
@@ -243,9 +243,9 @@ namespace Lucene.Net.Index
 			Assert.AreEqual(parallelHits.Length, singleHits.Length);
 			for (int i = 0; i < parallelHits.Length; i++)
 			{
-				Assert.AreEqual(parallelHits[i].score, singleHits[i].score, 0.001f);
-				Document docParallel = parallel.Doc(parallelHits[i].doc);
-				Document docSingle = single.Doc(singleHits[i].doc);
+				Assert.AreEqual(parallelHits[i].Score, singleHits[i].Score, 0.001f);
+				Document docParallel = parallel.Doc(parallelHits[i].Doc);
+				Document docSingle = single.Doc(singleHits[i].Doc);
 				Assert.AreEqual(docParallel.Get("f1"), docSingle.Get("f1"));
 				Assert.AreEqual(docParallel.Get("f2"), docSingle.Get("f2"));
 				Assert.AreEqual(docParallel.Get("f3"), docSingle.Get("f3"));

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/CheckHits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/CheckHits.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/CheckHits.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/CheckHits.cs Sat Sep 10 20:59:58 2011
@@ -182,7 +182,7 @@ namespace Lucene.Net.Search
             SortedSet<int> actual = new SortedSet<int>();
 			for (int i = 0; i < hits.Length; i++)
 			{
-				actual.Add(hits[i].doc);
+				actual.Add(hits[i].Doc);
 			}
             			
 			Assert.AreEqual(correct, actual, query.ToString(defaultFieldName));
@@ -196,7 +196,7 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(hits.Length, results.Length, mes + " nr of hits");
 			for (int i = 0; i < results.Length; i++)
 			{
-				Assert.AreEqual(results[i], hits[i].doc, mes + " doc nrs for hit " + i);
+				Assert.AreEqual(results[i], hits[i].Doc, mes + " doc nrs for hit " + i);
 			}
 		}
 		
@@ -220,14 +220,14 @@ namespace Lucene.Net.Search
 			}
 			for (int i = 0; i < hits1.Length; i++)
 			{
-				if (hits1[i].doc != hits2[i].doc)
+				if (hits1[i].Doc != hits2[i].Doc)
 				{
 					Assert.Fail("Hit " + i + " docnumbers don't match\n" + Hits2str(hits1, hits2, 0, 0) + "for query:" + query.ToString());
 				}
 				
-				if ((hits1[i].doc != hits2[i].doc) || System.Math.Abs(hits1[i].score - hits2[i].score) > scoreTolerance)
+				if ((hits1[i].Doc != hits2[i].Doc) || System.Math.Abs(hits1[i].Score - hits2[i].Score) > scoreTolerance)
 				{
-					Assert.Fail("Hit " + i + ", doc nrs " + hits1[i].doc + " and " + hits2[i].doc + "\nunequal       : " + hits1[i].score + "\n           and: " + hits2[i].score + "\nfor query:" + query.ToString());
+					Assert.Fail("Hit " + i + ", doc nrs " + hits1[i].Doc + " and " + hits2[i].Doc + "\nunequal       : " + hits1[i].Score + "\n           and: " + hits2[i].Score + "\nfor query:" + query.ToString());
 				}
 			}
 		}
@@ -250,7 +250,7 @@ namespace Lucene.Net.Search
 				sb.Append("hit=").Append(i).Append(':');
 				if (i < len1)
 				{
-					sb.Append(" doc").Append(hits1[i].doc).Append('=').Append(hits1[i].score);
+					sb.Append(" doc").Append(hits1[i].Doc).Append('=').Append(hits1[i].Score);
 				}
 				else
 				{
@@ -259,7 +259,7 @@ namespace Lucene.Net.Search
 				sb.Append(",\t");
 				if (i < len2)
 				{
-					sb.Append(" doc").Append(hits2[i].doc).Append('=').Append(hits2[i].score);
+					sb.Append(" doc").Append(hits2[i].Doc).Append('=').Append(hits2[i].Score);
 				}
 				sb.Append('\n');
 			}
@@ -280,9 +280,9 @@ namespace Lucene.Net.Search
 				sb.Append('\t');
 				sb.Append(i);
 				sb.Append(") doc=");
-				sb.Append(docs.ScoreDocs[i].doc);
+				sb.Append(docs.ScoreDocs[i].Doc);
 				sb.Append("\tscore=");
-				sb.Append(docs.ScoreDocs[i].score);
+				sb.Append(docs.ScoreDocs[i].Score);
 				sb.Append('\n');
 			}
 			return sb.ToString();

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestCustomScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestCustomScoreQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestCustomScoreQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestCustomScoreQuery.cs Sat Sep 10 20:59:58 2011
@@ -240,8 +240,8 @@ namespace Lucene.Net.Search.Function
             Assert.AreEqual(N_DOCS, hits.TotalHits);
             for(int i=0;i<N_DOCS;i++) 
             {
-                int doc = hits.ScoreDocs[i].doc;
-                float score = hits.ScoreDocs[i].score;
+                int doc = hits.ScoreDocs[i].Doc;
+                float score = hits.ScoreDocs[i].Score;
                 Assert.AreEqual(score, (float)1 + (4 * doc) % N_DOCS, 0.0001, "doc=" + doc);
             }
             s.Close();
@@ -360,7 +360,7 @@ namespace Lucene.Net.Search.Function
 			System.Collections.Hashtable h = new System.Collections.Hashtable();
 			for (int i = 0; i < td.TotalHits; i++)
 			{
-				h[(System.Int32) td.ScoreDocs[i].doc] = (float) td.ScoreDocs[i].score;
+				h[(System.Int32) td.ScoreDocs[i].Doc] = (float) td.ScoreDocs[i].Score;
 			}
 			return h;
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestFieldScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestFieldScoreQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestFieldScoreQuery.cs Sat Sep 10 20:59:58 2011
@@ -97,9 +97,9 @@ namespace Lucene.Net.Search.Function
 			System.String prevID = "ID" + (N_DOCS + 1); // greater than all ids of docs in this test
 			for (int i = 0; i < h.Length; i++)
 			{
-				System.String resID = s.Doc(h[i].doc).Get(ID_FIELD);
-				Log(i + ".   score=" + h[i].score + "  -  " + resID);
-				Log(s.Explain(q, h[i].doc));
+				System.String resID = s.Doc(h[i].Doc).Get(ID_FIELD);
+				Log(i + ".   score=" + h[i].Score + "  -  " + resID);
+				Log(s.Explain(q, h[i].Doc));
 				Assert.IsTrue(String.CompareOrdinal(resID, prevID) < 0, "res id " + resID + " should be < prev res id " + prevID);
 				prevID = resID;
 			}
@@ -148,9 +148,9 @@ namespace Lucene.Net.Search.Function
 			ScoreDoc[] sd = td.ScoreDocs;
 			for (int i = 0; i < sd.Length; i++)
 			{
-				float score = sd[i].score;
-				Log(s.Explain(q, sd[i].doc));
-				System.String id = s.GetIndexReader().Document(sd[i].doc).Get(ID_FIELD);
+				float score = sd[i].Score;
+				Log(s.Explain(q, sd[i].Doc));
+				System.String id = s.GetIndexReader().Document(sd[i].Doc).Get(ID_FIELD);
 				float expectedScore = ExpectedFieldScore(id); // "ID7" --> 7.0
 				Assert.AreEqual(expectedScore, score, TEST_SCORE_TOLERANCE_DELTA, "score of " + id + " shuould be " + expectedScore + " != " + score);
 			}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestOrdValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestOrdValues.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestOrdValues.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Function/TestOrdValues.cs Sat Sep 10 20:59:58 2011
@@ -89,9 +89,9 @@ namespace Lucene.Net.Search.Function
 			
 			for (int i = 0; i < h.Length; i++)
 			{
-				System.String resID = s.Doc(h[i].doc).Get(ID_FIELD);
-				Log(i + ".   score=" + h[i].score + "  -  " + resID);
-				Log(s.Explain(q, h[i].doc));
+				System.String resID = s.Doc(h[i].Doc).Get(ID_FIELD);
+				Log(i + ".   score=" + h[i].Score + "  -  " + resID);
+				Log(s.Explain(q, h[i].Doc));
 				if (inOrder)
 				{
 					Assert.IsTrue(String.CompareOrdinal(resID, prevID) < 0, "res id " + resID + " should be < prev res id " + prevID);
@@ -138,10 +138,10 @@ namespace Lucene.Net.Search.Function
 			ScoreDoc[] sd = td.ScoreDocs;
 			for (int i = 0; i < sd.Length; i++)
 			{
-				float score = sd[i].score;
-				System.String id = s.GetIndexReader().Document(sd[i].doc).Get(ID_FIELD);
+				float score = sd[i].Score;
+				System.String id = s.GetIndexReader().Document(sd[i].Doc).Get(ID_FIELD);
 				Log("-------- " + i + ". Explain doc " + id);
-				Log(s.Explain(q, sd[i].doc));
+				Log(s.Explain(q, sd[i].Doc));
 				float expectedScore = N_DOCS - i;
 				Assert.AreEqual(expectedScore, score, TEST_SCORE_TOLERANCE_DELTA, "score of result " + i + " shuould be " + expectedScore + " != " + score);
 				System.String expectedId = inOrder?Id2String(N_DOCS - i):Id2String(i + 1); // reverse  ==> smaller values first 

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestBoostingTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestBoostingTermQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestBoostingTermQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestBoostingTermQuery.cs Sat Sep 10 20:59:58 2011
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search.Payloads
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				Assert.IsTrue(doc.score == 1, doc.score + " does not equal: " + 1);
+				Assert.IsTrue(doc.Score == 1, doc.Score + " does not equal: " + 1);
 			}
 			CheckHits.CheckExplanations(query, PayloadHelper.FIELD, searcher, true);
 			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.GetIndexReader());
@@ -221,14 +221,14 @@ namespace Lucene.Net.Search.Payloads
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				if (doc.doc % 10 == 0)
+				if (doc.Doc % 10 == 0)
 				{
 					numTens++;
-					Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+					Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 				}
 				else
 				{
-					Assert.IsTrue(doc.score == 2, doc.score + " does not equal: " + 2);
+					Assert.IsTrue(doc.Score == 2, doc.Score + " does not equal: " + 2);
 				}
 			}
 			Assert.IsTrue(numTens == 10, numTens + " does not equal: " + 10);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadNearQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadNearQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadNearQuery.cs Sat Sep 10 20:59:58 2011
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search.Payloads
 			for (int j = 0; j < hits.ScoreDocs.Length; j++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[j];
-				Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+				Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 			}
 			for (int i = 1; i < 10; i++)
 			{
@@ -204,7 +204,7 @@ namespace Lucene.Net.Search.Payloads
 					ScoreDoc doc = hits.ScoreDocs[j];
 					//				System.out.println("Doc: " + doc.toString());
 					//				System.out.println("Explain: " + searcher.explain(query, doc.doc));
-					Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+					Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 				}
 			}
 		}
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search.Payloads
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
 			Assert.IsTrue(hits.TotalHits == 1, "there should only be one hit");
 			// should have score = 3 because adjacent terms have payloads of 2,4
-			Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+			Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 		}
 		
         [Test]
@@ -280,7 +280,7 @@ namespace Lucene.Net.Search.Payloads
 			ScoreDoc doc = hits.ScoreDocs[0];
 			//		System.out.println("Doc: " + doc.toString());
 			//		System.out.println("Explain: " + searcher.explain(query, doc.doc));
-			Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+			Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 		}
 		// must be static for weight serialization tests 
 		[Serializable]

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadTermQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadTermQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Payloads/TestPayloadTermQuery.cs Sat Sep 10 20:59:58 2011
@@ -197,7 +197,7 @@ namespace Lucene.Net.Search.Payloads
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				Assert.IsTrue(doc.score == 1, doc.score + " does not equal: " + 1);
+				Assert.IsTrue(doc.Score == 1, doc.Score + " does not equal: " + 1);
 			}
 			CheckHits.CheckExplanations(query, PayloadHelper.FIELD, searcher, true);
 			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.GetIndexReader());
@@ -244,14 +244,14 @@ namespace Lucene.Net.Search.Payloads
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				if (doc.doc % 10 == 0)
+				if (doc.Doc % 10 == 0)
 				{
 					numTens++;
-					Assert.IsTrue(doc.score == 4.0, doc.score + " does not equal: " + 4.0);
+					Assert.IsTrue(doc.Score == 4.0, doc.Score + " does not equal: " + 4.0);
 				}
 				else
 				{
-					Assert.IsTrue(doc.score == 2, doc.score + " does not equal: " + 2);
+					Assert.IsTrue(doc.Score == 2, doc.Score + " does not equal: " + 2);
 				}
 			}
 			Assert.IsTrue(numTens == 10, numTens + " does not equal: " + 10);
@@ -292,14 +292,14 @@ namespace Lucene.Net.Search.Payloads
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				if (doc.doc % 10 == 0)
+				if (doc.Doc % 10 == 0)
 				{
 					numTens++;
-					Assert.IsTrue(doc.score == 4.0, doc.score + " does not equal: " + 4.0);
+					Assert.IsTrue(doc.Score == 4.0, doc.Score + " does not equal: " + 4.0);
 				}
 				else
 				{
-					Assert.IsTrue(doc.score == 2, doc.score + " does not equal: " + 2);
+					Assert.IsTrue(doc.Score == 2, doc.Score + " does not equal: " + 2);
 				}
 			}
 			Assert.IsTrue(numTens == 10, numTens + " does not equal: " + 10);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/SampleComparable.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/SampleComparable.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/SampleComparable.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/SampleComparable.cs Sat Sep 10 20:59:58 2011
@@ -86,12 +86,12 @@ namespace Lucene.Net.Search
 				
 				public virtual int Compare(ScoreDoc i, ScoreDoc j)
 				{
-					return cachedValues[i.doc].CompareTo(cachedValues[j.doc]);
+					return cachedValues[i.Doc].CompareTo(cachedValues[j.Doc]);
 				}
 				
 				public virtual System.IComparable SortValue(ScoreDoc i)
 				{
-					return cachedValues[i.doc];
+					return cachedValues[i.Doc];
 				}
 				
 				public virtual int SortType()

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/TestSpansAdvanced.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/TestSpansAdvanced.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/TestSpansAdvanced.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/Spans/TestSpansAdvanced.cs Sat Sep 10 20:59:58 2011
@@ -162,8 +162,8 @@ namespace Lucene.Net.Search.Spans
 				//System.out.println(i + " exp: " + expectedIds[i]);
 				//System.out.println(i + " field: " + hits.doc(i).get(FIELD_ID));
 				
-				int id = topdocs.ScoreDocs[i].doc;
-				float score = topdocs.ScoreDocs[i].score;
+				int id = topdocs.ScoreDocs[i].Doc;
+				float score = topdocs.ScoreDocs[i].Score;
 				Document doc = s.Doc(id);
 				Assert.AreEqual(expectedIds[i], doc.Get(FIELD_ID));
 				bool scoreEq = System.Math.Abs(expectedScores[i] - score) < tolerance;

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestBooleanMinShouldMatch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestBooleanMinShouldMatch.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestBooleanMinShouldMatch.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestBooleanMinShouldMatch.cs Sat Sep 10 20:59:58 2011
@@ -396,16 +396,16 @@ namespace Lucene.Net.Search
 				
 				for (int hit = 0; hit < top2.TotalHits; hit++)
 				{
-					int id = top2.ScoreDocs[hit].doc;
-					float score = top2.ScoreDocs[hit].score;
+					int id = top2.ScoreDocs[hit].Doc;
+					float score = top2.ScoreDocs[hit].Score;
 					bool found = false;
 					// find this doc in other hits
 					for (int other = 0; other < top1.TotalHits; other++)
 					{
-						if (top1.ScoreDocs[other].doc == id)
+						if (top1.ScoreDocs[other].Doc == id)
 						{
 							found = true;
-							float otherScore = top1.ScoreDocs[other].score;
+							float otherScore = top1.ScoreDocs[other].Score;
 							// check if scores match
 							if (System.Math.Abs(otherScore - score) > 1.0e-6f)
 							{
@@ -435,8 +435,8 @@ namespace Lucene.Net.Search
 			
 			for (int i = 0; i < h.Length; i++)
 			{
-				Document d = searcher.Doc(h[i].doc);
-				float score = h[i].score;
+				Document d = searcher.Doc(h[i].Doc);
+				float score = h[i].Score;
 				System.Console.Error.WriteLine("#" + i + ": {0.000000}" + score + " - " + d.Get("id") + " - " + d.Get("data"));
 			}
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestCustomSearcherSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestCustomSearcherSort.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestCustomSearcherSort.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestCustomSearcherSort.cs Sat Sep 10 20:59:58 2011
@@ -146,7 +146,7 @@ namespace Lucene.Net.Search
 			// store hits in TreeMap - TreeMap does not allow duplicates; existing entries are silently overwritten
 			for (int hitid = 0; hitid < hitsByRank.Length; ++hitid)
 			{
-				resultMap[(System.Int32) hitsByRank[hitid].doc] = (System.Int32) hitid; // Value: Hits-Objekt Index
+				resultMap[(System.Int32) hitsByRank[hitid].Doc] = (System.Int32) hitid; // Value: Hits-Objekt Index
 			}
 			
 			// now make a query using the sort criteria
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search
 			// besides the sorting both sets of hits must be identical
 			for (int hitid = 0; hitid < resultSort.Length; ++hitid)
 			{
-				System.Int32 idHitDate = (System.Int32) resultSort[hitid].doc; // document ID from sorted search
+				System.Int32 idHitDate = (System.Int32) resultSort[hitid].Doc; // document ID from sorted search
 				if (!resultMap.Contains(idHitDate))
 				{
 					Log("ID " + idHitDate + " not found. Possibliy a duplicate.");
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search
 				{
 					System.Int32 luceneId;
 					
-					luceneId = (System.Int32) hits[docnum].doc;
+					luceneId = (System.Int32) hits[docnum].Doc;
 					if (idMap.Contains(luceneId))
 					{
 						System.Text.StringBuilder message = new System.Text.StringBuilder(prefix);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDateSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDateSort.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDateSort.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDateSort.cs Sat Sep 10 20:59:58 2011
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search
 			ScoreDoc[] hits = searcher.Search(query, null, 1000, sort).ScoreDocs;
 			for (int i = 0; i < hits.Length; i++)
 			{
-				Document document = searcher.Doc(hits[i].doc);
+				Document document = searcher.Doc(hits[i].Doc);
 				System.String text = document.Get(TEXT_FIELD);
 				actualOrder[i] = text;
 			}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDisjunctionMaxQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDisjunctionMaxQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDisjunctionMaxQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestDisjunctionMaxQuery.cs Sat Sep 10 20:59:58 2011
@@ -190,10 +190,10 @@ namespace Lucene.Net.Search
 			{
 				Assert.AreEqual(4, h.Length, "all docs should match " + q.ToString());
 				
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -218,10 +218,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(3, h.Length, "3 docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -248,10 +248,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(4, h.Length, "all docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -276,10 +276,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(3, h.Length, "3 docs should match " + q.ToString());
-				Assert.AreEqual(s.Doc(h[0].doc).Get("id"), "d2", "wrong first");
-				float score0 = h[0].score;
-				float score1 = h[1].score;
-				float score2 = h[2].score;
+				Assert.AreEqual(s.Doc(h[0].Doc).Get("id"), "d2", "wrong first");
+				float score0 = h[0].Score;
+				float score1 = h[1].Score;
+				float score2 = h[2].Score;
 				Assert.IsTrue(score0 > score1, "d2 does not have better score then others: " + score0 + " >? " + score1);
 				Assert.AreEqual(score1, score2, SCORE_COMP_THRESH, "d4 and d1 don't have equal scores");
 			}
@@ -317,10 +317,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(3, h.Length, "3 docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -356,14 +356,14 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(4, h.Length, "4 docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length - 1; i++)
 				{
 					/* note: -1 */
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
-				Assert.AreEqual("d1", s.Doc(h[h.Length - 1].doc).Get("id"), "wrong last");
-				float score1 = h[h.Length - 1].score;
+				Assert.AreEqual("d1", s.Doc(h[h.Length - 1].Doc).Get("id"), "wrong last");
+				float score1 = h[h.Length - 1].Score;
 				Assert.IsTrue(score > score1, "d1 does not have worse score then others: " + score + " >? " + score1);
 			}
 			catch (System.ApplicationException e)
@@ -401,15 +401,15 @@ namespace Lucene.Net.Search
 				
 				Assert.AreEqual(4, h.Length, "4 docs should match " + q.ToString());
 				
-				float score0 = h[0].score;
-				float score1 = h[1].score;
-				float score2 = h[2].score;
-				float score3 = h[3].score;
-				
-				System.String doc0 = s.Doc(h[0].doc).Get("id");
-				System.String doc1 = s.Doc(h[1].doc).Get("id");
-				System.String doc2 = s.Doc(h[2].doc).Get("id");
-				System.String doc3 = s.Doc(h[3].doc).Get("id");
+				float score0 = h[0].Score;
+				float score1 = h[1].Score;
+				float score2 = h[2].Score;
+				float score3 = h[3].Score;
+				
+				System.String doc0 = s.Doc(h[0].Doc).Get("id");
+				System.String doc1 = s.Doc(h[1].Doc).Get("id");
+				System.String doc2 = s.Doc(h[2].Doc).Get("id");
+				System.String doc3 = s.Doc(h[3].Doc).Get("id");
 				
 				Assert.IsTrue(doc0.Equals("d2") || doc0.Equals("d4"), "doc0 should be d2 or d4: " + doc0);
 				Assert.IsTrue(doc1.Equals("d2") || doc1.Equals("d4"), "doc1 should be d2 or d4: " + doc0);
@@ -455,15 +455,15 @@ namespace Lucene.Net.Search
 				
 				Assert.AreEqual(4, h.Length, "4 docs should match " + q.ToString());
 				
-				float score0 = h[0].score;
-				float score1 = h[1].score;
-				float score2 = h[2].score;
-				float score3 = h[3].score;
-				
-				System.String doc0 = s.Doc(h[0].doc).Get("id");
-				System.String doc1 = s.Doc(h[1].doc).Get("id");
-				System.String doc2 = s.Doc(h[2].doc).Get("id");
-				System.String doc3 = s.Doc(h[3].doc).Get("id");
+				float score0 = h[0].Score;
+				float score1 = h[1].Score;
+				float score2 = h[2].Score;
+				float score3 = h[3].Score;
+				
+				System.String doc0 = s.Doc(h[0].Doc).Get("id");
+				System.String doc1 = s.Doc(h[1].Doc).Get("id");
+				System.String doc2 = s.Doc(h[2].Doc).Get("id");
+				System.String doc3 = s.Doc(h[3].Doc).Get("id");
 				
 				Assert.AreEqual("d4", doc0, "doc0 should be d4: ");
 				Assert.AreEqual("d3", doc1, "doc1 should be d3: ");
@@ -508,8 +508,8 @@ namespace Lucene.Net.Search
 			
 			for (int i = 0; i < h.Length; i++)
 			{
-				Document d = searcher.Doc(h[i].doc);
-				float score = h[i].score;
+				Document d = searcher.Doc(h[i].Doc);
+				float score = h[i].Score;
 				System.Console.Error.WriteLine("#" + i + ": {0.000000000}" + score + " - " + d.Get("id"));
 			}
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestElevationComparator.cs Sat Sep 10 20:59:58 2011
@@ -83,18 +83,18 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(4, nDocsReturned);
 			
 			// 0 & 3 were elevated
-			Assert.AreEqual(0, topDocs.ScoreDocs[0].doc);
-			Assert.AreEqual(3, topDocs.ScoreDocs[1].doc);
+			Assert.AreEqual(0, topDocs.ScoreDocs[0].Doc);
+			Assert.AreEqual(3, topDocs.ScoreDocs[1].Doc);
 			
 			if (reversed)
 			{
-				Assert.AreEqual(2, topDocs.ScoreDocs[2].doc);
-				Assert.AreEqual(1, topDocs.ScoreDocs[3].doc);
+				Assert.AreEqual(2, topDocs.ScoreDocs[2].Doc);
+				Assert.AreEqual(1, topDocs.ScoreDocs[3].Doc);
 			}
 			else
 			{
-				Assert.AreEqual(1, topDocs.ScoreDocs[2].doc);
-				Assert.AreEqual(2, topDocs.ScoreDocs[3].doc);
+				Assert.AreEqual(1, topDocs.ScoreDocs[2].Doc);
+				Assert.AreEqual(2, topDocs.ScoreDocs[3].Doc);
 			}
 			
 			/*

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFilteredQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFilteredQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFilteredQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFilteredQuery.cs Sat Sep 10 20:59:58 2011
@@ -128,12 +128,12 @@ namespace Lucene.Net.Search
 			Query filteredquery = new FilteredQuery(query, filter);
 			ScoreDoc[] hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(1, hits[0].doc);
+			Assert.AreEqual(1, hits[0].Doc);
 			QueryUtils.Check(filteredquery, searcher);
 			
 			hits = searcher.Search(filteredquery, null, 1000, new Sort("sorter")).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(1, hits[0].doc);
+			Assert.AreEqual(1, hits[0].Doc);
 			
 			filteredquery = new FilteredQuery(new TermQuery(new Term("field", "one")), filter);
 			hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
@@ -143,7 +143,7 @@ namespace Lucene.Net.Search
 			filteredquery = new FilteredQuery(new TermQuery(new Term("field", "x")), filter);
 			hits = searcher.Search(filteredquery, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(3, hits[0].doc);
+			Assert.AreEqual(3, hits[0].Doc);
 			QueryUtils.Check(filteredquery, searcher);
 			
 			filteredquery = new FilteredQuery(new TermQuery(new Term("field", "y")), filter);
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search
 			
 			for (int i = 0; i < hits1.Length; i++)
 			{
-				Assert.AreEqual(hits1[i].score, hits2[i].score, 0.0000001f);
+				Assert.AreEqual(hits1[i].Score, hits2[i].Score, 0.0000001f);
 			}
 		}
 		

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFuzzyQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFuzzyQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFuzzyQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestFuzzyQuery.cs Sat Sep 10 20:59:58 2011
@@ -94,43 +94,43 @@ namespace Lucene.Net.Search
 			query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMinSimilarity, 0);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaa"));
 			// default allows for up to two edits:
-			Assert.AreEqual(searcher.Doc(hits[1].doc).Get("field"), ("aaaab"));
-			Assert.AreEqual(searcher.Doc(hits[2].doc).Get("field"), ("aaabb"));
+			Assert.AreEqual(searcher.Doc(hits[1].Doc).Get("field"), ("aaaab"));
+			Assert.AreEqual(searcher.Doc(hits[2].Doc).Get("field"), ("aaabb"));
 			
 			// query similar to a word in the index:
 			query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMinSimilarity, 0);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaa"));
-			Assert.AreEqual(searcher.Doc(hits[1].doc).Get("field"), ("aaaab"));
-			Assert.AreEqual(searcher.Doc(hits[2].doc).Get("field"), ("aaabb"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[1].Doc).Get("field"), ("aaaab"));
+			Assert.AreEqual(searcher.Doc(hits[2].Doc).Get("field"), ("aaabb"));
 			
 			// now with prefix
 			query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMinSimilarity, 1);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaa"));
-			Assert.AreEqual(searcher.Doc(hits[1].doc).Get("field"), ("aaaab"));
-			Assert.AreEqual(searcher.Doc(hits[2].doc).Get("field"), ("aaabb"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[1].Doc).Get("field"), ("aaaab"));
+			Assert.AreEqual(searcher.Doc(hits[2].Doc).Get("field"), ("aaabb"));
 			query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMinSimilarity, 2);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaa"));
-			Assert.AreEqual(searcher.Doc(hits[1].doc).Get("field"), ("aaaab"));
-			Assert.AreEqual(searcher.Doc(hits[2].doc).Get("field"), ("aaabb"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[1].Doc).Get("field"), ("aaaab"));
+			Assert.AreEqual(searcher.Doc(hits[2].Doc).Get("field"), ("aaabb"));
 			query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMinSimilarity, 3);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaa"));
-			Assert.AreEqual(searcher.Doc(hits[1].doc).Get("field"), ("aaaab"));
-			Assert.AreEqual(searcher.Doc(hits[2].doc).Get("field"), ("aaabb"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[1].Doc).Get("field"), ("aaaab"));
+			Assert.AreEqual(searcher.Doc(hits[2].Doc).Get("field"), ("aaabb"));
 			query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMinSimilarity, 4);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(2, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaa"));
-			Assert.AreEqual(searcher.Doc(hits[1].doc).Get("field"), ("aaaab"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[1].Doc).Get("field"), ("aaaab"));
 			query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMinSimilarity, 5);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(0, hits.Length);
@@ -139,25 +139,25 @@ namespace Lucene.Net.Search
 			query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMinSimilarity, 0);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("ddddd"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("ddddd"));
 			
 			// now with prefix
 			query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMinSimilarity, 1);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("ddddd"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("ddddd"));
 			query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMinSimilarity, 2);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("ddddd"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("ddddd"));
 			query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMinSimilarity, 3);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("ddddd"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("ddddd"));
 			query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMinSimilarity, 4);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("ddddd"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("ddddd"));
 			query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMinSimilarity, 5);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(0, hits.Length);
@@ -193,17 +193,17 @@ namespace Lucene.Net.Search
 			query = new FuzzyQuery(new Term("field", "aaaaccc"), FuzzyQuery.defaultMinSimilarity, 0);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaaaa"));
 			
 			// now with prefix
 			query = new FuzzyQuery(new Term("field", "aaaaccc"), FuzzyQuery.defaultMinSimilarity, 1);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaaaa"));
 			query = new FuzzyQuery(new Term("field", "aaaaccc"), FuzzyQuery.defaultMinSimilarity, 4);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), ("aaaaaaa"));
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), ("aaaaaaa"));
 			query = new FuzzyQuery(new Term("field", "aaaaccc"), FuzzyQuery.defaultMinSimilarity, 5);
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(0, hits.Length);
@@ -336,7 +336,7 @@ namespace Lucene.Net.Search
 			IndexSearcher searcher = new IndexSearcher(r);
 			ScoreDoc[] hits = searcher.Search(q, 10).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
-			Assert.AreEqual(searcher.Doc(hits[0].doc).Get("field"), "Giga byte");
+			Assert.AreEqual(searcher.Doc(hits[0].Doc).Get("field"), "Giga byte");
 			r.Close();
 		}
 		

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMatchAllDocsQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMatchAllDocsQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMatchAllDocsQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMatchAllDocsQuery.cs Sat Sep 10 20:59:58 2011
@@ -70,9 +70,9 @@ namespace Lucene.Net.Search
 			
 			hits = is_Renamed.Search(new MatchAllDocsQuery(), null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
-			Assert.AreEqual(ir.Document(hits[0].doc).Get("key"), "one");
-			Assert.AreEqual(ir.Document(hits[1].doc).Get("key"), "two");
-			Assert.AreEqual(ir.Document(hits[2].doc).Get("key"), "three four");
+			Assert.AreEqual(ir.Document(hits[0].Doc).Get("key"), "one");
+			Assert.AreEqual(ir.Document(hits[1].Doc).Get("key"), "two");
+			Assert.AreEqual(ir.Document(hits[2].Doc).Get("key"), "three four");
 			
 			// assert with norms scoring turned on
 			
@@ -80,9 +80,9 @@ namespace Lucene.Net.Search
 			hits = is_Renamed.Search(normsQuery, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
 			
-			Assert.AreEqual(ir.Document(hits[0].doc).Get("key"), "three four");
-			Assert.AreEqual(ir.Document(hits[1].doc).Get("key"), "two");
-			Assert.AreEqual(ir.Document(hits[2].doc).Get("key"), "one");
+			Assert.AreEqual(ir.Document(hits[0].Doc).Get("key"), "three four");
+			Assert.AreEqual(ir.Document(hits[1].Doc).Get("key"), "two");
+			Assert.AreEqual(ir.Document(hits[2].Doc).Get("key"), "one");
 			
 			// change norm & retest
 			ir.SetNorm(0, "key", 400f);
@@ -90,9 +90,9 @@ namespace Lucene.Net.Search
 			hits = is_Renamed.Search(normsQuery, null, 1000).ScoreDocs;
 			Assert.AreEqual(3, hits.Length);
 			
-			Assert.AreEqual(ir.Document(hits[0].doc).Get("key"), "one");
-			Assert.AreEqual(ir.Document(hits[1].doc).Get("key"), "three four");
-			Assert.AreEqual(ir.Document(hits[2].doc).Get("key"), "two");
+			Assert.AreEqual(ir.Document(hits[0].Doc).Get("key"), "one");
+			Assert.AreEqual(ir.Document(hits[1].Doc).Get("key"), "three four");
+			Assert.AreEqual(ir.Document(hits[2].Doc).Get("key"), "two");
 			
 			// some artificial queries to trigger the use of skipTo():
 			

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcher.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcher.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcher.cs Sat Sep 10 20:59:58 2011
@@ -162,7 +162,7 @@ namespace Lucene.Net.Search
 			// iterating over the hit documents
 			for (int i = 0; i < hits.Length; i++)
 			{
-				mSearcher.Doc(hits[i].doc);
+				mSearcher.Doc(hits[i].Doc);
 			}
 			mSearcher.Close();
 			
@@ -193,19 +193,19 @@ namespace Lucene.Net.Search
 			for (int i = 0; i < hits2.Length; i++)
 			{
 				// no exception should happen at this point
-				mSearcher2.Doc(hits2[i].doc);
+				mSearcher2.Doc(hits2[i].Doc);
 			}
 			
 			// test the subSearcher() method:
 			Query subSearcherQuery = parser.Parse("id:doc1");
 			hits2 = mSearcher2.Search(subSearcherQuery, null, 1000).ScoreDocs;
 			Assert.AreEqual(2, hits2.Length);
-			Assert.AreEqual(0, mSearcher2.SubSearcher(hits2[0].doc)); // hit from searchers2[0]
-			Assert.AreEqual(1, mSearcher2.SubSearcher(hits2[1].doc)); // hit from searchers2[1]
+			Assert.AreEqual(0, mSearcher2.SubSearcher(hits2[0].Doc)); // hit from searchers2[0]
+			Assert.AreEqual(1, mSearcher2.SubSearcher(hits2[1].Doc)); // hit from searchers2[1]
 			subSearcherQuery = parser.Parse("id:doc2");
 			hits2 = mSearcher2.Search(subSearcherQuery, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits2.Length);
-			Assert.AreEqual(1, mSearcher2.SubSearcher(hits2[0].doc)); // hit from searchers2[1]
+			Assert.AreEqual(1, mSearcher2.SubSearcher(hits2[0].Doc)); // hit from searchers2[1]
 			mSearcher2.Close();
 			
 			//--------------------------------------------------------------------
@@ -238,7 +238,7 @@ namespace Lucene.Net.Search
 			// iterating over the hit documents
 			for (int i = 0; i < hits3.Length; i++)
 			{
-				mSearcher3.Doc(hits3[i].doc);
+				mSearcher3.Doc(hits3[i].Doc);
 			}
 			mSearcher3.Close();
 			indexStoreA.Close();
@@ -303,7 +303,7 @@ namespace Lucene.Net.Search
 			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
 			Assert.IsTrue(hits.Length == 2, hits.Length + " does not equal: " + 2);
-			Document document = searcher.Doc(hits[0].doc);
+			Document document = searcher.Doc(hits[0].Doc);
 			Assert.IsTrue(document != null, "document is null and it shouldn't be");
 			Assert.IsTrue(document.GetFields().Count == 2, "document.getFields() Size: " + document.GetFields().Count + " is not: " + 2);
 			//Should be one document from each directory
@@ -311,7 +311,7 @@ namespace Lucene.Net.Search
             Support.Set<string> ftl = new Support.Set<string>();
 			ftl.Add("other");
             SetBasedFieldSelector fs = new SetBasedFieldSelector(ftl, new Support.Set<string>());
-			document = searcher.Doc(hits[0].doc, fs);
+			document = searcher.Doc(hits[0].Doc, fs);
 			Assert.IsTrue(document != null, "document is null and it shouldn't be");
 			Assert.IsTrue(document.GetFields().Count == 1, "document.getFields() Size: " + document.GetFields().Count + " is not: " + 1);
 			System.String value_Renamed = document.Get("contents");
@@ -321,7 +321,7 @@ namespace Lucene.Net.Search
 			ftl.Clear();
 			ftl.Add("contents");
             fs = new SetBasedFieldSelector(ftl, new Support.Set<string>());
-			document = searcher.Doc(hits[1].doc, fs);
+			document = searcher.Doc(hits[1].Doc, fs);
 			value_Renamed = document.Get("contents");
 			Assert.IsTrue(value_Renamed != null, "value is null and it shouldn't be");
 			value_Renamed = document.Get("other");
@@ -362,7 +362,7 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(2, hits.Length, message);
 			
 			// Store the scores for use later
-			float[] scores = new float[]{hits[0].score, hits[1].score};
+			float[] scores = new float[]{hits[0].Score, hits[1].Score};
 			
 			Assert.IsTrue(scores[0] > scores[1], message);
 			
@@ -394,8 +394,8 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(2, hits.Length, message);
 			
 			// The scores should be the same (within reason)
-			Assert.AreEqual(scores[0], hits[0].score, 1e-6, message); // This will a document from ramDirectory1
-			Assert.AreEqual(scores[1], hits[1].score, 1e-6, message); // This will a document from ramDirectory2
+			Assert.AreEqual(scores[0], hits[0].Score, 1e-6, message); // This will a document from ramDirectory1
+			Assert.AreEqual(scores[1], hits[1].Score, 1e-6, message); // This will a document from ramDirectory2
 			
 			
 			
@@ -404,8 +404,8 @@ namespace Lucene.Net.Search
 			
 			Assert.AreEqual(2, hits.Length, message);
 			
-			Assert.AreEqual(scores[0], hits[0].score, 1e-6, message); // This will a document from ramDirectory1
-			Assert.AreEqual(scores[1], hits[1].score, 1e-6, message); // This will a document from ramDirectory2
+			Assert.AreEqual(scores[0], hits[0].Score, 1e-6, message); // This will a document from ramDirectory1
+			Assert.AreEqual(scores[1], hits[1].Score, 1e-6, message); // This will a document from ramDirectory2
 			
 			searcher.Close();
 			



Mime
View raw message