Skip to content

Commit 1569bfc

Browse files
author
Markus Nullmeier
committed
some more systematic 'spoint <@ sbox' tests
1 parent edfeeff commit 1569bfc

File tree

3 files changed

+180
-1
lines changed

3 files changed

+180
-1
lines changed

doc/constructors.sgm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
</para>
383383
<funcsynopsis>
384384
<funcprototype>
385-
<funcdef><function>sellipse</function></funcdef>
385+
<funcdef><function>sbox</function></funcdef>
386386
<paramdef>spoint <parameter>south_west</parameter></paramdef>
387387
<paramdef>spoint <parameter>north_east</parameter></paramdef>
388388
</funcprototype>

expected/box.out

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,4 +2064,155 @@ SELECT sbox '((170d,-50d),(190d,-40d))' ~ sline ( spoint '(170d, -40d)', spoint
20642064
t
20652065
(1 row)
20662066

2067+
-- all less/equals/greater permutations of spoint coordinates with respect to a fixed sbox
2068+
select 'f' as expected, spoint(0.50, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2069+
expected | actual
2070+
----------+--------
2071+
f | f
2072+
(1 row)
2073+
2074+
select 'f' as expected, spoint(0.50, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2075+
expected | actual
2076+
----------+--------
2077+
f | f
2078+
(1 row)
2079+
2080+
select 'f' as expected, spoint(0.50, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2081+
expected | actual
2082+
----------+--------
2083+
f | f
2084+
(1 row)
2085+
2086+
select 'f' as expected, spoint(0.50, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2087+
expected | actual
2088+
----------+--------
2089+
f | f
2090+
(1 row)
2091+
2092+
select 'f' as expected, spoint(0.50, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2093+
expected | actual
2094+
----------+--------
2095+
f | f
2096+
(1 row)
2097+
2098+
select 'f' as expected, spoint(0.75, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2099+
expected | actual
2100+
----------+--------
2101+
f | f
2102+
(1 row)
2103+
2104+
select 't' as expected, spoint(0.75, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2105+
expected | actual
2106+
----------+--------
2107+
t | t
2108+
(1 row)
2109+
2110+
select 't' as expected, spoint(0.75, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2111+
expected | actual
2112+
----------+--------
2113+
t | t
2114+
(1 row)
2115+
2116+
select 't' as expected, spoint(0.75, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2117+
expected | actual
2118+
----------+--------
2119+
t | t
2120+
(1 row)
2121+
2122+
select 'f' as expected, spoint(0.75, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2123+
expected | actual
2124+
----------+--------
2125+
f | f
2126+
(1 row)
2127+
2128+
select 'f' as expected, spoint(1.00, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2129+
expected | actual
2130+
----------+--------
2131+
f | f
2132+
(1 row)
2133+
2134+
select 't' as expected, spoint(1.00, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2135+
expected | actual
2136+
----------+--------
2137+
t | t
2138+
(1 row)
2139+
2140+
select 't' as expected, spoint(1.00, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2141+
expected | actual
2142+
----------+--------
2143+
t | t
2144+
(1 row)
2145+
2146+
select 't' as expected, spoint(1.00, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2147+
expected | actual
2148+
----------+--------
2149+
t | t
2150+
(1 row)
2151+
2152+
select 'f' as expected, spoint(1.00, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2153+
expected | actual
2154+
----------+--------
2155+
f | f
2156+
(1 row)
2157+
2158+
select 'f' as expected, spoint(1.25, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2159+
expected | actual
2160+
----------+--------
2161+
f | f
2162+
(1 row)
2163+
2164+
select 't' as expected, spoint(1.25, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2165+
expected | actual
2166+
----------+--------
2167+
t | t
2168+
(1 row)
2169+
2170+
select 't' as expected, spoint(1.25, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2171+
expected | actual
2172+
----------+--------
2173+
t | t
2174+
(1 row)
2175+
2176+
select 't' as expected, spoint(1.25, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2177+
expected | actual
2178+
----------+--------
2179+
t | t
2180+
(1 row)
2181+
2182+
select 'f' as expected, spoint(1.25, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2183+
expected | actual
2184+
----------+--------
2185+
f | f
2186+
(1 row)
2187+
2188+
select 'f' as expected, spoint(1.50, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2189+
expected | actual
2190+
----------+--------
2191+
f | f
2192+
(1 row)
2193+
2194+
select 'f' as expected, spoint(1.50, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2195+
expected | actual
2196+
----------+--------
2197+
f | f
2198+
(1 row)
2199+
2200+
select 'f' as expected, spoint(1.50, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2201+
expected | actual
2202+
----------+--------
2203+
f | f
2204+
(1 row)
2205+
2206+
select 'f' as expected, spoint(1.50, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2207+
expected | actual
2208+
----------+--------
2209+
f | f
2210+
(1 row)
2211+
2212+
select 'f' as expected, spoint(1.50, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
2213+
expected | actual
2214+
----------+--------
2215+
f | f
2216+
(1 row)
2217+
20672218
-- wide spherical boxes

sql/box.sql

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,4 +436,32 @@ SELECT sbox '((170d,-50d),(190d,-40d))' && sline ( spoint '(180d, -41d)', spoint
436436

437437
SELECT sbox '((170d,-50d),(190d,-40d))' ~ sline ( spoint '(170d, -40d)', spoint '(190d, -40d)' ) ;
438438

439+
-- all less/equals/greater permutations of spoint coordinates with respect to a fixed sbox
440+
441+
select 'f' as expected, spoint(0.50, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
442+
select 'f' as expected, spoint(0.50, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
443+
select 'f' as expected, spoint(0.50, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
444+
select 'f' as expected, spoint(0.50, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
445+
select 'f' as expected, spoint(0.50, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
446+
select 'f' as expected, spoint(0.75, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
447+
select 't' as expected, spoint(0.75, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
448+
select 't' as expected, spoint(0.75, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
449+
select 't' as expected, spoint(0.75, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
450+
select 'f' as expected, spoint(0.75, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
451+
select 'f' as expected, spoint(1.00, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
452+
select 't' as expected, spoint(1.00, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
453+
select 't' as expected, spoint(1.00, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
454+
select 't' as expected, spoint(1.00, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
455+
select 'f' as expected, spoint(1.00, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
456+
select 'f' as expected, spoint(1.25, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
457+
select 't' as expected, spoint(1.25, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
458+
select 't' as expected, spoint(1.25, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
459+
select 't' as expected, spoint(1.25, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
460+
select 'f' as expected, spoint(1.25, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
461+
select 'f' as expected, spoint(1.50, 0.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
462+
select 'f' as expected, spoint(1.50, 0.75) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
463+
select 'f' as expected, spoint(1.50, 1.00) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
464+
select 'f' as expected, spoint(1.50, 1.25) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
465+
select 'f' as expected, spoint(1.50, 1.50) <@ sbox(spoint(0.75, 0.75), spoint(1.25, 1.25)) as actual;
466+
439467
-- wide spherical boxes

0 commit comments

Comments
 (0)