From 7480da3279fa392c50580dc513c71269a113c078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 18 Jun 2020 09:37:54 +0300 Subject: [PATCH] replace dashes with underscores --- II/Referatas/Makefile | 35 +++++++++++++---------- II/Referatas/douglas.sql | 2 +- II/Referatas/mj-prezentacija.tex | 8 +++--- II/Referatas/mj-referatas.tex | 48 ++++++++++++++++---------------- II/Referatas/visvalingam.sql | 2 +- 5 files changed, 51 insertions(+), 44 deletions(-) diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile index 61c82d3..472da19 100644 --- a/II/Referatas/Makefile +++ b/II/Referatas/Makefile @@ -1,19 +1,18 @@ -CROSSING=622916 6109267 626066 6111487 # xmin ymin xmax ymax +CROSSING = 622916 6109267 626066 6111487 # xmin ymin xmax ymax ZEIMENA_TOLERANCES = 128 256 512 1024 2048 4096 SINEWAVE_TOLERANCES = 2 16 32 CROSSING_TOLERANCES = 64 128 256 SINEWAVE_SIZE = 120x48 -#CROSSING=622916 6119267 626066 6121487 GEN1 = $(addsuffix .pdf, \ - $(addprefix sinewave2-douglas-,$(SINEWAVE_TOLERANCES)) \ - $(addprefix sinewave2-visvalingam-,$(SINEWAVE_TOLERANCES)) \ - $(addprefix zeimena-douglas-,$(ZEIMENA_TOLERANCES)) \ - $(addprefix zeimena-visvalingam-,$(ZEIMENA_TOLERANCES))) + $(addprefix sinewave2_douglas_,$(SINEWAVE_TOLERANCES)) \ + $(addprefix sinewave2_visvalingam_,$(SINEWAVE_TOLERANCES)) \ + $(addprefix zeimena_douglas_,$(ZEIMENA_TOLERANCES)) \ + $(addprefix zeimena_visvalingam_,$(ZEIMENA_TOLERANCES))) GEN2 = $(addsuffix .pdf, \ - $(addprefix overlaid-zeimena-douglas-,$(CROSSING_TOLERANCES)) \ - $(addprefix overlaid-zeimena-visvalingam-,$(CROSSING_TOLERANCES)) \ - $(addprefix overlaid-sinewave2-douglas-,$(SINEWAVE_TOLERANCES)) \ - $(addprefix overlaid-sinewave2-visvalingam-,$(SINEWAVE_TOLERANCES))) + $(addprefix overlaid_zeimena_douglas_,$(CROSSING_TOLERANCES)) \ + $(addprefix overlaid_zeimena_visvalingam_,$(CROSSING_TOLERANCES)) \ + $(addprefix overlaid_sinewave2_douglas_,$(SINEWAVE_TOLERANCES)) \ + $(addprefix overlaid_sinewave2_visvalingam_,$(SINEWAVE_TOLERANCES))) .PHONY: all all: mj-referatas.pdf mj-prezentacija.pdf @@ -27,19 +26,27 @@ mj-prezentacija.pdf: mj-prezentacija.tex ../../misc/Logo_vilniaus_universitetas. latexmk -pdf $< define algo2img -db/.faux_$(1)-$(2)-%: $(2).sql db/.faux_ready +db/.faux_$(1)_$(2)_%: $(2).sql db/.faux_ready ./managedb -- --echo-all \ -v ON_ERROR_STOP=1 \ -v src=$(1) \ - -v tolerance=$$* \ + -v param1=$$* \ -v tbl=$(1)_$(2)_$$* \ -f $(2).sql touch $$@ -$(1)-$(2)-%.pdf: layer2img.py db/.faux_$(1)-$(2)-% +db/.chaikin_$(1)_%: chaikin.sql db/.faux_ready + ./managedb -- --echo-all \ + -v ON_ERROR_STOP=1 \ + -v src=$(1) \ + -v param1=$$* \ + -v tbl=chaikin_$(1)_$$* \ + -f chaikin.sql + touch $$@ +$(1)_$(2)_%.pdf: layer2img.py db/.faux_$(1)_$(2)_% ./layer2img.py --group2-table=$(1)_$(2)_$$* --size=$(3) --outfile $$@ endef define algo2overlay -overlaid-$(1)-$(2)-%.pdf: layer2img.py db/.faux_$(1)-$(2)-% +overlaid_$(1)_$(2)_%.pdf: layer2img.py db/.faux_$(1)_$(2)_% ./layer2img.py $(3) --group1-table=$(1) --group2-table=$(1)_$(2)_$$* \ --outfile $$@ endef diff --git a/II/Referatas/douglas.sql b/II/Referatas/douglas.sql index 6d4a8bb..831efd3 100644 --- a/II/Referatas/douglas.sql +++ b/II/Referatas/douglas.sql @@ -8,7 +8,7 @@ CREATE TABLE :tbl ( INSERT INTO :tbl (geom) ( SELECT ST_Multi (ST_Simplify (ST_LineMerge (ST_Union (geom)), - :tolerance)) AS geoms + :param1)) AS geoms FROM :src); diff --git a/II/Referatas/mj-prezentacija.tex b/II/Referatas/mj-prezentacija.tex index f3b64e3..2b1ac78 100644 --- a/II/Referatas/mj-prezentacija.tex +++ b/II/Referatas/mj-prezentacija.tex @@ -118,14 +118,14 @@ Visvalingam-Whyatt \tabularnewline \hline \onslide<3->{\center - \includegraphics[width=.75\linewidth]{overlaid-zeimena-douglas-64}} & + \includegraphics[width=.75\linewidth]{overlaid_zeimena_douglas_64}} & \onslide<3->{\center - \includegraphics[width=.75\linewidth]{overlaid-zeimena-visvalingam-64}} \tabularnewline \hline + \includegraphics[width=.75\linewidth]{overlaid_zeimena_visvalingam_64}} \tabularnewline \hline \onslide<4->{\center - \includegraphics[width=.75\linewidth]{overlaid-zeimena-douglas-256}} & + \includegraphics[width=.75\linewidth]{overlaid_zeimena_douglas_256}} & \onslide<4->{\center - \includegraphics[width=.75\linewidth]{overlaid-zeimena-visvalingam-256}} \tabularnewline \hline + \includegraphics[width=.75\linewidth]{overlaid_zeimena_visvalingam_256}} \tabularnewline \hline \end{tabularx} \end{frame} diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex index b6a096f..012ca8a 100644 --- a/II/Referatas/mj-referatas.tex +++ b/II/Referatas/mj-referatas.tex @@ -209,28 +209,28 @@ bends on the original map should be retained. Visvalingam-Whyatt \tabularnewline \hline 128/16384 & - \includegraphics[width=\linewidth]{zeimena-douglas-128} & - \includegraphics[width=\linewidth]{zeimena-visvalingam-128} \tabularnewline \hline + \includegraphics[width=\linewidth]{zeimena_douglas_128} & + \includegraphics[width=\linewidth]{zeimena_visvalingam_128} \tabularnewline \hline 256/65536 & - \includegraphics[width=.5\linewidth]{zeimena-douglas-256} & - \includegraphics[width=.5\linewidth]{zeimena-visvalingam-256} \tabularnewline \hline + \includegraphics[width=.5\linewidth]{zeimena_douglas_256} & + \includegraphics[width=.5\linewidth]{zeimena_visvalingam_256} \tabularnewline \hline 512/262144 & - \includegraphics[width=.25\linewidth]{zeimena-douglas-512} & - \includegraphics[width=.25\linewidth]{zeimena-visvalingam-512} \tabularnewline \hline + \includegraphics[width=.25\linewidth]{zeimena_douglas_512} & + \includegraphics[width=.25\linewidth]{zeimena_visvalingam_512} \tabularnewline \hline 1024/1048576 & - \includegraphics[width=.125\linewidth]{zeimena-douglas-1024} & - \includegraphics[width=.125\linewidth]{zeimena-visvalingam-1024} \tabularnewline \hline + \includegraphics[width=.125\linewidth]{zeimena_douglas_1024} & + \includegraphics[width=.125\linewidth]{zeimena_visvalingam_1024} \tabularnewline \hline 2048/4194304 & - \includegraphics[width=.0625\linewidth]{zeimena-douglas-2048} & - \includegraphics[width=.0625\linewidth]{zeimena-visvalingam-2048} \tabularnewline \hline + \includegraphics[width=.0625\linewidth]{zeimena_douglas_2048} & + \includegraphics[width=.0625\linewidth]{zeimena_visvalingam_2048} \tabularnewline \hline 4096/16777216 & - \includegraphics[width=.0625\linewidth]{zeimena-douglas-4096} & - \includegraphics[width=.0625\linewidth]{zeimena-visvalingam-4096} \tabularnewline \hline + \includegraphics[width=.0625\linewidth]{zeimena_douglas_4096} & + \includegraphics[width=.0625\linewidth]{zeimena_visvalingam_4096} \tabularnewline \hline \end{tabularx} \caption{{\DP} and {\VW} on Žeimena} \label{tab:comparison-zeimena} @@ -264,16 +264,16 @@ page~\pageref{tab:comparison-crossing}. Visvalingam-Whyatt \tabularnewline \hline 64/4096 & - \includegraphics[width=\linewidth]{overlaid-zeimena-douglas-64} & - \includegraphics[width=\linewidth]{overlaid-zeimena-visvalingam-64} \tabularnewline \hline + \includegraphics[width=\linewidth]{overlaid_zeimena_douglas_64} & + \includegraphics[width=\linewidth]{overlaid_zeimena_visvalingam_64} \tabularnewline \hline 128/16384 & - \includegraphics[width=\linewidth]{overlaid-zeimena-douglas-128} & - \includegraphics[width=\linewidth]{overlaid-zeimena-visvalingam-128} \tabularnewline \hline + \includegraphics[width=\linewidth]{overlaid_zeimena_douglas_128} & + \includegraphics[width=\linewidth]{overlaid_zeimena_visvalingam_128} \tabularnewline \hline 256/65536 & - \includegraphics[width=\linewidth]{overlaid-zeimena-douglas-256} & - \includegraphics[width=\linewidth]{overlaid-zeimena-visvalingam-256} \tabularnewline \hline + \includegraphics[width=\linewidth]{overlaid_zeimena_douglas_256} & + \includegraphics[width=\linewidth]{overlaid_zeimena_visvalingam_256} \tabularnewline \hline \end{tabularx} \caption{{\DP} and {\VW} on river crossing area} @@ -313,16 +313,16 @@ page~\pageref{tab:comparison-sinewave2}. Visvalingam-Whyatt \tabularnewline \hline 2/4 & - \includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-2} & - \includegraphics[width=\linewidth]{overlaid-sinewave2-visvalingam-2} \tabularnewline \hline + \includegraphics[width=\linewidth]{overlaid_sinewave2_douglas_2} & + \includegraphics[width=\linewidth]{overlaid_sinewave2_visvalingam_2} \tabularnewline \hline 16/256 & - \includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-16} & - \includegraphics[width=\linewidth]{overlaid-sinewave2-visvalingam-16} \tabularnewline \hline + \includegraphics[width=\linewidth]{overlaid_sinewave2_douglas_16} & + \includegraphics[width=\linewidth]{overlaid_sinewave2_visvalingam_16} \tabularnewline \hline 32/1024 & - \includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-32} & - \includegraphics[width=\linewidth]{overlaid-sinewave2-visvalingam-32} \tabularnewline \hline + \includegraphics[width=\linewidth]{overlaid_sinewave2_douglas_32} & + \includegraphics[width=\linewidth]{overlaid_sinewave2_visvalingam_32} \tabularnewline \hline \end{tabularx} \caption{{\DP} and {\VW} on example wave} diff --git a/II/Referatas/visvalingam.sql b/II/Referatas/visvalingam.sql index 31668cb..5e0e339 100644 --- a/II/Referatas/visvalingam.sql +++ b/II/Referatas/visvalingam.sql @@ -8,7 +8,7 @@ CREATE TABLE :tbl ( INSERT INTO :tbl (geom) ( SELECT ST_Multi (ST_SimplifyVW (ST_LineMerge (ST_Union (geom)), - :tolerance * :tolerance)) AS geoms + :param1 * :param1)) AS geoms FROM :src);