Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C69F200D40 for ; Fri, 13 Oct 2017 13:10:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1B84B1609D1; Fri, 13 Oct 2017 11:10:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2CDB0160BE5 for ; Fri, 13 Oct 2017 13:10:00 +0200 (CEST) Received: (qmail 19111 invoked by uid 500); 13 Oct 2017 11:09:59 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 19088 invoked by uid 99); 13 Oct 2017 11:09:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Oct 2017 11:09:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA742DFAEB; Fri, 13 Oct 2017 11:09:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nightowl888@apache.org To: commits@lucenenet.apache.org Date: Fri, 13 Oct 2017 11:10:00 -0000 Message-Id: <04ee87590a344bc382c43dba81251956@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/10] lucenenet git commit: Lucene.Net.Benchmark.ByTask.Tasks.AnalyzerFactory: Changed setter methods into properties and made PositionIncrementGap and OffsetGap nullable (so they can be used in the initializer). archived-at: Fri, 13 Oct 2017 11:10:01 -0000 Lucene.Net.Benchmark.ByTask.Tasks.AnalyzerFactory: Changed setter methods into properties and made PositionIncrementGap and OffsetGap nullable (so they can be used in the initializer). Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5406340d Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5406340d Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5406340d Branch: refs/heads/master Commit: 5406340ddf02ddce592df7e0dacc52217117f993 Parents: 869d1dd Author: Shad Storhaug Authored: Wed Oct 4 23:29:40 2017 +0700 Committer: Shad Storhaug Committed: Wed Oct 4 23:29:40 2017 +0700 ---------------------------------------------------------------------- .../ByTask/Tasks/AnalyzerFactoryTask.cs | 9 +++-- .../ByTask/Utils/AnalyzerFactory.cs | 42 +++++++------------- 2 files changed, 19 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5406340d/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs index 61d1832..3f0f60d 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs @@ -356,10 +356,11 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks } } - AnalyzerFactory analyzerFactory = new AnalyzerFactory - (charFilterFactories, tokenizerFactory, tokenFilterFactories); - analyzerFactory.SetPositionIncrementGap(positionIncrementGap.GetValueOrDefault()); - analyzerFactory.SetOffsetGap(offsetGap.GetValueOrDefault()); + AnalyzerFactory analyzerFactory = new AnalyzerFactory(charFilterFactories, tokenizerFactory, tokenFilterFactories) + { + PositionIncrementGap = positionIncrementGap, + OffsetGap = offsetGap + }; RunData.AnalyzerFactories[factoryName] = analyzerFactory; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5406340d/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs index 63c17cb..28a3ff6 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs @@ -33,9 +33,9 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils private IList charFilterFactories; private TokenizerFactory tokenizerFactory; private IList tokenFilterFactories; - private string name = null; - private int? positionIncrementGap = null; - private int? offsetGap = null; + public string Name { get; set; } = null; + public int? PositionIncrementGap { get; set; } = null; + public int? OffsetGap { get; set; } = null; public AnalyzerFactory(IList charFilterFactories, TokenizerFactory tokenizerFactory, @@ -47,21 +47,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils this.tokenFilterFactories = tokenFilterFactories; } - // LUCENENET TODO: Properties ? - public void SetName(string name) - { - this.name = name; - } - - public void SetPositionIncrementGap(int positionIncrementGap) // LUCENENET TODO: Nullable? - { - this.positionIncrementGap = positionIncrementGap; - } - - public void SetOffsetGap(int offsetGap) // LUCENENET TODO: Nullable? - { - this.offsetGap = offsetGap; - } + // LUCENENET specific - made Name, PositionIncrementGap, and OffsetGap setters into properties (above) public Analyzer Create() { @@ -104,15 +90,15 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils public override int GetPositionIncrementGap(string fieldName) { - return outerInstance.positionIncrementGap.HasValue - ? outerInstance.positionIncrementGap.Value + return outerInstance.PositionIncrementGap.HasValue + ? outerInstance.PositionIncrementGap.Value : base.GetPositionIncrementGap(fieldName); } public override int GetOffsetGap(string fieldName) { - return outerInstance.offsetGap.HasValue - ? outerInstance.offsetGap.Value + return outerInstance.OffsetGap.HasValue + ? outerInstance.OffsetGap.Value : base.GetOffsetGap(fieldName); } } @@ -120,22 +106,22 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils public override string ToString() { StringBuilder sb = new StringBuilder("AnalyzerFactory("); - if (null != name) + if (null != Name) { sb.Append("name:"); - sb.Append(name); + sb.Append(Name); sb.Append(", "); } - if (null != positionIncrementGap) + if (null != PositionIncrementGap) { sb.Append("positionIncrementGap:"); - sb.Append(positionIncrementGap); + sb.Append(PositionIncrementGap); sb.Append(", "); } - if (null != offsetGap) + if (null != OffsetGap) { sb.Append("offsetGap:"); - sb.Append(offsetGap); + sb.Append(OffsetGap); sb.Append(", "); } foreach (CharFilterFactory charFilterFactory in charFilterFactories)