Lucene.Net.Analysis.Common.No.NorwegianLightStemmer refactor: Converted flags (constants) into [Flags] enum named NorwegianStandard
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a6d69ac8 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a6d69ac8 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a6d69ac8 Branch: refs/heads/api-work Commit: a6d69ac88c9a17d82391fdf39186fb9ef38fe6d2 Parents: 13f16f6 Author: Shad Storhaug <[email protected]> Authored: Mon Mar 6 07:32:04 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Mon Mar 6 18:08:05 2017 +0700 ---------------------------------------------------------------------- .../Analysis/No/NorwegianLightStemFilter.cs | 8 +++--- .../No/NorwegianLightStemFilterFactory.cs | 8 +++--- .../Analysis/No/NorwegianLightStemmer.cs | 30 +++++++++++--------- .../Analysis/No/NorwegianMinimalStemFilter.cs | 4 +-- .../No/NorwegianMinimalStemFilterFactory.cs | 8 +++--- .../Analysis/No/NorwegianMinimalStemmer.cs | 12 ++++---- .../Analysis/No/TestNorwegianLightStemFilter.cs | 4 +-- .../No/TestNorwegianMinimalStemFilter.cs | 4 +-- 8 files changed, 41 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs index 9681e1e..ca36da0 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs @@ -40,16 +40,16 @@ namespace Lucene.Net.Analysis.No /// </summary> /// <param name="input"> the source <see cref="TokenStream"/> to filter </param> public NorwegianLightStemFilter(TokenStream input) - : this(input, NorwegianLightStemmer.BOKMAAL) + : this(input, NorwegianStandard.BOKMAAL) { } /// <summary> /// Creates a new <see cref="NorwegianLightStemFilter"/> </summary> /// <param name="input"> the source <see cref="TokenStream"/> to filter </param> - /// <param name="flags"> set to <see cref="NorwegianLightStemmer.BOKMAAL"/>, - /// <see cref="NorwegianLightStemmer.NYNORSK"/>, or both. </param> - public NorwegianLightStemFilter(TokenStream input, int flags) + /// <param name="flags"> set to <see cref="NorwegianStandard.BOKMAAL"/>, + /// <see cref="NorwegianStandard.NYNORSK"/>, or both. </param> + public NorwegianLightStemFilter(TokenStream input, NorwegianStandard flags) : base(input) { stemmer = new NorwegianLightStemmer(flags); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs index 405d2b7..c32716f 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs @@ -33,7 +33,7 @@ namespace Lucene.Net.Analysis.No /// </summary> public class NorwegianLightStemFilterFactory : TokenFilterFactory { - private readonly int flags; + private readonly NorwegianStandard flags; /// <summary> /// Creates a new <see cref="NorwegianLightStemFilterFactory"/> </summary> @@ -43,15 +43,15 @@ namespace Lucene.Net.Analysis.No string variant = Get(args, "variant"); if (variant == null || "nb".Equals(variant)) { - flags = NorwegianLightStemmer.BOKMAAL; + flags = NorwegianStandard.BOKMAAL; } else if ("nn".Equals(variant)) { - flags = NorwegianLightStemmer.NYNORSK; + flags = NorwegianStandard.NYNORSK; } else if ("no".Equals(variant)) { - flags = NorwegianLightStemmer.BOKMAAL | NorwegianLightStemmer.NYNORSK; + flags = NorwegianStandard.BOKMAAL | NorwegianStandard.NYNORSK; } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs index a53d5f5..17a43ae 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs @@ -54,6 +54,17 @@ namespace Lucene.Net.Analysis.No * POSSIBILITY OF SUCH DAMAGE. */ + [System.Flags] + public enum NorwegianStandard + { + /// <summary> + /// Constant to remove Bokmål-specific endings </summary> + BOKMAAL = 1, + /// <summary> + /// Constant to remove Nynorsk-specific endings </summary> + NYNORSK = 2 + } + /// <summary> /// Light Stemmer for Norwegian. /// <para> @@ -64,29 +75,22 @@ namespace Lucene.Net.Analysis.No /// </summary> public class NorwegianLightStemmer { - // LUCENENET TODO: Convert the following into a [Flags] enum - - /// <summary> - /// Constant to remove Bokmål-specific endings </summary> - public const int BOKMAAL = 1; - /// <summary> - /// Constant to remove Nynorsk-specific endings </summary> - public const int NYNORSK = 2; + // LUCENENET specific - made flags into their own [Flags] enum named NorwegianStandard and de-nested from this type private readonly bool useBokmaal; private readonly bool useNynorsk; /// <summary> /// Creates a new <see cref="NorwegianLightStemmer"/> </summary> - /// <param name="flags"> set to <see cref="BOKMAAL"/>, <see cref="NYNORSK"/>, or both. </param> - public NorwegianLightStemmer(int flags) + /// <param name="flags"> set to <see cref="NorwegianStandard.BOKMAAL"/>, <see cref="NorwegianStandard.NYNORSK"/>, or both. </param> + public NorwegianLightStemmer(NorwegianStandard flags) { - if (flags <= 0 || flags > BOKMAAL + NYNORSK) + if (flags <= 0 || flags > (int)NorwegianStandard.BOKMAAL + NorwegianStandard.NYNORSK) { throw new System.ArgumentException("invalid flags"); } - useBokmaal = (flags & BOKMAAL) != 0; - useNynorsk = (flags & NYNORSK) != 0; + useBokmaal = (flags & NorwegianStandard.BOKMAAL) != 0; + useNynorsk = (flags & NorwegianStandard.NYNORSK) != 0; } public virtual int Stem(char[] s, int len) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs index 446bf3a..996a8a9 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs @@ -39,7 +39,7 @@ namespace Lucene.Net.Analysis.No /// NorwegianMinimalStemFilter(input, BOKMAAL) /// </summary> public NorwegianMinimalStemFilter(TokenStream input) - : this(input, NorwegianLightStemmer.BOKMAAL) + : this(input, NorwegianStandard.BOKMAAL) { } @@ -48,7 +48,7 @@ namespace Lucene.Net.Analysis.No /// <param name="input"> the source <see cref="TokenStream"/> to filter </param> /// <param name="flags"> set to <see cref="NorwegianLightStemmer.BOKMAAL"/>, /// <see cref="NorwegianLightStemmer.NYNORSK"/>, or both. </param> - public NorwegianMinimalStemFilter(TokenStream input, int flags) + public NorwegianMinimalStemFilter(TokenStream input, NorwegianStandard flags) : base(input) { this.stemmer = new NorwegianMinimalStemmer(flags); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs index 18f1c56..ac1e68c 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs @@ -33,7 +33,7 @@ namespace Lucene.Net.Analysis.No /// </summary> public class NorwegianMinimalStemFilterFactory : TokenFilterFactory { - private readonly int flags; + private readonly NorwegianStandard flags; /// <summary> /// Creates a new <see cref="NorwegianMinimalStemFilterFactory"/> </summary> @@ -43,15 +43,15 @@ namespace Lucene.Net.Analysis.No string variant = Get(args, "variant"); if (variant == null || "nb".Equals(variant)) { - flags = NorwegianLightStemmer.BOKMAAL; + flags = NorwegianStandard.BOKMAAL; } else if ("nn".Equals(variant)) { - flags = NorwegianLightStemmer.NYNORSK; + flags = NorwegianStandard.NYNORSK; } else if ("no".Equals(variant)) { - flags = NorwegianLightStemmer.BOKMAAL | NorwegianLightStemmer.NYNORSK; + flags = NorwegianStandard.BOKMAAL | NorwegianStandard.NYNORSK; } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs index 0bab21b..d1efd09 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs @@ -67,16 +67,16 @@ namespace Lucene.Net.Analysis.No /// <summary> /// Creates a new <see cref="NorwegianMinimalStemmer"/> </summary> - /// <param name="flags"> set to <see cref="NorwegianLightStemmer.BOKMAAL"/>, - /// <see cref="NorwegianLightStemmer.NYNORSK"/>, or both. </param> - public NorwegianMinimalStemmer(int flags) + /// <param name="flags"> set to <see cref="NorwegianStandard.BOKMAAL"/>, + /// <see cref="NorwegianStandard.NYNORSK"/>, or both. </param> + public NorwegianMinimalStemmer(NorwegianStandard flags) { - if (flags <= 0 || flags > NorwegianLightStemmer.BOKMAAL + NorwegianLightStemmer.NYNORSK) + if (flags <= 0 || flags > (int)NorwegianStandard.BOKMAAL + NorwegianStandard.NYNORSK) { throw new System.ArgumentException("invalid flags"); } - useBokmaal = (flags & NorwegianLightStemmer.BOKMAAL) != 0; - useNynorsk = (flags & NorwegianLightStemmer.NYNORSK) != 0; + useBokmaal = (flags & NorwegianStandard.BOKMAAL) != 0; + useNynorsk = (flags & NorwegianStandard.NYNORSK) != 0; } public virtual int Stem(char[] s, int len) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs index 1110f43..cedb8c4 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Analysis.No protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader) { Tokenizer source = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - return new TokenStreamComponents(source, new NorwegianLightStemFilter(source, NorwegianLightStemmer.BOKMAAL)); + return new TokenStreamComponents(source, new NorwegianLightStemFilter(source, NorwegianStandard.BOKMAAL)); } } @@ -73,7 +73,7 @@ namespace Lucene.Net.Analysis.No protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader) { Tokenizer source = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - return new TokenStreamComponents(source, new NorwegianLightStemFilter(source, NorwegianLightStemmer.NYNORSK)); + return new TokenStreamComponents(source, new NorwegianLightStemFilter(source, NorwegianStandard.NYNORSK)); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6d69ac8/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs index 29358ca..e1c6df7 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Analysis.No protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader) { Tokenizer source = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - return new TokenStreamComponents(source, new NorwegianMinimalStemFilter(source, NorwegianLightStemmer.BOKMAAL)); + return new TokenStreamComponents(source, new NorwegianMinimalStemFilter(source, NorwegianStandard.BOKMAAL)); } } @@ -73,7 +73,7 @@ namespace Lucene.Net.Analysis.No protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader) { Tokenizer source = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - return new TokenStreamComponents(source, new NorwegianMinimalStemFilter(source, NorwegianLightStemmer.NYNORSK)); + return new TokenStreamComponents(source, new NorwegianMinimalStemFilter(source, NorwegianStandard.NYNORSK)); } }
