You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/10/04 20:02:03 UTC
[33/46] lucenenet git commit: Renamed
Facet.Taxonomy.TaxonomyReader.Size to Count (.NETified)
Renamed Facet.Taxonomy.TaxonomyReader.Size to Count (.NETified)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/66e39325
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/66e39325
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/66e39325
Branch: refs/heads/master
Commit: 66e393255818d5475014af3cc9e869e6079dbfc9
Parents: fd13e8e
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Sun Sep 25 16:11:50 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Oct 3 23:31:53 2016 +0700
----------------------------------------------------------------------
.../Directory/DirectoryTaxonomyReader.cs | 2 +-
.../Taxonomy/FloatTaxonomyFacets.cs | 4 +-
.../Taxonomy/IntTaxonomyFacets.cs | 4 +-
.../Taxonomy/PrintTaxonomyStats.cs | 2 +-
src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs | 3 +-
.../Taxonomy/Directory/TestAddTaxonomy.cs | 8 +--
.../Directory/TestConcurrentFacetedIndexing.cs | 2 +-
.../Directory/TestDirectoryTaxonomyReader.cs | 18 +++---
.../Directory/TestDirectoryTaxonomyWriter.cs | 2 +-
.../Taxonomy/TestSearcherTaxonomyManager.cs | 4 +-
.../Taxonomy/TestTaxonomyCombined.cs | 68 ++++++++++----------
11 files changed, 58 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
index e540a00..98bd09e 100644
--- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs
@@ -369,7 +369,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
return res;
}
- public override int Size
+ public override int Count
{
get
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
index f2e79a5..27c8eff 100644
--- a/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/FloatTaxonomyFacets.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Facet.Taxonomy
protected internal FloatTaxonomyFacets(string indexFieldName, TaxonomyReader taxoReader, FacetsConfig config)
: base(indexFieldName, taxoReader, config)
{
- values = new float[taxoReader.Size];
+ values = new float[taxoReader.Count];
}
/// <summary>
@@ -112,7 +112,7 @@ namespace Lucene.Net.Facet.Taxonomy
return null;
}
- TopOrdAndFloatQueue q = new TopOrdAndFloatQueue(Math.Min(taxoReader.Size, topN));
+ TopOrdAndFloatQueue q = new TopOrdAndFloatQueue(Math.Min(taxoReader.Count, topN));
float bottomValue = 0;
int ord = children[dimOrd];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
index c9a789b..2c4e533 100644
--- a/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/IntTaxonomyFacets.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Facet.Taxonomy
protected internal IntTaxonomyFacets(string indexFieldName, TaxonomyReader taxoReader, FacetsConfig config)
: base(indexFieldName, taxoReader, config)
{
- values = new int[taxoReader.Size];
+ values = new int[taxoReader.Count];
}
/// <summary>
@@ -116,7 +116,7 @@ namespace Lucene.Net.Facet.Taxonomy
return null;
}
- TopOrdAndIntQueue q = new TopOrdAndIntQueue(Math.Min(taxoReader.Size, topN));
+ TopOrdAndIntQueue q = new TopOrdAndIntQueue(Math.Min(taxoReader.Count, topN));
int bottomValue = 0;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Facet/Taxonomy/PrintTaxonomyStats.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/PrintTaxonomyStats.cs b/src/Lucene.Net.Facet/Taxonomy/PrintTaxonomyStats.cs
index e4b723b..601e5d8 100644
--- a/src/Lucene.Net.Facet/Taxonomy/PrintTaxonomyStats.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/PrintTaxonomyStats.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// Recursively prints stats for all ordinals. </summary>
public static void PrintStats(TaxonomyReader r, TextWriter @out, bool printTree)
{
- @out.WriteLine(r.Size + " total categories.");
+ @out.WriteLine(r.Count + " total categories.");
ChildrenIterator it = r.GetChildren(TaxonomyReader.ROOT_ORDINAL);
int child;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
index e99b011..db56dc2 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs
@@ -265,7 +265,6 @@ namespace Lucene.Net.Facet.Taxonomy
}
}
- // LUCENENET TODO: Rename to Count (.NETify)
/// <summary>
/// Returns the number of categories in the taxonomy. Note that the number of
/// categories returned is often slightly higher than the number of categories
@@ -273,7 +272,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// taxonomy, its ancestors are also added automatically (including the root,
/// which always get ordinal 0).
/// </summary>
- public abstract int Size { get; }
+ public abstract int Count { get; }
/// <summary>
/// Expert: increments the refCount of this TaxonomyReader instance. RefCounts
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
index 9482407..0ed2bb4 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
@@ -125,14 +125,14 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
var destTr = new DirectoryTaxonomyReader(dest);
try
{
- int destSize = destTr.Size;
+ int destSize = destTr.Count;
var srcTR = new DirectoryTaxonomyReader(src);
try
{
var map = ordMap.Map;
// validate taxo sizes
- int srcSize = srcTR.Size;
+ int srcSize = srcTR.Count;
Assert.True(destSize >= srcSize, "destination taxonomy expected to be larger than source; dest=" + destSize + " src=" + srcSize);
// validate that all source categories exist in destination, and their
@@ -275,9 +275,9 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
var dtr = new DirectoryTaxonomyReader(dest);
// +2 to account for the root category + "a"
- Assert.AreEqual(numCategories + 2, dtr.Size);
+ Assert.AreEqual(numCategories + 2, dtr.Count);
var categories = new HashSet<FacetLabel>();
- for (int i = 1; i < dtr.Size; i++)
+ for (int i = 1; i < dtr.Count; i++)
{
FacetLabel cat = dtr.GetPath(i);
Assert.True(categories.Add(cat), "category " + cat + " already existed");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
index 49df670..abd82f8 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
var tr = new DirectoryTaxonomyReader(tw);
// +1 for root category
- if (values.Count + 1 != tr.Size)
+ if (values.Count + 1 != tr.Count)
{
foreach (string value in values.Keys)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
index 0e2935a..41ee66f 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
ltr.Dispose();
// should not fail as we IncRef() before close
- var tmpSie = ltr.Size;
+ var tmpSie = ltr.Count;
ltr.DecRef();
dir.Dispose();
@@ -118,7 +118,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
ltr.Dispose();
try
{
- var tmpSize = ltr.Size;
+ var tmpSize = ltr.Count;
Fail("An AlreadyClosedException should have been thrown here");
}
catch (AlreadyClosedException)
@@ -166,7 +166,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
tw.Dispose();
tr = new DirectoryTaxonomyReader(dir);
- int baseNumCategories = tr.Size;
+ int baseNumCategories = tr.Count;
for (int i = 0; i < n; i++)
{
@@ -189,7 +189,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
tr.Dispose(true);
tr = newtr;
}
- Assert.AreEqual(baseNumCategories + 1 + k, tr.Size, "Wrong #categories in taxonomy (i=" + i + ", k=" + k + ")");
+ Assert.AreEqual(baseNumCategories + 1 + k, tr.Count, "Wrong #categories in taxonomy (i=" + i + ", k=" + k + ")");
}
}
finally
@@ -251,7 +251,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
reader = newtr;
// assert categories
- Assert.AreEqual(numCategories, reader.Size);
+ Assert.AreEqual(numCategories, reader.Count);
int roundOrdinal = reader.GetOrdinal(new FacetLabel(Convert.ToString(i)));
int[] parents = reader.ParallelTaxonomyArrays.Parents;
Assert.AreEqual(0, parents[roundOrdinal]); // round's parent is root
@@ -305,7 +305,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
var writer = new DirectoryTaxonomyWriterAnonymousInnerClassHelper2(dir);
var reader = new DirectoryTaxonomyReader(writer);
- Assert.AreEqual(1, reader.Size);
+ Assert.AreEqual(1, reader.Count);
Assert.AreEqual(1, reader.ParallelTaxonomyArrays.Parents.Length);
// add category and call forceMerge -- this should flush IW and merge segments down to 1
@@ -318,7 +318,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
Assert.NotNull(newtr);
reader.Dispose();
reader = newtr;
- Assert.AreEqual(2, reader.Size);
+ Assert.AreEqual(2, reader.Count);
Assert.AreEqual(2, reader.ParallelTaxonomyArrays.Parents.Length);
reader.Dispose();
@@ -366,7 +366,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
writer.AddCategory(new FacetLabel("a"));
var reader = new DirectoryTaxonomyReader(writer);
- Assert.AreEqual(2, reader.Size);
+ Assert.AreEqual(2, reader.Count);
Assert.AreEqual(2, reader.ParallelTaxonomyArrays.Parents.Length);
// merge all the segments so that NRT reader thinks there's a change
@@ -377,7 +377,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
Assert.NotNull(newtr);
reader.Dispose();
reader = newtr;
- Assert.AreEqual(2, reader.Size);
+ Assert.AreEqual(2, reader.Count);
Assert.AreEqual(2, reader.ParallelTaxonomyArrays.Parents.Length);
reader.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
index 5e4ec75..bd32d53 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
@@ -312,7 +312,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
DirectoryTaxonomyReader dtr = new DirectoryTaxonomyReader(dir);
// +1 for root category
- if (values.Count + 1 != dtr.Size)
+ if (values.Count + 1 != dtr.Count)
{
foreach (string value in values.Keys)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
index 79f8b80..257ec1b 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
@@ -365,7 +365,7 @@ namespace Lucene.Net.Facet.Taxonomy
SearcherAndTaxonomy pair = mgr.Acquire();
try
{
- Assert.AreEqual(1, pair.TaxonomyReader.Size);
+ Assert.AreEqual(1, pair.TaxonomyReader.Count);
}
finally
{
@@ -382,7 +382,7 @@ namespace Lucene.Net.Facet.Taxonomy
pair = mgr.Acquire();
try
{
- Assert.AreEqual(3, pair.TaxonomyReader.Size);
+ Assert.AreEqual(3, pair.TaxonomyReader.Count);
}
finally
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/66e39325/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
index 70080ec..45eeb3b 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
@@ -310,7 +310,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(1, tw.Size);
tw.Dispose();
var tr = new DirectoryTaxonomyReader(indexDir);
- Assert.AreEqual(1, tr.Size);
+ Assert.AreEqual(1, tr.Count);
Assert.AreEqual(0, tr.GetPath(0).Length);
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tr.ParallelTaxonomyArrays.Parents[0]);
Assert.AreEqual(0, tr.GetOrdinal(new FacetLabel()));
@@ -331,7 +331,7 @@ namespace Lucene.Net.Facet.Taxonomy
var tw = new DirectoryTaxonomyWriter(indexDir);
tw.Commit();
var tr = new DirectoryTaxonomyReader(indexDir);
- Assert.AreEqual(1, tr.Size);
+ Assert.AreEqual(1, tr.Count);
Assert.AreEqual(0, tr.GetPath(0).Length);
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tr.ParallelTaxonomyArrays.Parents[0]);
Assert.AreEqual(0, tr.GetOrdinal(new FacetLabel()));
@@ -356,16 +356,16 @@ namespace Lucene.Net.Facet.Taxonomy
var tr = new DirectoryTaxonomyReader(indexDir);
// test TaxonomyReader.getSize():
- Assert.AreEqual(ExpectedCategories.Length, tr.Size);
+ Assert.AreEqual(ExpectedCategories.Length, tr.Count);
// test round trips of ordinal => category => ordinal
- for (int i = 0; i < tr.Size; i++)
+ for (int i = 0; i < tr.Count; i++)
{
Assert.AreEqual(i, tr.GetOrdinal(tr.GetPath(i)));
}
// test TaxonomyReader.getCategory():
- for (int i = 1; i < tr.Size; i++)
+ for (int i = 1; i < tr.Count; i++)
{
FacetLabel expectedCategory = new FacetLabel(ExpectedCategories[i]);
FacetLabel category = tr.GetPath(i);
@@ -376,7 +376,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
// (also test invalid ordinals:)
Assert.Null(tr.GetPath(-1));
- Assert.Null(tr.GetPath(tr.Size));
+ Assert.Null(tr.GetPath(tr.Count));
Assert.Null(tr.GetPath(TaxonomyReader.INVALID_ORDINAL));
// test TaxonomyReader.GetOrdinal():
@@ -424,7 +424,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, parents[0]);
// check parent of non-root ordinals:
- for (int ordinal = 1; ordinal < tr.Size; ordinal++)
+ for (int ordinal = 1; ordinal < tr.Count; ordinal++)
{
FacetLabel me = tr.GetPath(ordinal);
int parentOrdinal = parents[ordinal];
@@ -496,7 +496,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tw.GetParent(0));
// check parent of non-root ordinals:
- for (int ordinal = 1; ordinal < tr.Size; ordinal++)
+ for (int ordinal = 1; ordinal < tr.Count; ordinal++)
{
FacetLabel me = tr.GetPath(ordinal);
int parentOrdinal = tw.GetParent(ordinal);
@@ -534,7 +534,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
try
{
- int parent = tw.GetParent(tr.Size);
+ int parent = tw.GetParent(tr.Count);
Fail("getParent for getSize() should throw exception, but returned " + parent);
}
catch (System.IndexOutOfRangeException)
@@ -558,9 +558,9 @@ namespace Lucene.Net.Facet.Taxonomy
var tr = new DirectoryTaxonomyReader(indexDir);
ParallelTaxonomyArrays ca = tr.ParallelTaxonomyArrays;
int[] youngestChildArray = ca.Children;
- Assert.AreEqual(tr.Size, youngestChildArray.Length);
+ Assert.AreEqual(tr.Count, youngestChildArray.Length);
int[] olderSiblingArray = ca.Siblings;
- Assert.AreEqual(tr.Size, olderSiblingArray.Length);
+ Assert.AreEqual(tr.Count, olderSiblingArray.Length);
for (int i = 0; i < ExpectedCategories.Length; i++)
{
// find expected children by looking at all expectedCategories
@@ -631,13 +631,13 @@ namespace Lucene.Net.Facet.Taxonomy
var tr = new DirectoryTaxonomyReader(indexDir);
ParallelTaxonomyArrays ca = tr.ParallelTaxonomyArrays;
int[] children = ca.Children;
- Assert.AreEqual(tr.Size, children.Length);
+ Assert.AreEqual(tr.Count, children.Length);
int[] olderSiblingArray = ca.Siblings;
- Assert.AreEqual(tr.Size, olderSiblingArray.Length);
+ Assert.AreEqual(tr.Count, olderSiblingArray.Length);
// test that the "youngest child" of every category is indeed a child:
int[] parents = tr.ParallelTaxonomyArrays.Parents;
- for (int i = 0; i < tr.Size; i++)
+ for (int i = 0; i < tr.Count; i++)
{
int youngestChild = children[i];
if (youngestChild != TaxonomyReader.INVALID_ORDINAL)
@@ -648,14 +648,14 @@ namespace Lucene.Net.Facet.Taxonomy
// test that the "older sibling" of every category is indeed older (lower)
// (it can also be INVALID_ORDINAL, which is lower than any ordinal)
- for (int i = 0; i < tr.Size; i++)
+ for (int i = 0; i < tr.Count; i++)
{
Assert.True(olderSiblingArray[i] < i, "olderSiblingArray[" + i + "] should be <" + i);
}
// test that the "older sibling" of every category is indeed a sibling
// (they share the same parent)
- for (int i = 0; i < tr.Size; i++)
+ for (int i = 0; i < tr.Count; i++)
{
int sibling = olderSiblingArray[i];
if (sibling == TaxonomyReader.INVALID_ORDINAL)
@@ -670,11 +670,11 @@ namespace Lucene.Net.Facet.Taxonomy
// test that the "youngest child" is indeed the youngest (so we don't
// miss the first children in the chain)
- for (int i = 0; i < tr.Size; i++)
+ for (int i = 0; i < tr.Count; i++)
{
// Find the really youngest child:
int j;
- for (j = tr.Size - 1; j > i; j--)
+ for (j = tr.Count - 1; j > i; j--)
{
if (parents[j] == i)
{
@@ -691,7 +691,7 @@ namespace Lucene.Net.Facet.Taxonomy
// test that the "older sibling" is indeed the least oldest one - and
// not a too old one or -1 (so we didn't miss some children in the
// middle or the end of the chain).
- for (int i = 0; i < tr.Size; i++)
+ for (int i = 0; i < tr.Count; i++)
{
// Find the youngest older sibling:
int j;
@@ -725,7 +725,7 @@ namespace Lucene.Net.Facet.Taxonomy
tw.Commit();
var tr = new DirectoryTaxonomyReader(indexDir);
ParallelTaxonomyArrays ca = tr.ParallelTaxonomyArrays;
- Assert.AreEqual(3, tr.Size);
+ Assert.AreEqual(3, tr.Count);
Assert.AreEqual(3, ca.Siblings.Length);
Assert.AreEqual(3, ca.Children.Length);
Assert.True(Arrays.Equals(new int[] { 1, 2, -1 }, ca.Children));
@@ -736,7 +736,7 @@ namespace Lucene.Net.Facet.Taxonomy
// Before refresh, nothing changed..
ParallelTaxonomyArrays newca = tr.ParallelTaxonomyArrays;
Assert.AreSame(newca, ca); // we got exactly the same object
- Assert.AreEqual(3, tr.Size);
+ Assert.AreEqual(3, tr.Count);
Assert.AreEqual(3, ca.Siblings.Length);
Assert.AreEqual(3, ca.Children.Length);
// After the refresh, things change:
@@ -745,7 +745,7 @@ namespace Lucene.Net.Facet.Taxonomy
tr.Dispose();
tr = newtr;
ca = tr.ParallelTaxonomyArrays;
- Assert.AreEqual(5, tr.Size);
+ Assert.AreEqual(5, tr.Count);
Assert.AreEqual(5, ca.Siblings.Length);
Assert.AreEqual(5, ca.Children.Length);
Assert.True(Arrays.Equals(new int[] { 4, 3, -1, -1, -1 }, ca.Children));
@@ -934,13 +934,13 @@ namespace Lucene.Net.Facet.Taxonomy
tw.Commit();
var tr = new DirectoryTaxonomyReader(indexDir);
- Assert.AreEqual(1, tr.Size); // the empty taxonomy has size 1 (the root)
+ Assert.AreEqual(1, tr.Count); // the empty taxonomy has size 1 (the root)
tw.AddCategory(new FacetLabel("Author"));
- Assert.AreEqual(1, tr.Size); // still root only...
+ Assert.AreEqual(1, tr.Count); // still root only...
Assert.Null(TaxonomyReader.OpenIfChanged(tr)); // this is not enough, because tw.Commit() hasn't been done yet
- Assert.AreEqual(1, tr.Size); // still root only...
+ Assert.AreEqual(1, tr.Count); // still root only...
tw.Commit();
- Assert.AreEqual(1, tr.Size); // still root only...
+ Assert.AreEqual(1, tr.Count); // still root only...
var newTaxoReader = TaxonomyReader.OpenIfChanged(tr);
Assert.NotNull(newTaxoReader);
tr.Dispose();
@@ -956,7 +956,7 @@ namespace Lucene.Net.Facet.Taxonomy
{
Fail("After category addition, commit() and refresh(), getParent for " + author + " should NOT throw exception");
}
- Assert.AreEqual(2, tr.Size); // finally, see there are two categories
+ Assert.AreEqual(2, tr.Count); // finally, see there are two categories
// now, add another category, and verify that after commit and refresh
// the parent of this category is correct (this requires the reader
@@ -973,7 +973,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(author, parents[dawkins]);
Assert.AreEqual(TaxonomyReader.ROOT_ORDINAL, parents[author]);
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, parents[TaxonomyReader.ROOT_ORDINAL]);
- Assert.AreEqual(3, tr.Size);
+ Assert.AreEqual(3, tr.Count);
tw.Dispose();
tr.Dispose();
indexDir.Dispose();
@@ -990,25 +990,25 @@ namespace Lucene.Net.Facet.Taxonomy
// Test getOrdinal():
FacetLabel author = new FacetLabel("Author");
- Assert.AreEqual(1, tr.Size); // the empty taxonomy has size 1 (the root)
+ Assert.AreEqual(1, tr.Count); // the empty taxonomy has size 1 (the root)
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tr.GetOrdinal(author));
tw.AddCategory(author);
// before commit and refresh, no change:
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tr.GetOrdinal(author));
- Assert.AreEqual(1, tr.Size); // still root only...
+ Assert.AreEqual(1, tr.Count); // still root only...
Assert.Null(TaxonomyReader.OpenIfChanged(tr)); // this is not enough, because tw.Commit() hasn't been done yet
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tr.GetOrdinal(author));
- Assert.AreEqual(1, tr.Size); // still root only...
+ Assert.AreEqual(1, tr.Count); // still root only...
tw.Commit();
// still not enough before refresh:
Assert.AreEqual(TaxonomyReader.INVALID_ORDINAL, tr.GetOrdinal(author));
- Assert.AreEqual(1, tr.Size); // still root only...
+ Assert.AreEqual(1, tr.Count); // still root only...
var newTaxoReader = TaxonomyReader.OpenIfChanged(tr);
Assert.NotNull(newTaxoReader);
tr.Dispose();
tr = newTaxoReader;
Assert.AreEqual(1, tr.GetOrdinal(author));
- Assert.AreEqual(2, tr.Size);
+ Assert.AreEqual(2, tr.Count);
tw.Dispose();
tr.Dispose();
indexDir.Dispose();
@@ -1166,7 +1166,7 @@ namespace Lucene.Net.Facet.Taxonomy
writer.AddCategory(cp);
var newReader = TaxonomyReader.OpenIfChanged(reader);
Assert.NotNull(newReader, "expected a new instance");
- Assert.AreEqual(2, newReader.Size);
+ Assert.AreEqual(2, newReader.Count);
Assert.AreNotSame(TaxonomyReader.INVALID_ORDINAL, newReader.GetOrdinal(cp));
reader.Dispose();
reader = newReader;