motiejus/wm
1
Fork 0
Code Releases Activity

selfcrossing-1 too

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:48 +03:00 committed by Motiejus Jakštys
parent 0e86f6144f
commit 05d7cc0a77
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -18,7 +18,8 @@ FIGURES = test-figures \
inflection-1-gentle-inflection-after \ inflection-1-gentle-inflection-after \
fig6-selfcrossing-before \ fig6-selfcrossing-before \
fig6-selfcrossing-after \ fig6-selfcrossing-after \
selfcrossing-1-before selfcrossing-1-before \
selfcrossing-1-after
################################# #################################
# The thesis, publishable version # The thesis, publishable version
@ -106,6 +107,8 @@ selfcrossing-1-before_1SELECT = wm_debug where name='selfcrossing-1' AND stage='
selfcrossing-1-before_2SELECT = wm_visuals where name='selfcrossing-1-baseline' selfcrossing-1-before_2SELECT = wm_visuals where name='selfcrossing-1-baseline'
selfcrossing-1-before_2LINESTYLE = dotted selfcrossing-1-before_2LINESTYLE = dotted
selfcrossing-1-before_3SELECT = wm_visuals where name='selfcrossing-1-newline' selfcrossing-1-before_3SELECT = wm_visuals where name='selfcrossing-1-newline'
selfcrossing-1-after_WIDTHDIV = 4
selfcrossing-1-after_1SELECT = wm_debug where name='selfcrossing-1' AND stage='dcrossings' AND gen=1
.faux_test-integration: tests-integration.sql wm.sql .faux_aggregate-rivers .faux_test-integration: tests-integration.sql wm.sql .faux_aggregate-rivers
./db -f $< ./db -f $<

8
mj-msc.tex
View File

@ -441,10 +441,10 @@ figure~\onpage{fig:selfcrossing-1-non-neighbor}.
\caption{Bend's baseline is crossing a non-neighboring bend} \caption{Bend's baseline is crossing a non-neighboring bend}
\end{subfigure} \end{subfigure}
\hfill \hfill
%\begin{subfigure}[b]{.4\textwidth} \begin{subfigure}[b]{.4\textwidth}
% \includegraphics[width=\textwidth]{selfcrossing-1-after} \includegraphics[width=\textwidth]{selfcrossing-1-after}
% \caption{Self-crossing removed} \caption{Self-crossing removed}
%\end{subfigure} \end{subfigure}
\caption{Self-crossing with non-neighboring bend} \caption{Self-crossing with non-neighboring bend}
\label{fig:selfcrossing-1-non-neighbor} \label{fig:selfcrossing-1-non-neighbor}
\end{figure} \end{figure}

2
tests-integration.sql
View File

@ -10,6 +10,6 @@ begin
raise notice 'Expected duration: %s (+-%s)', ceil(secs), floor(secs*.5); raise notice 'Expected duration: %s (+-%s)', ceil(secs), floor(secs*.5);
end $$ language plpgsql; end $$ language plpgsql;
delete from wm_debug where name in (select distinct name from wm_rivers);
delete from wm_demo where name in (select distinct name from wm_rivers); delete from wm_demo where name in (select distinct name from wm_rivers);
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_rivers; insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_rivers;

16
tests.sql
View File

@ -51,8 +51,8 @@ insert into wm_figures (name, way) values ('multi-island',ST_GeomFromText('MULTI
insert into wm_figures (name, way) values ('selfcrossing-1',ST_GeomFromText('LINESTRING(-27 180,-20 166,-21 142,-18 136,55 136,55 136,71 145,44 165,37 146,22 145,14 164,11 164,3 146,-12 146,-13 176,-18 184)')); insert into wm_figures (name, way) values ('selfcrossing-1',ST_GeomFromText('LINESTRING(-27 180,-20 166,-21 142,-18 136,55 136,55 136,71 145,44 165,37 146,22 145,14 164,11 164,3 146,-12 146,-13 176,-18 184)'));
insert into wm_figures (name, way) values ('selfcrossing-1-rev',ST_Reverse(ST_Translate((select way from wm_figures where name='selfcrossing-1'), 0, 60))); insert into wm_figures (name, way) values ('selfcrossing-1-rev',ST_Reverse(ST_Translate((select way from wm_figures where name='selfcrossing-1'), 0, 60)));
delete from wm_debug where name in (select name from wm_figures); delete from wm_debug where name in (select distinct name from wm_figures);
delete from wm_demo where name in (select distinct name from wm_figures);
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_figures; insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_figures;
-- wm_visuals holds visual aids for the paper. -- wm_visuals holds visual aids for the paper.
@ -62,18 +62,18 @@ do $$
declare fig6b1 geometry; declare fig6b1 geometry;
declare fig6b2 geometry; declare fig6b2 geometry;
declare scb1 geometry; declare sclong geometry;
declare scb2 geometry; declare scshort geometry;
begin begin
select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b1 limit 1 offset 0; select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b1 limit 1 offset 0;
select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b2 limit 1 offset 2; select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b2 limit 1 offset 2;
insert into wm_visuals (name, way) values('fig6-baseline', st_makeline(st_startpoint(fig6b2), st_endpoint(fig6b2))); insert into wm_visuals (name, way) values('fig6-baseline', st_makeline(st_startpoint(fig6b2), st_endpoint(fig6b2)));
insert into wm_visuals (name, way) values('fig6-newline', st_makeline(st_endpoint(fig6b1), st_endpoint(fig6b2))); insert into wm_visuals (name, way) values('fig6-newline', st_makeline(st_endpoint(fig6b1), st_endpoint(fig6b2)));
select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scb1 limit 1 offset 0; select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into sclong limit 1 offset 1;
select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scb2 limit 1 offset 2; select way from wm_debug where name='selfcrossing-1' and stage='bbends' and gen=1 into scshort limit 1 offset 4;
insert into wm_visuals (name, way) values('selfcrossing-1-baseline', st_makeline(st_startpoint(scb2), st_endpoint(scb2))); insert into wm_visuals (name, way) values('selfcrossing-1-baseline', st_makeline(st_startpoint(sclong), st_endpoint(sclong)));
insert into wm_visuals (name, way) values('selfcrossing-1-newline', st_makeline(st_endpoint(scb1), st_endpoint(scb2))); insert into wm_visuals (name, way) values('selfcrossing-1-newline', st_makeline(st_startpoint(sclong), st_endpoint(scshort)));
end $$ language plpgsql; end $$ language plpgsql;