Changeset: f8988a2c5eb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8988a2c5eb0
Modified Files:
clients/src/mapiclient/mclient.mx
geom/src/sql/Tests/spatial.stable.out.32bit
Branch: default
Log Message:
Merge from Jun2010 branch: Extend test formatting to geom types.
diffs (truncated from 548 to 300 lines):
diff -r 11d6591fc870 -r f8988a2c5eb0 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jun 23 14:10:24 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jun 23 16:41:33 2010 +0200
@@ -855,6 +855,35 @@
case '"':
stream_write(toConsole, "\\\"",
1, 2);
break;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (strcmp(tp, "curve") == 0 ||
+ strcmp(tp, "geometry") == 0
||
+ strcmp(tp, "linestring") ==
0 ||
+ strcmp(tp, "mbr") == 0 ||
+ strcmp(tp,
"multilinestring") == 0 ||
+ strcmp(tp, "point") == 0 ||
+ strcmp(tp, "polygon") == 0
||
+ strcmp(tp, "surface") == 0)
{
+ char *e;
+ double d;
+ d = strtod(s, &e);
+ if (s != e) {
+
stream_printf(toConsole, "%.10g", d);
+ l -= e - s;
+ s = e;
+ continue;
+ }
+ }
+ /* fall through */
default:
if ((unsigned char) *s < ' ')
stream_printf(toConsole,
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/basic.stable.out
--- a/geom/src/sql/Tests/basic.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/basic.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -35,35 +35,35 @@
% g # name
% geometry # type
% 0 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
+[ "POINT (10 10)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
[ NULL ]
% sys.geoms # table_name
% g # name
% geometry # type
% 0 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
+[ "POINT (10 10)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
% sys., sys., sys., sys. # table_name
% dimension_g, geometrytypeid_g, srid_g, envelope_g # name
% int, int, int, geometry # type
% 1, 1, 2, 0 # length
-[ 3, 0, -1, "POINT (10.0000000000000000 10.0000000000000000)"
]
-[ 3, 1, -1, "POLYGON ((10.0000000000000000 10.0000000000000000,
30.0000000000000000 10.0000000000000000, 30.0000000000000000
40.0000000000000000, 10.0000000000000000 40.0000000000000000,
10.0000000000000000 10.0000000000000000))" ]
-[ 3, 3, -1, "POLYGON ((10.0000000000000000 10.0000000000000000,
20.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 10.0000000000000000 20.0000000000000000,
10.0000000000000000 10.0000000000000000))" ]
-[ 3, 3, -1, "POLYGON ((10.0000000000000000 10.0000000000000000,
20.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 10.0000000000000000 20.0000000000000000,
10.0000000000000000 10.0000000000000000))" ]
+[ 3, 0, -1, "POINT (10 10)" ]
+[ 3, 1, -1, "POLYGON ((10 10, 30 10, 30 40, 10 40, 10 10))" ]
+[ 3, 3, -1, "POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))" ]
+[ 3, 3, -1, "POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))" ]
% sys., sys., sys. # table_name
% isempty_g, issimple_g, boundary_g # name
% boolean, boolean, geometry # type
% 5, 5, 0 # length
[ false, true, "GEOMETRYCOLLECTION EMPTY" ]
-[ false, true, "MULTIPOINT (10.0000000000000000 10.0000000000000000,
30.0000000000000000 40.0000000000000000)" ]
-[ false, true, "LINESTRING (10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000)" ]
-[ false, true, "MULTILINESTRING ((10.0000000000000000
10.0000000000000000, 10.0000000000000000 20.0000000000000000,
20.0000000000000000 20.0000000000000000, 20.0000000000000000
15.0000000000000000, 10.0000000000000000 10.0000000000000000),
(15.0000000000000000 15.0000000000000000, 15.0000000000000000
20.0000000000000000, 10.0000000000000000 15.0000000000000000,
15.0000000000000000 15.0000000000000000))" ]
+[ false, true, "MULTIPOINT (10 10, 30 40)" ]
+[ false, true, "LINESTRING (10 10, 10 20, 20 20, 20 15, 10 10)"
]
+[ false, true, "MULTILINESTRING ((10 10, 10 20, 20 20, 20 15, 10 10),
(15 15, 15 20, 10 15, 15 15))" ]
# 09:07:41 >
# 09:07:41 > Done.
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_curve.stable.out
--- a/geom/src/sql/Tests/geom_curve.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/geom_curve.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -33,8 +33,8 @@
% c # name
% curve # type
% 0 # length
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
+[ "LINESTRING (10 10, 20 20)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
[ NULL ]
# 21:15:14 >
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_geometry.stable.out
--- a/geom/src/sql/Tests/geom_geometry.stable.out Wed Jun 23 14:10:24
2010 +0200
+++ b/geom/src/sql/Tests/geom_geometry.stable.out Wed Jun 23 16:41:33
2010 +0200
@@ -35,10 +35,10 @@
% g # name
% geometry # type
% 0 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
+[ "POINT (10 10)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
[ NULL ]
# 21:57:03 >
diff -r 11d6591fc870 -r f8988a2c5eb0
geom/src/sql/Tests/geom_linestring.stable.out
--- a/geom/src/sql/Tests/geom_linestring.stable.out Wed Jun 23 14:10:24
2010 +0200
+++ b/geom/src/sql/Tests/geom_linestring.stable.out Wed Jun 23 16:41:33
2010 +0200
@@ -33,8 +33,8 @@
% l # name
% linestring # type
% 0 # length
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
+[ "LINESTRING (10 10, 20 20)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
[ NULL ]
# 21:15:15 >
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_mbr.stable.out
--- a/geom/src/sql/Tests/geom_mbr.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/geom_mbr.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -40,15 +40,15 @@
% b # name
% mbr # type
% 0 # length
-[ "BOX (10.000000 10.000000, 10.000000 10.000000)" ]
-[ "BOX (10.000000 10.000000, 10.000000 10.000000)" ]
-[ "BOX (10.000000 10.000000, 30.000000 40.000000)" ]
-[ "BOX (10.000000 10.000000, 30.000000 40.000000)" ]
-[ "BOX (10.000000 10.000000, 20.000000 20.000000)" ]
-[ "BOX (10.000000 10.000000, 20.000000 20.000000)" ]
-[ "BOX (10.000000 10.000000, 20.000000 20.000000)" ]
-[ "BOX (10.000000 10.000000, 20.000000 20.000000)" ]
-[ "BOX (10.000000 10.000000, 20.000000 20.000000)" ]
+[ "BOX (10 10, 10 10)" ]
+[ "BOX (10 10, 10 10)" ]
+[ "BOX (10 10, 30 40)" ]
+[ "BOX (10 10, 30 40)" ]
+[ "BOX (10 10, 20 20)" ]
+[ "BOX (10 10, 20 20)" ]
+[ "BOX (10 10, 20 20)" ]
+[ "BOX (10 10, 20 20)" ]
+[ "BOX (10 10, 20 20)" ]
[ NULL ]
# 21:15:17 >
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_multi.stable.out
--- a/geom/src/sql/Tests/geom_multi.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/geom_multi.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -42,18 +42,18 @@
% the_geom # name
% multilinestring # type
% 0 # length
-[ "MULTILINESTRING ((0.0000000000000000 0.0000000000000000, 0.0000000000000000
80.0000000000000000, 60.0000000000000000 80.0000000000000000,
60.0000000000000000 0.0000000000000000, 0.0000000000000000
0.0000000000000000))" ]
-[ "MULTILINESTRING ((32.6002766132418031 79.6282111001846005,
32.6002766132418031 43.4495799044218032, 60.0000000000000000
43.4495799044218032))" ]
-[ "MULTILINESTRING ((-0.0618009189770508 78.5913197499555025,
4.2463936485797698 78.1989578090257993, 8.4128290692190202 77.0347824741819949,
12.3004107150970992 75.1371003956325012, 15.7812195126786001
72.5683539232660024, 18.7407210606057006 69.4130664700481930,
21.0815343311284984 65.7750613082650943, 22.7266359477211992
61.7740453128334011, 23.6218946036139990 57.5416700620238970,
23.7378522273711994 53.2171999032520020))" ]
-[ "MULTILINESTRING ((24.0459229738510984 40.2263397914761995,
24.3452043818619011 35.5131014031623025, 25.3105891313714011
30.8900918042461008, 26.9225206006615991 26.4509632406012010,
29.1483445200274005 22.2856429232383988, 31.9429704771502010
18.4785112961427984, 35.2497853520133972 15.1066926696980008,
39.0018001771289988 12.2384928477941006, 43.1230071901496999
9.9320153989372493))" ]
-[ "MULTILINESTRING ((32.6002766132418031 39.9671169539188966,
32.9241373943296978 35.9444532021224035, 33.8873771318694992
32.0254126724049968, 35.4651829129764025 28.3109492680018988,
37.6169106945631029 24.8967470157192992, 40.2871322878665978
21.8707552595838983, 43.4070631803759994 19.3109230987754010))" ]
-[ "MULTILINESTRING ((23.7378522273711994 53.2171999032520020,
24.0459229738510984 40.2263397914761995))" ]
-[ "MULTILINESTRING ((32.6002766132418031 43.4495799044218032,
32.6002766132418031 39.9671169539188966))" ]
-[ "MULTILINESTRING ((43.4070631803759994 19.3109230987754010,
48.6720925417939014 24.6729695380386005, 60.0778973943148031
19.4885127868928016))" ]
-[ "MULTILINESTRING ((0.1974219185802420 29.8574262891844988,
25.6012599991949017 29.5982034516271995))" ]
-[ "MULTILINESTRING ((0.1974219185802420 55.0020415322417975,
23.5274772987365992 55.0020415322417975))" ]
-[ "MULTILINESTRING ((28.9711568874397010 70.2961889481220936,
27.1293834790847015 73.0209658993170052, 24.1470630409340004
76.8292465515136058, 20.6310769666185010 80.1511554375197051))" ]
-[ "MULTILINESTRING ((28.9711568874397010 70.2961889481220936,
32.6002766132418031 69.7777432730075020))" ]
+[ "MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0))" ]
+[ "MULTILINESTRING ((32.60027661 79.6282111, 32.60027661 43.4495799, 60
43.4495799))" ]
+[ "MULTILINESTRING ((-0.06180091898 78.59131975, 4.246393649 78.19895781,
8.412829069 77.03478247, 12.30041072 75.1371004, 15.78121951 72.56835392,
18.74072106 69.41306647, 21.08153433 65.77506131, 22.72663595 61.77404531,
23.6218946 57.54167006, 23.73785223 53.2171999))" ]
+[ "MULTILINESTRING ((24.04592297 40.22633979, 24.34520438 35.5131014,
25.31058913 30.8900918, 26.9225206 26.45096324, 29.14834452 22.28564292,
31.94297048 18.4785113, 35.24978535 15.10669267, 39.00180018 12.23849285,
43.12300719 9.932015399))" ]
+[ "MULTILINESTRING ((32.60027661 39.96711695, 32.92413739 35.9444532,
33.88737713 32.02541267, 35.46518291 28.31094927, 37.61691069 24.89674702,
40.28713229 21.87075526, 43.40706318 19.3109231))" ]
+[ "MULTILINESTRING ((23.73785223 53.2171999, 24.04592297 40.22633979))"
]
+[ "MULTILINESTRING ((32.60027661 43.4495799, 32.60027661 39.96711695))"
]
+[ "MULTILINESTRING ((43.40706318 19.3109231, 48.67209254 24.67296954,
60.07789739 19.48851279))" ]
+[ "MULTILINESTRING ((0.1974219186 29.85742629, 25.60126 29.59820345))" ]
+[ "MULTILINESTRING ((0.1974219186 55.00204153, 23.5274773 55.00204153))"
]
+[ "MULTILINESTRING ((28.97115689 70.29618895, 27.12938348 73.0209659,
24.14706304 76.82924655, 20.63107697 80.15115544))" ]
+[ "MULTILINESTRING ((28.97115689 70.29618895, 32.60027661 69.77774327))"
]
# 18:34:06 >
# 18:34:06 > Done.
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_point.stable.out
--- a/geom/src/sql/Tests/geom_point.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/geom_point.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -31,7 +31,7 @@
% p # name
% point # type
% 0 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)" ]
+[ "POINT (10 10)" ]
# 21:15:13 >
# 21:15:13 > Done.
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_polygon.stable.out
--- a/geom/src/sql/Tests/geom_polygon.stable.out Wed Jun 23 14:10:24
2010 +0200
+++ b/geom/src/sql/Tests/geom_polygon.stable.out Wed Jun 23 16:41:33
2010 +0200
@@ -34,9 +34,9 @@
% p # name
% polygon # type
% 0 # length
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
[ NULL ]
# 12:27:27 >
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/geom_surface.stable.out
--- a/geom/src/sql/Tests/geom_surface.stable.out Wed Jun 23 14:10:24
2010 +0200
+++ b/geom/src/sql/Tests/geom_surface.stable.out Wed Jun 23 16:41:33
2010 +0200
@@ -33,8 +33,8 @@
% s # name
% surface # type
% 0 # length
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
[ NULL ]
# 21:15:15 >
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/relation.stable.out
--- a/geom/src/sql/Tests/relation.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/relation.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -28,79 +28,79 @@
% g # name
% geometry # type
% 0 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
+[ "POINT (10 10)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
[ NULL ]
% sys.geoms # table_name
% g # name
% geometry # type
% 0 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)" ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))" ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))" ]
+[ "POINT (10 10)" ]
+[ "LINESTRING (10 10, 20 20, 30 40)" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
% sys.a, sys.b, sys., sys., sys., sys. # table_name
% g, g, equals_g, disjoint_g, Intersect_g, touches_g # name
% geometry, geometry, boolean, boolean, boolean,
boolean # type
% 0, 0, 5, 5, 5, 5 # length
-[ "POINT (10.0000000000000000 10.0000000000000000)", "POINT
(10.0000000000000000 10.0000000000000000)", true, false, true, false
]
-[ "POINT (10.0000000000000000 10.0000000000000000)", "LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", false,
false, true, true ]
-[ "POINT (10.0000000000000000 10.0000000000000000)", "POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", false, false, true, true ]
-[ "POINT (10.0000000000000000 10.0000000000000000)", "POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))", false,
false, true, true ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", "POINT
(10.0000000000000000 10.0000000000000000)", false, false, true, true
]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", "LINESTRING
(10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", true,
false, true, false ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", "POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", false, false, true, false ]
-[ "LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", "POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))", false,
false, true, false ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", "POINT (10.0000000000000000 10.0000000000000000)",
false, false, true, true ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", "LINESTRING (10.0000000000000000 10.0000000000000000,
20.0000000000000000 20.0000000000000000, 30.0000000000000000
40.0000000000000000)", false, false, true, false ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", "POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000))", true, false, true, false
]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", "POLYGON ((10.0000000000000000 10.0000000000000000,
10.0000000000000000 20.0000000000000000, 20.0000000000000000
20.0000000000000000, 20.0000000000000000 15.0000000000000000,
10.0000000000000000 10.0000000000000000), (15.0000000000000000
15.0000000000000000, 15.0000000000000000 20.0000000000000000,
10.0000000000000000 15.0000000000000000, 15.0000000000000000
15.0000000000000000))", false, false, true, false ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))", "POINT
(10.0000000000000000 10.0000000000000000)", false, false, true, true
]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))",
"LINESTRING (10.0000000000000000 10.0000000000000000, 20.0000000000000000
20.0000000000000000, 30.0000000000000000 40.0000000000000000)", false,
false, true, false ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))", "POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000))", false, false, true, false ]
-[ "POLYGON ((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))", "POLYGON
((10.0000000000000000 10.0000000000000000, 10.0000000000000000
20.0000000000000000, 20.0000000000000000 20.0000000000000000,
20.0000000000000000 15.0000000000000000, 10.0000000000000000
10.0000000000000000), (15.0000000000000000 15.0000000000000000,
15.0000000000000000 20.0000000000000000, 10.0000000000000000
15.0000000000000000, 15.0000000000000000 15.0000000000000000))", true,
false, true, false ]
+[ "POINT (10 10)", "POINT (10 10)", true, false, true, false
]
+[ "POINT (10 10)", "LINESTRING (10 10, 20 20, 30 40)", false, false,
true, true ]
+[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))",
false, false, true, true ]
+[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15,
15 20, 10 15, 15 15))", false, false, true, true ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "POINT (10 10)", false, false,
true, true ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "LINESTRING (10 10, 20 20, 30 40)",
true, false, true, false ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "POLYGON ((10 10, 10 20, 20 20, 20 15,
10 10))", false, false, true, false ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "POLYGON ((10 10, 10 20, 20 20, 20 15,
10 10), (15 15, 15 20, 10 15, 15 15))", false, false, true, false ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "POINT (10 10)",
false, false, true, true ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
