You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by di...@apache.org on 2011/05/16 08:50:50 UTC
[Lucene.Net] svn commit: r1103626 - in /incubator/lucene.net/branches/Lucene.Net_2_9_4g:
src/contrib/SpellChecker/ src/contrib/SpellChecker/Spell/
test/contrib/Analyzers/ test/contrib/Core/ test/contrib/Snowball/
test/contrib/Spatial/ test/contrib/SpellChecker/
Author: digy
Date: Mon May 16 06:50:49 2011
New Revision: 1103626
URL: http://svn.apache.org/viewvc?rev=1103626&view=rev
Log:
[LUCENENET-412] fixes for Contrib.SpellChecker
Modified:
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Contrib.SpellChecker.csproj
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SuggestWordQueue.cs
incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj
incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Core/Contrib.Core.Test.csproj
incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Snowball/Contrib.Snowball.Test.csproj
incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/Contrib.Spatial.Test.csproj
incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Contrib.SpellChecker.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Contrib.SpellChecker.csproj?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Contrib.SpellChecker.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Contrib.SpellChecker.csproj Mon May 16 06:50:49 2011
@@ -11,7 +11,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>Lucene.Net.Contrib.SpellChecker</AssemblyName>
+ <AssemblyName>Lucene.Net.SpellChecker</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SpellChecker.cs Mon May 16 06:50:49 2011
@@ -253,7 +253,7 @@ namespace SpellChecker.Net.Search.Spell
int maxHits = 10 * numSug;
// System.out.println("Q: " + query);
- ScoreDoc[] hits = indexSearcher.Search(query, null, maxHits).scoreDocs;
+ ScoreDoc[] hits = indexSearcher.Search(query, null, maxHits).ScoreDocs;
// System.out.println("HITS: " + hits.length());
SuggestWordQueue sugQueue = new SuggestWordQueue(numSug);
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SuggestWordQueue.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SuggestWordQueue.cs?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SuggestWordQueue.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/src/contrib/SpellChecker/Spell/SuggestWordQueue.cs Mon May 16 06:50:49 2011
@@ -16,13 +16,13 @@
*/
using System;
-using PriorityQueue = Lucene.Net.Util.PriorityQueue;
+using Lucene.Net.Util;
namespace SpellChecker.Net.Search.Spell
{
- sealed class SuggestWordQueue : PriorityQueue
+ sealed class SuggestWordQueue : PriorityQueue<SuggestWord>
{
internal SuggestWordQueue(int size)
@@ -30,10 +30,8 @@ namespace SpellChecker.Net.Search.Spell
Initialize(size);
}
- override public bool LessThan(System.Object a, System.Object b)
+ public override bool LessThan(SuggestWord wa, SuggestWord wb)
{
- SuggestWord wa = (SuggestWord) a;
- SuggestWord wb = (SuggestWord) b;
int val = wa.CompareTo(wb);
return val < 0;
}
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj Mon May 16 06:50:49 2011
@@ -50,9 +50,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\..\..\..\discovere\discover-e\current\resource\third-party\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Core/Contrib.Core.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Core/Contrib.Core.Test.csproj?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Core/Contrib.Core.Test.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Core/Contrib.Core.Test.csproj Mon May 16 06:50:49 2011
@@ -50,9 +50,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\..\..\..\discovere\discover-e\current\resource\third-party\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Snowball/Contrib.Snowball.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Snowball/Contrib.Snowball.Test.csproj?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Snowball/Contrib.Snowball.Test.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Snowball/Contrib.Snowball.Test.csproj Mon May 16 06:50:49 2011
@@ -9,7 +9,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon />
<AssemblyKeyContainerName />
- <AssemblyName>Lucene.Net.Contrib.Snowball.Test</AssemblyName>
+ <AssemblyName>Lucene.Net.Snowball.Test</AssemblyName>
<AssemblyOriginatorKeyFile />
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
@@ -81,9 +81,8 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\..\..\..\discovere\discover-e\current\resource\third-party\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/Contrib.Spatial.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/Contrib.Spatial.Test.csproj?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/Contrib.Spatial.Test.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/Spatial/Contrib.Spatial.Test.csproj Mon May 16 06:50:49 2011
@@ -50,9 +50,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\..\..\..\discovere\discover-e\current\resource\third-party\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Modified: incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj?rev=1103626&r1=1103625&r2=1103626&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj (original)
+++ incubator/lucene.net/branches/Lucene.Net_2_9_4g/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj Mon May 16 06:50:49 2011
@@ -11,7 +11,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>Lucene.Net.Contrib.SpellChecker.Test</AssemblyName>
+ <AssemblyName>Lucene.Net.SpellChecker.Test</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
@@ -92,9 +92,8 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\..\..\..\discovere\discover-e\current\resource\third-party\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>