motiejus/stud
1
Fork 0
Code Releases Activity

add some intersections

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-04-18 09:58:43 +03:00
parent e91294fbaa
commit 8b532b9e85
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IV/Makefile
View File

@ -41,8 +41,8 @@ mj-msc-full.pdf: mj-msc.pdf version.inc.tex $(ARCHIVABLES) ## Thesis for publish
.PHONY: test .PHONY: test
test: .faux_test ## Unit tests (fast) test: .faux_test ## Unit tests (fast)
.PHONY: test-integration .PHONY: test-rivers
test-integration: .faux_test-integration ## Integration tests (slow) test-rivers: .faux_test-rivers ## Rivers tests (slow)
.PHONY: slides .PHONY: slides
slides: $(SLIDES) slides: $(SLIDES)
@ -113,7 +113,7 @@ selfcrossing-1-after_2SELECT = wm_debug where name='selfcrossing-1' AND stage='b
selfcrossing-1-after_2LINESTYLE = invisible selfcrossing-1-after_2LINESTYLE = invisible
.faux_test-integration: tests-integration.sql wm.sql .faux_db .faux_test-rivers: tests-rivers.sql wm.sql .faux_db
./db -f $< ./db -f $<
touch $@ touch $@
@ -161,7 +161,7 @@ mj-msc-gray.pdf: mj-msc.pdf
.PHONY: clean .PHONY: clean
clean: ## Clean the current working directory clean: ## Clean the current working directory
-./db stop -./db stop
-rm -r .faux_test .faux_aggregate-rivers .faux_test-integration .faux_db \ -rm -r .faux_test .faux_aggregate-rivers .faux_test-rivers .faux_db \
version.inc.tex vars.inc.tex version.aux version.fdb_latexmk \ version.inc.tex vars.inc.tex version.aux version.fdb_latexmk \
_minted-mj-msc \ _minted-mj-msc \
$(shell git ls-files -o mj-msc*) \ $(shell git ls-files -o mj-msc*) \
@ -169,7 +169,7 @@ clean: ## Clean the current working directory
$(SLIDES) $(SLIDES)
.PHONY: clean-tables .PHONY: clean-tables
clean-tables: ## Remove tables created during unit or integration tests clean-tables: ## Remove tables created during unit or rivers tests
./db -c '\dt wm_*' | awk '/_/{print "drop table "$$3";"}' | ./db -f - ./db -c '\dt wm_*' | awk '/_/{print "drop table "$$3";"}' | ./db -f -
-rm .faux_db -rm .faux_db

2
IV/init.sql
View File

@ -1,4 +1,4 @@
-- This file initializes tables for unit and integration tests. -- This file initializes tables for unit and river tests.
-- ST_SimplifyWM, when dbgname is non-empty, expects `wm_debug` table to be -- ST_SimplifyWM, when dbgname is non-empty, expects `wm_debug` table to be
-- created. -- created.

14
IV/tests-integration.sql → IV/tests-rivers.sql
View File

@ -1,5 +1,19 @@
\i wm.sql \i wm.sql
insert into wm_visuals(name, way) values('salcia-visincia',
st_closestpoint(
(select way from wm_rivers where name='Šalčia'),
(select way from wm_rivers where name='Visinčia')
)
);
insert into wm_visuals(name, way) values('nemunas-merkys',
st_closestpoint(
(select way from wm_rivers where name='Nemunas'),
(select way from wm_rivers where name='Merkys')
)
);
do $$ do $$
declare declare
npoints bigint; npoints bigint;