lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject svn commit: r1388987 - in /lucene.net/trunk: src/contrib/Spatial/ src/contrib/Spatial/Vector/ test/contrib/Spatial/ test/contrib/Spatial/Vector/
Date Sun, 23 Sep 2012 09:06:17 GMT
Author: synhershko
Date: Sun Sep 23 09:06:17 2012
New Revision: 1388987

URL: http://svn.apache.org/viewvc?rev=1388987&view=rev
Log:
LUCENE-4374 Rename TwoDoubles to PointVector

Added:
    lucene.net/trunk/src/contrib/Spatial/Vector/PointVectorStrategy.cs
      - copied, changed from r1388985, lucene.net/trunk/src/contrib/Spatial/Vector/TwoDoublesStrategy.cs
Removed:
    lucene.net/trunk/src/contrib/Spatial/Vector/TwoDoublesStrategy.cs
Modified:
    lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj
    lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj
    lucene.net/trunk/src/contrib/Spatial/Vector/DistanceValueSource.cs
    lucene.net/trunk/test/contrib/Spatial/DistanceStrategyTest.cs
    lucene.net/trunk/test/contrib/Spatial/PortedSolr3Test.cs
    lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs

Modified: lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj?rev=1388987&r1=1388986&r2=1388987&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj (original)
+++ lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj Sun Sep 23 09:06:17 2012
@@ -157,7 +157,7 @@
     <Compile Include="Util\TermsFilter.cs" />
     <Compile Include="Util\ValueSourceFilter.cs" />
     <Compile Include="Vector\DistanceValueSource.cs" />
-    <Compile Include="Vector\TwoDoublesStrategy.cs" />
+    <Compile Include="Vector\PointVectorStrategy.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\Lucene.Net.csproj">

Modified: lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj?rev=1388987&r1=1388986&r2=1388987&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj (original)
+++ lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj Sun Sep 23 09:06:17 2012
@@ -157,7 +157,7 @@
     <Compile Include="Util\TermsFilter.cs" />
     <Compile Include="Util\ValueSourceFilter.cs" />
     <Compile Include="Vector\DistanceValueSource.cs" />
-    <Compile Include="Vector\TwoDoublesStrategy.cs" />
+    <Compile Include="Vector\PointVectorStrategy.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\Lucene.Net.csproj">

Modified: lucene.net/trunk/src/contrib/Spatial/Vector/DistanceValueSource.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Vector/DistanceValueSource.cs?rev=1388987&r1=1388986&r2=1388987&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Vector/DistanceValueSource.cs (original)
+++ lucene.net/trunk/src/contrib/Spatial/Vector/DistanceValueSource.cs Sun Sep 23 09:06:17
2012
@@ -31,10 +31,10 @@ namespace Lucene.Net.Spatial.Vector
 	/// </summary>
 	public class DistanceValueSource : ValueSource
 	{
-		private readonly TwoDoublesStrategy strategy;
+		private readonly PointVectorStrategy strategy;
 		private readonly Point from;
 
-		public DistanceValueSource(TwoDoublesStrategy strategy, Point from)
+		public DistanceValueSource(PointVectorStrategy strategy, Point from)
 		{
 			this.strategy = strategy;
 			this.from = from;

Copied: lucene.net/trunk/src/contrib/Spatial/Vector/PointVectorStrategy.cs (from r1388985,
lucene.net/trunk/src/contrib/Spatial/Vector/TwoDoublesStrategy.cs)
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Vector/PointVectorStrategy.cs?p2=lucene.net/trunk/src/contrib/Spatial/Vector/PointVectorStrategy.cs&p1=lucene.net/trunk/src/contrib/Spatial/Vector/TwoDoublesStrategy.cs&r1=1388985&r2=1388987&rev=1388987&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Vector/TwoDoublesStrategy.cs (original)
+++ lucene.net/trunk/src/contrib/Spatial/Vector/PointVectorStrategy.cs Sun Sep 23 09:06:17
2012
@@ -22,7 +22,6 @@ using Lucene.Net.Search.Function;
 using Lucene.Net.Spatial.Queries;
 using Lucene.Net.Spatial.Util;
 using Spatial4n.Core.Context;
-using Spatial4n.Core.Exceptions;
 using Spatial4n.Core.Shapes;
 
 namespace Lucene.Net.Spatial.Vector
@@ -37,7 +36,7 @@ namespace Lucene.Net.Spatial.Vector
     /// Due to the simple use of numeric fields, this Strategy provides support for sorting
by
     /// distance through {@link DistanceValueSource}
     /// </summary>
-	public class TwoDoublesStrategy : SpatialStrategy
+	public class PointVectorStrategy : SpatialStrategy
 	{
 		public static String SUFFIX_X = "__x";
 		public static String SUFFIX_Y = "__y";
@@ -47,7 +46,7 @@ namespace Lucene.Net.Spatial.Vector
 
 		public int precisionStep = 8; // same as solr default
 
-		public TwoDoublesStrategy(SpatialContext ctx, String fieldNamePrefix)
+		public PointVectorStrategy(SpatialContext ctx, String fieldNamePrefix)
 			: base(ctx, fieldNamePrefix)
 		{
 			this.fieldNameX = fieldNamePrefix + SUFFIX_X;

Modified: lucene.net/trunk/test/contrib/Spatial/DistanceStrategyTest.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Spatial/DistanceStrategyTest.cs?rev=1388987&r1=1388986&r2=1388987&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Spatial/DistanceStrategyTest.cs (original)
+++ lucene.net/trunk/test/contrib/Spatial/DistanceStrategyTest.cs Sun Sep 23 09:06:17 2012
@@ -34,7 +34,7 @@ namespace Lucene.Net.Contrib.Spatial.Tes
                 strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash");
                 ctorArgs.Add(new Param(strategy));
 
-                strategy = new TwoDoublesStrategy(ctx, "twodoubles");
+                strategy = new PointVectorStrategy(ctx, "pointvector");
                 ctorArgs.Add(new Param(strategy));
 
                 strategy = new BBoxStrategy(ctx, "bbox");

Modified: lucene.net/trunk/test/contrib/Spatial/PortedSolr3Test.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Spatial/PortedSolr3Test.cs?rev=1388987&r1=1388986&r2=1388987&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Spatial/PortedSolr3Test.cs (original)
+++ lucene.net/trunk/test/contrib/Spatial/PortedSolr3Test.cs Sun Sep 23 09:06:17 2012
@@ -58,7 +58,7 @@ namespace Lucene.Net.Contrib.Spatial.Tes
                 strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash");
                 ctorArgs.Add(new Param(strategy));
 
-                strategy = new TwoDoublesStrategy(ctx, "twodoubles");
+                strategy = new PointVectorStrategy(ctx, "pointvector");
                 ctorArgs.Add(new Param(strategy));
 
                 return ctorArgs;

Modified: lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs?rev=1388987&r1=1388986&r2=1388987&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs (original)
+++ lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs Sun Sep 23 09:06:17
2012
@@ -33,7 +33,7 @@ namespace Lucene.Net.Contrib.Spatial.Tes
 		{
 			base.SetUp();
 			this.ctx = SpatialContext.GEO;
-			this.strategy = new TwoDoublesStrategy(ctx, GetType().Name);
+			this.strategy = new PointVectorStrategy(ctx, GetType().Name);
 		}
 
 		[Test]



Mime
View raw message