Isolate <<->> in version-checked regression file

git-svn-id: http://svn.osgeo.org/postgis/trunk@13609 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/knn.sql b/regress/knn.sql
index 60197503c2822db25ab35e6805d4992b7c373ed6..2f10f2dfe9906739e447182261d3777cafc6ac0b 100644 (file)
--- a/regress/knn.sql
+++ b/regress/knn.sql
@@ -83,3 +83,18 @@ SELECT '<<->> res3',num,
 DROP FUNCTION qnodes(text);
 
 DROP TABLE test;
+
+-- nd box centroid distance  <<->>
+
+select '<<->> ndcd1', 'LINESTRING(0 0,0 10,10 10)'::geometry <<->>
+                'LINESTRING(6 2,6 8)'::geometry; -- 1
+select '<<->> ndcd2', 'LINESTRING(0 0,0 10,10 10)'::geometry <<->>
+                'LINESTRING(11 0,19 10)'::geometry; -- 10
+select '<<->> ndcd3', 'POINTM(0 0 0)'::geometry <<->>
+                'POINTM(0 0 5)'::geometry; -- 5
+select '<<->> ndcd4', 'POINTZ(0 0 15)'::geometry <<->>
+                'POINTZ(0 0 10)'::geometry; -- 5
+select '<<->> ndcd5', 'POINTZM(1 2 3 4)'::geometry <<->>
+                'POINTZM(2 3 4 5)'::geometry; -- 2
+select '<<->> ndcd6', 'POINTZM(9 9 3 4)'::geometry <<->>
+                'POINT(9 8)'::geometry; -- 1, higher dimensions overlapping

diff --git a/regress/knn_expected b/regress/knn_expected
index 3c9326bdb2125ce8441392e226d8318809cfd53b..a09fce6f36128f67587a3a64ae3a20ffe9baa05d 100644 (file)
--- a/regress/knn_expected
+++ b/regress/knn_expected
@@ -7,3 +7,9 @@
 <<->> res1|48589|0.17|POINT ZM (2.33793712 2.44566727 48589 -48589)
 <<->> res2|25025|1.20|POINT ZM (95.6546249 23.0995369 25025 -25025)
 <<->> res3|25023|1.27|POINT ZM (631.060242 729.787354 25023 -25023)
+<<->> ndcd1|1
+<<->> ndcd2|10
+<<->> ndcd3|5
+<<->> ndcd4|5
+<<->> ndcd5|2
+<<->> ndcd6|1

diff --git a/regress/operators.sql b/regress/operators.sql
index 2422dd52a52652308f7c23f0e79afa12fffb7bb9..56f2724b94bb36b730612484e162e6992dd93580 100644 (file)
--- a/regress/operators.sql
+++ b/regress/operators.sql
@@ -140,18 +140,4 @@ WITH v(i,g) AS ( VALUES
 SELECT 'ndovm2', array_agg(i) FROM v WHERE g &&& 'POINTZ(0 0 1)'::geometry
 ORDER BY 1;
 
--- nd box centroid distance  <<->>
-
-select 'ndcd1', 'LINESTRING(0 0,0 10,10 10)'::geometry <<->>
-                'LINESTRING(6 2,6 8)'::geometry; -- 1
-select 'ndcd2', 'LINESTRING(0 0,0 10,10 10)'::geometry <<->>
-                'LINESTRING(11 0,19 10)'::geometry; -- 10
-select 'ndcd3', 'POINTM(0 0 0)'::geometry <<->>
-                'POINTM(0 0 5)'::geometry; -- 5
-select 'ndcd4', 'POINTZ(0 0 15)'::geometry <<->>
-                'POINTZ(0 0 10)'::geometry; -- 5
-select 'ndcd5', 'POINTZM(1 2 3 4)'::geometry <<->>
-                'POINTZM(2 3 4 5)'::geometry; -- 2
-select 'ndcd6', 'POINTZM(9 9 3 4)'::geometry <<->>
-                'POINT(9 8)'::geometry; -- 1, higher dimensions overlapping
 

diff --git a/regress/operators_expected b/regress/operators_expected
index 80545921cf61414311981c50f7ec40fea555b0b3..c1539e6e4fcc0564043276d2f24f19b02aec6838 100644 (file)
--- a/regress/operators_expected
+++ b/regress/operators_expected
@@ -56,9 +56,3 @@ ndov6|t
 ndov7|t
 ndovm1|{1,2,3,4,5,8}
 ndovm2|{1,2,4,6,7}
-ndcd1|1
-ndcd2|10
-ndcd3|5
-ndcd4|5
-ndcd5|2
-ndcd6|1