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 2014/12/24 23:56:31 UTC
[1/3] lucenenet git commit: Cleanup
Repository: lucenenet
Updated Branches:
refs/heads/master b5568a320 -> 2221c6e0e
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/26fd3f34
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/26fd3f34
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/26fd3f34
Branch: refs/heads/master
Commit: 26fd3f348e6ffd3838d6bc7ee9231285e58572f6
Parents: b5568a3
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Thu Dec 25 00:52:59 2014 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Thu Dec 25 00:52:59 2014 +0200
----------------------------------------------------------------------
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/26fd3f34/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index afc8598..0d60fb6 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -566,29 +566,21 @@ namespace Lucene.Net.Queries.Mlt
/// <param name="vector"> List of terms and their frequencies for a doc/field </param>
private void AddTermFrequencies(IDictionary<string, Int> termFreqMap, Terms vector)
{
- //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
- //ORIGINAL LINE: final org.apache.lucene.index.TermsEnum termsEnum = vector.iterator(null);
- TermsEnum termsEnum = vector.Iterator(null);
- //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
- //ORIGINAL LINE: final org.apache.lucene.util.CharsRef spare = new org.apache.lucene.util.CharsRef();
- CharsRef spare = new CharsRef();
+ var termsEnum = vector.Iterator(null);
+ var spare = new CharsRef();
BytesRef text;
while ((text = termsEnum.Next()) != null)
{
UnicodeUtil.UTF8toUTF16(text, spare);
- //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
- //ORIGINAL LINE: final String term = spare.toString();
- string term = spare.ToString();
+ var term = spare.ToString();
if (IsNoiseWord(term))
{
continue;
}
- //JAVA TO C# CONVERTER WARNING: The original Java variable was marked 'final':
- //ORIGINAL LINE: final int freq = (int) termsEnum.totalTermFreq();
- int freq = (int)termsEnum.TotalTermFreq();
+ var freq = (int)termsEnum.TotalTermFreq();
// increment frequency
- Int cnt = termFreqMap[term];
+ var cnt = termFreqMap[term];
if (cnt == null)
{
cnt = new Int();
@@ -608,15 +600,13 @@ namespace Lucene.Net.Queries.Mlt
/// <param name="r"> a source of text to be tokenized </param>
/// <param name="termFreqMap"> a Map of terms and their frequencies </param>
/// <param name="fieldName"> Used by analyzer for any special per-field analysis </param>
- //JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
- //ORIGINAL LINE: private void addTermFrequencies(Reader r, Map<String, Int> termFreqMap, String fieldName) throws IOException
private void AddTermFrequencies(Reader r, IDictionary<string, Int> termFreqMap, string fieldName)
{
if (Analyzer == null)
{
throw new System.NotSupportedException("To use MoreLikeThis without " + "term vectors, you must provide an Analyzer");
}
- TokenStream ts = Analyzer.TokenStream(fieldName, r);
+ var ts = Analyzer.TokenStream(fieldName, r);
try
{
int tokenCount = 0;
[2/3] lucenenet git commit: Fixes issues with AddAttribute in several
places
Posted by sy...@apache.org.
Fixes issues with AddAttribute in several places
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b7cf135f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b7cf135f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b7cf135f
Branch: refs/heads/master
Commit: b7cf135f12b06c174a8ddb1e5b73f0411bd1eb49
Parents: 26fd3f3
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Thu Dec 25 00:53:44 2014 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Thu Dec 25 00:53:44 2014 +0200
----------------------------------------------------------------------
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 2 +-
src/Lucene.Net.TestFramework/Analysis/MockTokenFilter.cs | 4 ++--
src/Lucene.Net.Tests/core/Index/Test2BPostings.cs | 8 +++++++-
src/Lucene.Net.Tests/core/Index/Test2BPostingsBytes.cs | 8 +++++++-
src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs | 7 ++++---
5 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b7cf135f/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 0d60fb6..be54d1b 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -611,7 +611,7 @@ namespace Lucene.Net.Queries.Mlt
{
int tokenCount = 0;
// for every token
- var termAtt = ts.AddAttribute<CharTermAttribute>();
+ var termAtt = ts.AddAttribute<ICharTermAttribute>();
ts.Reset();
while (ts.IncrementToken())
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b7cf135f/src/Lucene.Net.TestFramework/Analysis/MockTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockTokenFilter.cs
index f692726..495a56d 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockTokenFilter.cs
@@ -45,8 +45,8 @@ namespace Lucene.Net.Analysis
private readonly CharacterRunAutomaton Filter;
- private readonly ICharTermAttribute TermAtt;// = AddAttribute<CharTermAttribute>();
- private readonly IPositionIncrementAttribute PosIncrAtt;// = AddAttribute<PositionIncrementAttribute>();
+ private readonly ICharTermAttribute TermAtt;
+ private readonly IPositionIncrementAttribute PosIncrAtt;
private int SkippedPositions;
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b7cf135f/src/Lucene.Net.Tests/core/Index/Test2BPostings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test2BPostings.cs b/src/Lucene.Net.Tests/core/Index/Test2BPostings.cs
index bfc2d61..c477fc3 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BPostings.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BPostings.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Analysis.Tokenattributes;
using Lucene.Net.Documents;
using NUnit.Framework;
using System;
@@ -85,9 +86,14 @@ namespace Lucene.Net.Index
public sealed class MyTokenStream : TokenStream
{
- internal readonly CharTermAttribute TermAtt;// = AddAttribute<CharTermAttribute>();
+ internal readonly ICharTermAttribute TermAtt;
internal int Index;
+ public MyTokenStream()
+ {
+ TermAtt = AddAttribute<ICharTermAttribute>();
+ }
+
public override bool IncrementToken()
{
if (Index <= 'z')
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b7cf135f/src/Lucene.Net.Tests/core/Index/Test2BPostingsBytes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test2BPostingsBytes.cs b/src/Lucene.Net.Tests/core/Index/Test2BPostingsBytes.cs
index 857e0eb..8fa2fad 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BPostingsBytes.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BPostingsBytes.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Analysis.Tokenattributes;
using Lucene.Net.Documents;
using NUnit.Framework;
@@ -130,10 +131,15 @@ namespace Lucene.Net.Index
public sealed class MyTokenStream : TokenStream
{
- internal readonly CharTermAttribute TermAtt;// = AddAttribute<CharTermAttribute>();
+ internal readonly ICharTermAttribute TermAtt;
internal int Index;
internal int n;
+ public MyTokenStream()
+ {
+ TermAtt = AddAttribute<ICharTermAttribute>();
+ }
+
public override bool IncrementToken()
{
if (Index < n)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b7cf135f/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 587292e..e06d191 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -1874,13 +1874,14 @@ namespace Lucene.Net.Index
private class StringSplitTokenizer : Tokenizer
{
- internal string[] Tokens;
- internal int Upto;
- internal readonly CharTermAttribute TermAtt;// = AddAttribute<CharTermAttribute>();
+ private string[] Tokens;
+ private int Upto;
+ private readonly ICharTermAttribute TermAtt;
public StringSplitTokenizer(TextReader r)
: base(r)
{
+ TermAtt = AddAttribute<ICharTermAttribute>();
try
{
Reader = r;
[3/3] lucenenet git commit: Avoid KeyNotFoundException
Posted by sy...@apache.org.
Avoid KeyNotFoundException
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2221c6e0
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2221c6e0
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2221c6e0
Branch: refs/heads/master
Commit: 2221c6e0e81377c81bbda8f1d43c63e3693960e3
Parents: b7cf135
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Thu Dec 25 00:56:15 2014 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Thu Dec 25 00:56:15 2014 +0200
----------------------------------------------------------------------
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2221c6e0/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index be54d1b..6b6ee77 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -580,8 +580,8 @@ namespace Lucene.Net.Queries.Mlt
var freq = (int)termsEnum.TotalTermFreq();
// increment frequency
- var cnt = termFreqMap[term];
- if (cnt == null)
+ Int cnt;
+ if (!termFreqMap.TryGetValue(term, out cnt))
{
cnt = new Int();
termFreqMap[term] = cnt;
@@ -627,8 +627,8 @@ namespace Lucene.Net.Queries.Mlt
}
// increment frequency
- Int cnt = termFreqMap[word];
- if (cnt == null)
+ Int cnt;
+ if (!termFreqMap.TryGetValue(word, out cnt))
{
termFreqMap[word] = new Int();
}