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 1A575200C1C for ; Wed, 1 Feb 2017 06:19:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 19256160B52; Wed, 1 Feb 2017 05:19:03 +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 19C42160B5F for ; Wed, 1 Feb 2017 06:19:01 +0100 (CET) Received: (qmail 29573 invoked by uid 500); 1 Feb 2017 05:19:01 -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 29479 invoked by uid 99); 1 Feb 2017 05:19:01 -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; Wed, 01 Feb 2017 05:19:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04A08DFE93; Wed, 1 Feb 2017 05:19:01 +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: Wed, 01 Feb 2017 05:19:02 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/15] lucenenet git commit: Lucene.Net.Sandbox.Queries.FuzzyLikeThisQuery.ScoreTerm refactor: made public fields into auto-implemented properties archived-at: Wed, 01 Feb 2017 05:19:03 -0000 Lucene.Net.Sandbox.Queries.FuzzyLikeThisQuery.ScoreTerm refactor: made public fields into auto-implemented properties Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/03d13870 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/03d13870 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/03d13870 Branch: refs/heads/api-work Commit: 03d138703ae080be1bfda845c4f3a470c81ca067 Parents: 2bf7b0a Author: Shad Storhaug Authored: Wed Feb 1 09:49:34 2017 +0700 Committer: Shad Storhaug Committed: Wed Feb 1 09:49:34 2017 +0700 ---------------------------------------------------------------------- .../Queries/FuzzyLikeThisQuery.cs | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/03d13870/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs index beca1a0..48c2b3e 100644 --- a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs +++ b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs @@ -235,7 +235,7 @@ namespace Lucene.Net.Sandbox.Queries { ScoreTerm st = new ScoreTerm(new Term(startTerm.Field, BytesRef.DeepCopyOf(possibleMatch)), score, startTerm); variantsQ.InsertWithOverflow(st); - minScore = variantsQ.Top.score; // maintain minScore + minScore = variantsQ.Top.Score; // maintain minScore } maxBoostAtt.MaxNonCompetitiveBoost = variantsQ.Count >= MAX_VARIANTS_PER_TERM ? minScore : float.NegativeInfinity; } @@ -255,7 +255,7 @@ namespace Lucene.Net.Sandbox.Queries for (int i = 0; i < size; i++) { ScoreTerm st = variantsQ.Pop(); - st.score = (st.score * st.score) * sim.Idf(df, corpusNumDocs); + st.Score = (st.Score * st.Score) * sim.Idf(df, corpusNumDocs); q.InsertWithOverflow(st); } } @@ -298,10 +298,10 @@ namespace Lucene.Net.Sandbox.Queries //List l = variantQueries.get(st.fuzziedSourceTerm); // if(l==null) List l; - if (!variantQueries.TryGetValue(st.fuzziedSourceTerm, out l) || l == null) + if (!variantQueries.TryGetValue(st.FuzziedSourceTerm, out l) || l == null) { l = new List(); - variantQueries[st.fuzziedSourceTerm] = l; + variantQueries[st.FuzziedSourceTerm] = l; } l.Add(st); } @@ -313,8 +313,8 @@ namespace Lucene.Net.Sandbox.Queries { //optimize where only one selected variant ScoreTerm st = variants[0]; - Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.term)) : new TermQuery(st.term, 1); - tq.Boost = st.score; // set the boost to a mix of IDF and score + Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.Term)) : new TermQuery(st.Term, 1); + tq.Boost = st.Score; // set the boost to a mix of IDF and score bq.Add(tq, Occur.SHOULD); } else @@ -325,8 +325,8 @@ namespace Lucene.Net.Sandbox.Queries { ScoreTerm st = iterator2.Current; // found a match - Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.term)) : new TermQuery(st.term, 1); - tq.Boost = st.score; // set the boost using the ScoreTerm's score + Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.Term)) : new TermQuery(st.Term, 1); + tq.Boost = st.Score; // set the boost using the ScoreTerm's score termVariants.Add(tq, Occur.SHOULD); // add to query } bq.Add(termVariants, Occur.SHOULD); // add to query @@ -344,15 +344,15 @@ namespace Lucene.Net.Sandbox.Queries // terms/fields internal class ScoreTerm { - public Term term; - public float score; - internal Term fuzziedSourceTerm; + public Term Term { get; set; } + public float Score { get; set; } + internal Term FuzziedSourceTerm { get; set; } public ScoreTerm(Term term, float score, Term fuzziedSourceTerm) { - this.term = term; - this.score = score; - this.fuzziedSourceTerm = fuzziedSourceTerm; + this.Term = term; + this.Score = score; + this.FuzziedSourceTerm = fuzziedSourceTerm; } } @@ -369,10 +369,10 @@ namespace Lucene.Net.Sandbox.Queries /// protected override bool LessThan(ScoreTerm termA, ScoreTerm termB) { - if (termA.score == termB.score) - return termA.term.CompareTo(termB.term) > 0; + if (termA.Score == termB.Score) + return termA.Term.CompareTo(termB.Term) > 0; else - return termA.score < termB.score; + return termA.Score < termB.Score; } }