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 [2/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
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcherRanking.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcherRanking.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcherRanking.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiSearcherRanking.cs
Sat Sep 10 20:59:58 2011
@@ -116,13 +116,13 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(multiSearcherHits.Length, singleSearcherHits.Length);
 			for (int i = 0; i < multiSearcherHits.Length; i++)
 			{
-				Document docMulti = multiSearcher.Doc(multiSearcherHits[i].doc);
-				Document docSingle = singleSearcher.Doc(singleSearcherHits[i].doc);
+				Document docMulti = multiSearcher.Doc(multiSearcherHits[i].Doc);
+				Document docSingle = singleSearcher.Doc(singleSearcherHits[i].Doc);
 				if (verbose)
-					System.Console.Out.WriteLine("Multi:  " + docMulti.Get(FIELD_NAME) + " score=" + multiSearcherHits[i].score);
+					System.Console.Out.WriteLine("Multi:  " + docMulti.Get(FIELD_NAME) + " score=" + multiSearcherHits[i].Score);
 				if (verbose)
-					System.Console.Out.WriteLine("Single: " + docSingle.Get(FIELD_NAME) + " score=" + singleSearcherHits[i].score);
-				Assert.AreEqual(multiSearcherHits[i].score, singleSearcherHits[i].score, 0.001f);
+					System.Console.Out.WriteLine("Single: " + docSingle.Get(FIELD_NAME) + " score=" + singleSearcherHits[i].Score);
+				Assert.AreEqual(multiSearcherHits[i].Score, singleSearcherHits[i].Score, 0.001f);
 				Assert.AreEqual(docMulti.Get(FIELD_NAME), docSingle.Get(FIELD_NAME));
 			}
 			if (verbose)

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiTermConstantScore.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiTermConstantScore.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiTermConstantScore.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestMultiTermConstantScore.cs
Sat Sep 10 20:59:58 2011
@@ -200,10 +200,10 @@ namespace Lucene.Net.Search
 			result = search.Search(Csrq("data", "1", "6", T, T), null, 1000).ScoreDocs;
 			int numHits = result.Length;
 			AssertEquals("wrong number of results", 6, numHits);
-			float score = result[0].score;
+			float score = result[0].Score;
 			for (int i = 1; i < numHits; i++)
 			{
-				AssertEquals("score for " + i + " was not the same", score, result[i].score);
+				AssertEquals("score for " + i + " was not the same", score, result[i].Score);
 			}
 			
 			result = search.Search(Csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE),
null, 1000).ScoreDocs;
@@ -211,7 +211,7 @@ namespace Lucene.Net.Search
 			AssertEquals("wrong number of results", 6, numHits);
 			for (int i = 0; i < numHits; i++)
 			{
-				AssertEquals("score for " + i + " was not the same", score, result[i].score);
+				AssertEquals("score for " + i + " was not the same", score, result[i].Score);
 			}
 		}
 		
@@ -241,9 +241,9 @@ namespace Lucene.Net.Search
 			bq.Add(q2, BooleanClause.Occur.SHOULD);
 			
 			ScoreDoc[] hits = search.Search(bq, null, 1000).ScoreDocs;
-			Assert.AreEqual(1, hits[0].doc);
-			Assert.AreEqual(0, hits[1].doc);
-			Assert.IsTrue(hits[0].score > hits[1].score);
+			Assert.AreEqual(1, hits[0].Doc);
+			Assert.AreEqual(0, hits[1].Doc);
+			Assert.IsTrue(hits[0].Score > hits[1].Score);
 			
 			q1 = Csrq("data", "A", "A", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE);
// matches document #0
 			q1.SetBoost(.1f);
@@ -253,9 +253,9 @@ namespace Lucene.Net.Search
 			bq.Add(q2, BooleanClause.Occur.SHOULD);
 			
 			hits = search.Search(bq, null, 1000).ScoreDocs;
-			Assert.AreEqual(1, hits[0].doc);
-			Assert.AreEqual(0, hits[1].doc);
-			Assert.IsTrue(hits[0].score > hits[1].score);
+			Assert.AreEqual(1, hits[0].Doc);
+			Assert.AreEqual(0, hits[1].Doc);
+			Assert.IsTrue(hits[0].Score > hits[1].Score);
 			
 			q1 = Csrq("data", "A", "A", T, T); // matches document #0
 			q1.SetBoost(10f);
@@ -265,9 +265,9 @@ namespace Lucene.Net.Search
 			bq.Add(q2, BooleanClause.Occur.SHOULD);
 			
 			hits = search.Search(bq, null, 1000).ScoreDocs;
-			Assert.AreEqual(0, hits[0].doc);
-			Assert.AreEqual(1, hits[1].doc);
-			Assert.IsTrue(hits[0].score > hits[1].score);
+			Assert.AreEqual(0, hits[0].Doc);
+			Assert.AreEqual(1, hits[1].Doc);
+			Assert.IsTrue(hits[0].Score > hits[1].Score);
 		}
 		
         [Test]
@@ -298,7 +298,7 @@ namespace Lucene.Net.Search
 			AssertEquals("wrong numebr of hits", numHits, actual.Length);
 			for (int i = 0; i < numHits; i++)
 			{
-				AssertEquals("mismatch in docid for hit#" + i, expected[i].doc, actual[i].doc);
+				AssertEquals("mismatch in docid for hit#" + i, expected[i].Doc, actual[i].Doc);
 			}
 		}
 		

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery32.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery32.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery32.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery32.cs
Sat Sep 10 20:59:58 2011
@@ -96,9 +96,9 @@ namespace Lucene.Net.Search
 				ScoreDoc[] sd = topDocs.ScoreDocs;
 				Assert.IsNotNull(sd);
 				Assert.AreEqual(count, sd.Length, "Score doc count" + type);
-				Document doc = searcher.Doc(sd[0].doc);
+				Document doc = searcher.Doc(sd[0].Doc);
 				Assert.AreEqual(2 * distance + startOffset, System.Int32.Parse(doc.Get(field)), "First
doc" + type);
-				doc = searcher.Doc(sd[sd.Length - 1].doc);
+				doc = searcher.Doc(sd[sd.Length - 1].Doc);
 				Assert.AreEqual((1 + count) * distance + startOffset, System.Int32.Parse(doc.Get(field)),
"Last doc" + type);
 				if (i > 0)
 				{
@@ -169,9 +169,9 @@ namespace Lucene.Net.Search
 			ScoreDoc[] sd = topDocs.ScoreDocs;
 			Assert.IsNotNull(sd);
 			Assert.AreEqual(count, sd.Length, "Score doc count");
-			Document doc = searcher.Doc(sd[0].doc);
+			Document doc = searcher.Doc(sd[0].Doc);
 			Assert.AreEqual(startOffset, System.Int32.Parse(doc.Get(field)), "First doc");
-			doc = searcher.Doc(sd[sd.Length - 1].doc);
+			doc = searcher.Doc(sd[sd.Length - 1].Doc);
 			Assert.AreEqual((count - 1) * distance + startOffset, System.Int32.Parse(doc.Get(field)),
"Last doc");
 		}
 		
@@ -206,9 +206,9 @@ namespace Lucene.Net.Search
 			ScoreDoc[] sd = topDocs.ScoreDocs;
 			Assert.IsNotNull(sd);
 			Assert.AreEqual(noDocs - count, sd.Length, "Score doc count");
-			Document doc = searcher.Doc(sd[0].doc);
+			Document doc = searcher.Doc(sd[0].Doc);
 			Assert.AreEqual(count * distance + startOffset, System.Int32.Parse(doc.Get(field)), "First
doc");
-			doc = searcher.Doc(sd[sd.Length - 1].doc);
+			doc = searcher.Doc(sd[sd.Length - 1].Doc);
 			Assert.AreEqual((noDocs - 1) * distance + startOffset, System.Int32.Parse(doc.Get(field)),
"Last doc");
 		}
 		
@@ -438,10 +438,10 @@ namespace Lucene.Net.Search
 					continue;
 				ScoreDoc[] sd = topDocs.ScoreDocs;
 				Assert.IsNotNull(sd);
-				int last = System.Int32.Parse(searcher.Doc(sd[0].doc).Get(field));
+				int last = System.Int32.Parse(searcher.Doc(sd[0].Doc).Get(field));
 				for (int j = 1; j < sd.Length; j++)
 				{
-					int act = System.Int32.Parse(searcher.Doc(sd[j].doc).Get(field));
+					int act = System.Int32.Parse(searcher.Doc(sd[j].Doc).Get(field));
 					Assert.IsTrue(last > act, "Docs should be sorted backwards");
 					last = act;
 				}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery64.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery64.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery64.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestNumericRangeQuery64.cs
Sat Sep 10 20:59:58 2011
@@ -96,9 +96,9 @@ namespace Lucene.Net.Search
 				ScoreDoc[] sd = topDocs.ScoreDocs;
 				Assert.IsNotNull(sd);
 				Assert.AreEqual(count, sd.Length, "Score doc count" + type);
-				Document doc = searcher.Doc(sd[0].doc);
+				Document doc = searcher.Doc(sd[0].Doc);
 				Assert.AreEqual(2 * distance + startOffset, System.Int64.Parse(doc.Get(field)), "First
doc" + type);
-				doc = searcher.Doc(sd[sd.Length - 1].doc);
+				doc = searcher.Doc(sd[sd.Length - 1].Doc);
 				Assert.AreEqual((1 + count) * distance + startOffset, System.Int64.Parse(doc.Get(field)),
"Last doc" + type);
 				if (i > 0)
 				{
@@ -176,9 +176,9 @@ namespace Lucene.Net.Search
 			ScoreDoc[] sd = topDocs.ScoreDocs;
 			Assert.IsNotNull(sd);
 			Assert.AreEqual(count, sd.Length, "Score doc count");
-			Document doc = searcher.Doc(sd[0].doc);
+			Document doc = searcher.Doc(sd[0].Doc);
 			Assert.AreEqual(startOffset, System.Int64.Parse(doc.Get(field)), "First doc");
-			doc = searcher.Doc(sd[sd.Length - 1].doc);
+			doc = searcher.Doc(sd[sd.Length - 1].Doc);
 			Assert.AreEqual((count - 1) * distance + startOffset, System.Int64.Parse(doc.Get(field)),
"Last doc");
 		}
 		
@@ -219,9 +219,9 @@ namespace Lucene.Net.Search
 			ScoreDoc[] sd = topDocs.ScoreDocs;
 			Assert.IsNotNull(sd);
 			Assert.AreEqual(noDocs - count, sd.Length, "Score doc count");
-			Document doc = searcher.Doc(sd[0].doc);
+			Document doc = searcher.Doc(sd[0].Doc);
 			Assert.AreEqual(count * distance + startOffset, System.Int64.Parse(doc.Get(field)), "First
doc");
-			doc = searcher.Doc(sd[sd.Length - 1].doc);
+			doc = searcher.Doc(sd[sd.Length - 1].Doc);
 			Assert.AreEqual((noDocs - 1) * distance + startOffset, System.Int64.Parse(doc.Get(field)),
"Last doc");
 		}
 		
@@ -475,10 +475,10 @@ namespace Lucene.Net.Search
 					continue;
 				ScoreDoc[] sd = topDocs.ScoreDocs;
 				Assert.IsNotNull(sd);
-				long last = System.Int64.Parse(searcher.Doc(sd[0].doc).Get(field));
+				long last = System.Int64.Parse(searcher.Doc(sd[0].Doc).Get(field));
 				for (int j = 1; j < sd.Length; j++)
 				{
-					long act = System.Int64.Parse(searcher.Doc(sd[j].doc).Get(field));
+					long act = System.Int64.Parse(searcher.Doc(sd[j].Doc).Get(field));
 					Assert.IsTrue(last > act, "Docs should be sorted backwards");
 					last = act;
 				}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPhraseQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPhraseQuery.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPhraseQuery.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPhraseQuery.cs Sat
Sep 10 20:59:58 2011
@@ -382,12 +382,12 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(3, hits.Length);
 			// Make sure that those matches where the terms appear closer to
 			// each other get a higher score:
-			Assert.AreEqual(0.71, hits[0].score, 0.01);
-			Assert.AreEqual(0, hits[0].doc);
-			Assert.AreEqual(0.44, hits[1].score, 0.01);
-			Assert.AreEqual(1, hits[1].doc);
-			Assert.AreEqual(0.31, hits[2].score, 0.01);
-			Assert.AreEqual(2, hits[2].doc);
+			Assert.AreEqual(0.71, hits[0].Score, 0.01);
+			Assert.AreEqual(0, hits[0].Doc);
+			Assert.AreEqual(0.44, hits[1].Score, 0.01);
+			Assert.AreEqual(1, hits[1].Doc);
+			Assert.AreEqual(0.31, hits[2].Score, 0.01);
+			Assert.AreEqual(2, hits[2].Doc);
 			QueryUtils.Check(query, searcher);
 		}
 		
@@ -491,7 +491,7 @@ namespace Lucene.Net.Search
 			query.Add(new Term("field", "three"));
 			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "phrase found with exact phrase scorer");
-			float score0 = hits[0].score;
+			float score0 = hits[0].Score;
 			//System.out.println("(exact) field: two three: "+score0);
 			QueryUtils.Check(query, searcher);
 			
@@ -499,7 +499,7 @@ namespace Lucene.Net.Search
 			query.SetSlop(2); // to use sloppy scorer 
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "just sloppy enough");
-			float score1 = hits[0].score;
+			float score1 = hits[0].Score;
 			//System.out.println("(sloppy) field: two three: "+score1);
 			Assert.AreEqual(score0, score1, SCORE_COMP_THRESH, "exact scorer and sloppy scorer score
the same when slop does not matter");
 			QueryUtils.Check(query, searcher);
@@ -511,7 +511,7 @@ namespace Lucene.Net.Search
 			query.Add(new Term("palindrome", "three"));
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "just sloppy enough");
-			float score2 = hits[0].score;
+			float score2 = hits[0].Score;
 			//System.out.println("palindrome: two three: "+score2);
 			QueryUtils.Check(query, searcher);
 			
@@ -525,7 +525,7 @@ namespace Lucene.Net.Search
 			query.Add(new Term("palindrome", "two"));
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "just sloppy enough");
-			float score3 = hits[0].score;
+			float score3 = hits[0].Score;
 			//System.out.println("palindrome: three two: "+score3);
 			QueryUtils.Check(query, searcher);
 			
@@ -553,7 +553,7 @@ namespace Lucene.Net.Search
 			query.Add(new Term("field", "three"));
 			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "phrase found with exact phrase scorer");
-			float score0 = hits[0].score;
+			float score0 = hits[0].Score;
 			//System.out.println("(exact) field: one two three: "+score0);
 			QueryUtils.Check(query, searcher);
 			
@@ -561,7 +561,7 @@ namespace Lucene.Net.Search
 			query.SetSlop(4); // to use sloppy scorer 
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "just sloppy enough");
-			float score1 = hits[0].score;
+			float score1 = hits[0].Score;
 			//System.out.println("(sloppy) field: one two three: "+score1);
 			Assert.AreEqual(score0, score1, SCORE_COMP_THRESH, "exact scorer and sloppy scorer score
the same when slop does not matter");
 			QueryUtils.Check(query, searcher);
@@ -574,7 +574,7 @@ namespace Lucene.Net.Search
 			query.Add(new Term("palindrome", "three"));
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "just sloppy enough");
-			float score2 = hits[0].score;
+			float score2 = hits[0].Score;
 			//System.out.println("palindrome: one two three: "+score2);
 			QueryUtils.Check(query, searcher);
 			
@@ -589,7 +589,7 @@ namespace Lucene.Net.Search
 			query.Add(new Term("palindrome", "one"));
 			hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length, "just sloppy enough");
-			float score3 = hits[0].score;
+			float score3 = hits[0].Score;
 			//System.out.println("palindrome: three two one: "+score3);
 			QueryUtils.Check(query, searcher);
 			

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPositiveScoresOnlyCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPositiveScoresOnlyCollector.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPositiveScoresOnlyCollector.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestPositiveScoresOnlyCollector.cs
Sat Sep 10 20:59:58 2011
@@ -121,7 +121,7 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(numPositiveScores, td.TotalHits);
 			for (int i = 0; i < sd.Length; i++)
 			{
-				Assert.IsTrue(sd[i].score > 0, "only positive scores should return: " + sd[i].score);
+				Assert.IsTrue(sd[i].Score > 0, "only positive scores should return: " + sd[i].Score);
 			}
 		}
 	}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSimpleExplanations.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSimpleExplanations.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSimpleExplanations.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSimpleExplanations.cs
Sat Sep 10 20:59:58 2011
@@ -437,7 +437,7 @@ namespace Lucene.Net.Search
 			
 			Assert.AreEqual(3, hits.Length);
 			
-			Explanation explain = mSearcher.Explain(query, hits[0].doc);
+			Explanation explain = mSearcher.Explain(query, hits[0].Doc);
 			System.String exp = explain.ToString(0);
 			Assert.IsTrue(exp.IndexOf("maxDocs=3") > - 1, exp);
 			Assert.IsTrue(exp.IndexOf("docFreq=3") > - 1, exp);
@@ -447,7 +447,7 @@ namespace Lucene.Net.Search
 			
 			Assert.AreEqual(3, hits.Length);
 			
-			explain = mSearcher.Explain(query, hits[0].doc);
+			explain = mSearcher.Explain(query, hits[0].Doc);
 			exp = explain.ToString(0);
 			Assert.IsTrue(exp.IndexOf("1=3") > - 1, exp);
 			Assert.IsTrue(exp.IndexOf("2=3") > - 1, exp);
@@ -457,7 +457,7 @@ namespace Lucene.Net.Search
 			
 			Assert.AreEqual(3, hits.Length);
 			
-			explain = mSearcher.Explain(query, hits[0].doc);
+			explain = mSearcher.Explain(query, hits[0].Doc);
 			exp = explain.ToString(0);
 			Assert.IsTrue(exp.IndexOf("1=3") > - 1, exp);
 			Assert.IsTrue(exp.IndexOf("2=3") > - 1, exp);

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSort.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSort.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestSort.cs Sat Sep 10
20:59:58 2011
@@ -226,7 +226,7 @@ namespace Lucene.Net.Search
 			{
 				System.Collections.BitArray bs = new System.Collections.BitArray((reader.MaxDoc() % 64
== 0?reader.MaxDoc() / 64:reader.MaxDoc() / 64 + 1) * 64);
                 for (int i = 0; i < reader.MaxDoc(); i++) bs.Set(i, true);
-				bs.Set(docs1.ScoreDocs[0].doc, true);
+				bs.Set(docs1.ScoreDocs[0].Doc, true);
 				return new DocIdBitSet(bs);
 			}
 		}
@@ -489,7 +489,7 @@ namespace Lucene.Net.Search
 			bool fail = false;
 			for (int x = 0; x < n; ++x)
 			{
-				Document doc2 = searcher.Doc(result[x].doc);
+				Document doc2 = searcher.Doc(result[x].Doc);
 				System.String[] v = doc2.GetValues("tracer");
 				System.String[] v2 = doc2.GetValues("tracer2");
 				for (int j = 0; j < v.Length; ++j)
@@ -515,18 +515,18 @@ namespace Lucene.Net.Search
 							else if (cmp == 0)
 							{
 								// ensure docid is in order
-								if (result[x].doc < lastDocId)
+								if (result[x].Doc < lastDocId)
 								{
 									fail = true;
-									System.Console.Out.WriteLine("doc fail:" + result[x].doc + " > " + lastDocId);
+									System.Console.Out.WriteLine("doc fail:" + result[x].Doc + " > " + lastDocId);
 								}
 							}
 						}
 					}
 					last = v[j];
 					lastSub = v2[j];
-					lastDocId = result[x].doc;
-					buff.Append(v[j] + "(" + v2[j] + ")(" + result[x].doc + ") ");
+					lastDocId = result[x].Doc;
+					buff.Append(v[j] + "(" + v2[j] + ")(" + result[x].Doc + ") ");
 				}
 			}
 			if (fail)
@@ -986,7 +986,7 @@ namespace Lucene.Net.Search
 			
 			TopDocs docs2 = full.Search(queryE, filt, nDocs, sort);
 			
-			Assert.AreEqual(docs1.ScoreDocs[0].score, docs2.ScoreDocs[0].score, 1e-6);
+			Assert.AreEqual(docs1.ScoreDocs[0].Score, docs2.ScoreDocs[0].Score, 1e-6);
 		}
 		
 		[Test]
@@ -1009,7 +1009,7 @@ namespace Lucene.Net.Search
 				ScoreDoc[] sd = tdc.TopDocs().ScoreDocs;
 				for (int j = 1; j < sd.Length; j++)
 				{
-					Assert.IsTrue(sd[j].doc != sd[j - 1].doc);
+					Assert.IsTrue(sd[j].Doc != sd[j - 1].Doc);
 				}
 			}
 		}
@@ -1031,7 +1031,7 @@ namespace Lucene.Net.Search
 				ScoreDoc[] sd = td.ScoreDocs;
 				for (int j = 0; j < sd.Length; j++)
 				{
-					Assert.IsTrue(System.Single.IsNaN(sd[j].score));
+					Assert.IsTrue(System.Single.IsNaN(sd[j].Score));
 				}
 				Assert.IsTrue(System.Single.IsNaN(td.GetMaxScore()));
 			}
@@ -1054,7 +1054,7 @@ namespace Lucene.Net.Search
 				ScoreDoc[] sd = td.ScoreDocs;
 				for (int j = 0; j < sd.Length; j++)
 				{
-					Assert.IsTrue(!System.Single.IsNaN(sd[j].score));
+					Assert.IsTrue(!System.Single.IsNaN(sd[j].Score));
 				}
 				Assert.IsTrue(System.Single.IsNaN(td.GetMaxScore()));
 			}
@@ -1077,7 +1077,7 @@ namespace Lucene.Net.Search
 				ScoreDoc[] sd = td.ScoreDocs;
 				for (int j = 0; j < sd.Length; j++)
 				{
-					Assert.IsTrue(!System.Single.IsNaN(sd[j].score));
+					Assert.IsTrue(!System.Single.IsNaN(sd[j].Score));
 				}
 				Assert.IsTrue(!System.Single.IsNaN(td.GetMaxScore()));
 			}
@@ -1235,7 +1235,7 @@ namespace Lucene.Net.Search
 			int n = result.Length;
 			for (int i = 0; i < n; ++i)
 			{
-				Document doc = searcher.Doc(result[i].doc);
+				Document doc = searcher.Doc(result[i].Doc);
 				System.String[] v = doc.GetValues("tracer");
 				for (int j = 0; j < v.Length; ++j)
 				{
@@ -1251,10 +1251,10 @@ namespace Lucene.Net.Search
 			int n = hits.Length;
 			for (int i = 0; i < n; ++i)
 			{
-				Document doc = searcher.Doc(hits[i].doc);
+				Document doc = searcher.Doc(hits[i].Doc);
 				System.String[] v = doc.GetValues("tracer");
 				Assert.AreEqual(v.Length, 1);
-				scoreMap[v[0]] = (float) hits[i].score;
+				scoreMap[v[0]] = (float) hits[i].Score;
 			}
 			return scoreMap;
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestStressSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestStressSort.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestStressSort.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestStressSort.cs Sat
Sep 10 20:59:58 2011
@@ -453,17 +453,17 @@ namespace Lucene.Net.Search
 					System.Diagnostics.Debug.Assert(newDocs[i] is FieldDoc);
 					FieldDoc oldHit = (FieldDoc) oldDocs[i];
 					FieldDoc newHit = (FieldDoc) newDocs[i];
-					Assert.AreEqual(oldHit.doc, newHit.doc, "hit " + i + " of " + oldDocs.Length + " differs:
oldDoc=" + oldHit.doc + " vs newDoc=" + newHit.doc + " oldFields=" + _TestUtil.ArrayToString(oldHit.fields)
+ " newFields=" + _TestUtil.ArrayToString(newHit.fields));
+					Assert.AreEqual(oldHit.Doc, newHit.Doc, "hit " + i + " of " + oldDocs.Length + " differs:
oldDoc=" + oldHit.Doc + " vs newDoc=" + newHit.Doc + " oldFields=" + _TestUtil.ArrayToString(oldHit.fields)
+ " newFields=" + _TestUtil.ArrayToString(newHit.fields));
 					
-					Assert.AreEqual(oldHit.score, newHit.score, 0.00001);
+					Assert.AreEqual(oldHit.Score, newHit.Score, 0.00001);
 					Assert.IsTrue(Support.CollectionsHelper.Equals(oldHit.fields, newHit.fields));
 				}
 				else
 				{
 					ScoreDoc oldHit = oldDocs[i];
 					ScoreDoc newHit = newDocs[i];
-					Assert.AreEqual(oldHit.doc, newHit.doc);
-					Assert.AreEqual(oldHit.score, newHit.score, 0.00001);
+					Assert.AreEqual(oldHit.Doc, newHit.Doc);
+					Assert.AreEqual(oldHit.Score, newHit.Score, 0.00001);
 				}
 			}
 		}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTermVectors.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTermVectors.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTermVectors.cs Sat
Sep 10 20:59:58 2011
@@ -91,7 +91,7 @@ namespace Lucene.Net.Search
 				
 				for (int i = 0; i < hits.Length; i++)
 				{
-					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].doc);
+					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 					Assert.IsTrue(vector != null);
 					Assert.IsTrue(vector.Length == 1);
 				}
@@ -148,14 +148,14 @@ namespace Lucene.Net.Search
 				
 				for (int i = 0; i < hits.Length; i++)
 				{
-					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].doc);
+					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 					Assert.IsTrue(vector != null);
 					Assert.IsTrue(vector.Length == 1);
 					
-					bool shouldBePosVector = (hits[i].doc % 2 == 0)?true:false;
+					bool shouldBePosVector = (hits[i].Doc % 2 == 0)?true:false;
 					Assert.IsTrue((shouldBePosVector == false) || (shouldBePosVector == true &&
(vector[0] is TermPositionVector == true)));
 					
-					bool shouldBeOffVector = (hits[i].doc % 3 == 0)?true:false;
+					bool shouldBeOffVector = (hits[i].Doc % 3 == 0)?true:false;
 					Assert.IsTrue((shouldBeOffVector == false) || (shouldBeOffVector == true &&
(vector[0] is TermPositionVector == true)));
 					
 					if (shouldBePosVector || shouldBeOffVector)
@@ -219,7 +219,7 @@ namespace Lucene.Net.Search
 				
 				for (int i = 0; i < hits.Length; i++)
 				{
-					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].doc);
+					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 					Assert.IsTrue(vector != null);
 					Assert.IsTrue(vector.Length == 1);
 					
@@ -313,17 +313,17 @@ namespace Lucene.Net.Search
 				ScoreDoc[] hits = knownSearcher.Search(query, null, 1000).ScoreDocs;
 				//doc 3 should be the first hit b/c it is the shortest match
 				Assert.IsTrue(hits.Length == 3);
-				float score = hits[0].score;
+				float score = hits[0].Score;
 				/*System.out.println("Hit 0: " + hits.id(0) + " Score: " + hits.score(0) + " String:
" + hits.doc(0).toString());
 				System.out.println("Explain: " + knownSearcher.explain(query, hits.id(0)));
 				System.out.println("Hit 1: " + hits.id(1) + " Score: " + hits.score(1) + " String: "
+ hits.doc(1).toString());
 				System.out.println("Explain: " + knownSearcher.explain(query, hits.id(1)));
 				System.out.println("Hit 2: " + hits.id(2) + " Score: " + hits.score(2) + " String: "
+  hits.doc(2).toString());
 				System.out.println("Explain: " + knownSearcher.explain(query, hits.id(2)));*/
-				Assert.IsTrue(hits[0].doc == 2);
-				Assert.IsTrue(hits[1].doc == 3);
-				Assert.IsTrue(hits[2].doc == 0);
-				TermFreqVector vector2 = knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].doc,
"field");
+				Assert.IsTrue(hits[0].Doc == 2);
+				Assert.IsTrue(hits[1].Doc == 3);
+				Assert.IsTrue(hits[2].Doc == 0);
+				TermFreqVector vector2 = knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].Doc,
"field");
 				Assert.IsTrue(vector2 != null);
 				//System.out.println("Vector: " + vector);
 				System.String[] terms = vector2.GetTerms();
@@ -347,7 +347,7 @@ namespace Lucene.Net.Search
 					Assert.IsTrue(freqInt == freq);
 				}
 				SortedTermVectorMapper mapper = new SortedTermVectorMapper(new TermVectorEntryFreqSortedComparator());
-				knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].doc, mapper);
+				knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].Doc, mapper);
 				System.Collections.Generic.SortedSet<TermVectorEntry> vectorEntrySet = mapper.GetTermVectorEntrySet();
 				Assert.IsTrue(vectorEntrySet.Count == 10, "mapper.getTermVectorEntrySet() Size: " + vectorEntrySet.Count
+ " is not: " + 10);
 				TermVectorEntry last = null;
@@ -364,7 +364,7 @@ namespace Lucene.Net.Search
 				}
 				
 				FieldSortedTermVectorMapper fieldMapper = new FieldSortedTermVectorMapper(new TermVectorEntryFreqSortedComparator());
-				knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].doc, fieldMapper);
+				knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].Doc, fieldMapper);
                 IDictionary<string, SortedSet<TermVectorEntry>> map = fieldMapper.GetFieldToTerms();
 				Assert.IsTrue(map.Count == 2, "map Size: " + map.Count + " is not: " + 2);
 				vectorEntrySet = map["field"];
@@ -412,7 +412,7 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(10, hits.Length);
 			for (int i = 0; i < hits.Length; i++)
 			{
-				TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].doc);
+				TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 				Assert.IsTrue(vector != null);
 				Assert.IsTrue(vector.Length == 1);
 			}
@@ -440,7 +440,7 @@ namespace Lucene.Net.Search
 			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			
-			TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[0].doc);
+			TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[0].Doc);
 			Assert.IsTrue(vector != null);
 			Assert.IsTrue(vector.Length == 1);
 			TermPositionVector tfv = (TermPositionVector) vector[0];

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopDocsCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopDocsCollector.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopDocsCollector.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopDocsCollector.cs
Sat Sep 10 20:59:58 2011
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
 				float maxScore = System.Single.NaN;
 				if (start == 0)
 				{
-					maxScore = results[0].score;
+					maxScore = results[0].Score;
 				}
 				else
 				{
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
 					{
 						pq.Pop();
 					}
-					maxScore = ((ScoreDoc) pq.Pop()).score;
+					maxScore = ((ScoreDoc) pq.Pop()).Score;
 				}
 				
 				return new TopDocs(totalHits, results, maxScore);
@@ -226,10 +226,10 @@ namespace Lucene.Net.Search
             TopDocsCollector<ScoreDoc> tdc = doSearch(15);
 			ScoreDoc[] sd = tdc.TopDocs().ScoreDocs;
 			
-			Assert.AreEqual(MAX_SCORE, sd[0].score, 0f);
+			Assert.AreEqual(MAX_SCORE, sd[0].Score, 0f);
 			for (int i = 1; i < sd.Length; i++)
 			{
-				Assert.IsTrue(sd[i - 1].score >= sd[i].score);
+				Assert.IsTrue(sd[i - 1].Score >= sd[i].Score);
 			}
 		}
 	}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopScoreDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopScoreDocCollector.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopScoreDocCollector.cs
(original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestTopScoreDocCollector.cs
Sat Sep 10 20:59:58 2011
@@ -85,7 +85,7 @@ namespace Lucene.Net.Search
 					Assert.AreEqual(3, sd.Length);
 					for (int j = 0; j < sd.Length; j++)
 					{
-						Assert.AreEqual(j, sd[j].doc, "expected doc Id " + j + " found " + sd[j].doc);
+						Assert.AreEqual(j, sd[j].Doc, "expected doc Id " + j + " found " + sd[j].Doc);
 					}
 				}
 			}

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestWildcard.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestWildcard.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestWildcard.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/Search/TestWildcard.cs Sat Sep
10 20:59:58 2011
@@ -259,7 +259,7 @@ namespace Lucene.Net.Search
 					Assert.AreEqual(typeof(PrefixQuery), q.GetType());
 					ScoreDoc[] hits = searcher.Search(q, null, 1000).ScoreDocs;
 					Assert.AreEqual(1, hits.Length);
-					Assert.AreEqual(i, hits[0].doc);
+					Assert.AreEqual(i, hits[0].Doc);
 				}
 			}
 			
@@ -277,7 +277,7 @@ namespace Lucene.Net.Search
 					Assert.AreEqual(typeof(WildcardQuery), q.GetType());
 					ScoreDoc[] hits = searcher.Search(q, null, 1000).ScoreDocs;
 					Assert.AreEqual(1, hits.Length);
-					Assert.AreEqual(i, hits[0].doc);
+					Assert.AreEqual(i, hits[0].Doc);
 				}
 			}
 			

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestDemo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestDemo.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestDemo.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestDemo.cs Sat Sep 10 20:59:58
2011
@@ -74,7 +74,7 @@ namespace Lucene.Net
 			// Iterate through the results:
 			for (int i = 0; i < hits.Length; i++)
 			{
-				Document hitDoc = isearcher.Doc(hits[i].doc);
+				Document hitDoc = isearcher.Doc(hits[i].Doc);
 				Assert.AreEqual(hitDoc.Get("fieldname"), "This is the text to be indexed.");
 			}
 			isearcher.Close();

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearch.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearch.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearch.cs Sat Sep 10 20:59:58
2011
@@ -116,8 +116,8 @@ namespace Lucene.Net
 				out_Renamed.WriteLine(hits.Length + " total results");
 				for (int i = 0; i < hits.Length && i < 10; i++)
 				{
-					Document d = searcher.Doc(hits[i].doc);
-					out_Renamed.WriteLine(i + " " + hits[i].score + " " + d.Get("contents"));
+					Document d = searcher.Doc(hits[i].Doc);
+					out_Renamed.WriteLine(i + " " + hits[i].Score + " " + d.Get("contents"));
 				}
 			}
 			searcher.Close();

Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearchForDuplicates.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearchForDuplicates.cs?rev=1167605&r1=1167604&r2=1167605&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearchForDuplicates.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/core/TestSearchForDuplicates.cs Sat
Sep 10 20:59:58 2011
@@ -143,7 +143,7 @@ namespace Lucene.Net
 			{
 				if (i < 10 || (i > 94 && i < 105))
 				{
-					Document d = searcher.Doc(hits[i].doc);
+					Document d = searcher.Doc(hits[i].Doc);
 					out_Renamed.WriteLine(i + " " + d.Get(ID_FIELD));
 				}
 			}
@@ -156,7 +156,7 @@ namespace Lucene.Net
 			{
 				if (i < 10 || (i > 94 && i < 105))
 				{
-					Document d = searcher.Doc(hits[i].doc);
+					Document d = searcher.Doc(hits[i].Doc);
 					Assert.AreEqual(System.Convert.ToString(i), d.Get(ID_FIELD), "check " + i);
 				}
 			}



Mime
View raw message