add sinewave2 to doc

This commit is contained in:
Motiejus Jakštys 2020-05-27 13:56:37 +03:00
parent bebe4cd3bf
commit 9dda0431af
2 changed files with 18 additions and 9 deletions

View File

@ -15,7 +15,7 @@ GEN2 = $(addsuffix .pdf, \
$(addprefix overlaid-sinewave-visvalingam-,$(SINEWAVE_TOLERANCES))) $(addprefix overlaid-sinewave-visvalingam-,$(SINEWAVE_TOLERANCES)))
mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena.pdf \ mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena.pdf \
sinewave.pdf crossing.pdf $(GEN1) $(GEN2) sinewave1.pdf sinewave2.pdf crossing.pdf $(GEN1) $(GEN2)
latexmk -g -pdf $< latexmk -g -pdf $<
define algo2img define algo2img
@ -38,7 +38,8 @@ $(eval $(call algo2img,sinewave,douglas,60x24))
$(eval $(call algo2img,sinewave,visvalingam,60x24)) $(eval $(call algo2img,sinewave,visvalingam,60x24))
$(eval $(call algo2img,zeimena,douglas,210x297)) $(eval $(call algo2img,zeimena,douglas,210x297))
$(eval $(call algo2img,zeimena,visvalingam,210x297)) $(eval $(call algo2img,zeimena,visvalingam,210x297))
$(eval $(call gpkg2pdf,sinewave.pdf,sinewave.gpkg,,--size=$(SINEWAVE_SIZE))) $(eval $(call gpkg2pdf,sinewave1.pdf,sinewave1.gpkg,,--size=$(SINEWAVE_SIZE)))
$(eval $(call gpkg2pdf,sinewave2.pdf,sinewave2.gpkg,,--size=$(SINEWAVE_SIZE)))
$(eval $(call gpkg2pdf,zeimena.pdf,zeimena.gpkg rectangle.gpkg,--size=134x191 --group2-infile rectangle.gpkg)) $(eval $(call gpkg2pdf,zeimena.pdf,zeimena.gpkg rectangle.gpkg,--size=134x191 --group2-infile rectangle.gpkg))
$(eval $(call gpkg2pdf,crossing.pdf,zeimena.gpkg,--size=105x74 --clip $(CROSSING))) $(eval $(call gpkg2pdf,crossing.pdf,zeimena.gpkg,--size=105x74 --clip $(CROSSING)))
$(eval $(call algo2overlay,zeimena,douglas,--size 148x105 --clip $(CROSSING))) $(eval $(call algo2overlay,zeimena,douglas,--size 148x105 --clip $(CROSSING)))
@ -46,8 +47,8 @@ $(eval $(call algo2overlay,zeimena,visvalingam,--size 148x105 --clip $(CROSSING)
$(eval $(call algo2overlay,sinewave,douglas,--size $(SINEWAVE_SIZE))) $(eval $(call algo2overlay,sinewave,douglas,--size $(SINEWAVE_SIZE)))
$(eval $(call algo2overlay,sinewave,visvalingam,--size $(SINEWAVE_SIZE))) $(eval $(call algo2overlay,sinewave,visvalingam,--size $(SINEWAVE_SIZE)))
sinewave.gpkg: fig2layer.py sinewave%.gpkg: fig2layer.py
./fig2layer.py -o $@ sine ./fig2layer.py -o $@ sine --numwaves=$*
rectangle.gpkg: fig2layer.py rectangle.gpkg: fig2layer.py
./fig2layer.py -o $@ rect --bounds $(CROSSING) ./fig2layer.py -o $@ rect --bounds $(CROSSING)

View File

@ -294,12 +294,12 @@ line, but too small to retain both and retain their complexity.
\begin{figure}[h] \begin{figure}[h]
\centering \centering
\includegraphics[width=52mm]{sinewave} \includegraphics[width=52mm]{sinewave2}
\caption{Example river bend that should be generalized} \caption{Example river bend that should be generalized}
\label{fig:sinewave} \label{fig:sinewave2}
\end{figure} \end{figure}
When one applies {\DP} to figure~\ref{fig:sinewave}, either both bends remain, When one applies {\DP} to figure~\ref{fig:sinewave2}, either both bends remain,
or become a straight line, see table~\ref{tab:comparison-sinewave} on or become a straight line, see table~\ref{tab:comparison-sinewave} on
page~\pageref{tab:comparison-sinewave}. page~\pageref{tab:comparison-sinewave}.
@ -331,8 +331,16 @@ page~\pageref{tab:comparison-sinewave}.
\label{tab:comparison-sinewave} \label{tab:comparison-sinewave}
\end{figure} \end{figure}
Ideally, the double-bend in figure~\ref{fig:sinewave} should be normalized to a Ideally, the double-bend in figure~\ref{fig:sinewave2} should be normalized to a
larger single-bend, similar to figure~ on page~. larger single-bend, similar to figure~\ref{fig:sinewave1} on
page~\pageref{fig:sinewave2}.
\begin{figure}[h]
\centering
\includegraphics[width=52mm]{sinewave1}
\caption{Possible river bend generalization}
\label{fig:sinewave1}
\end{figure}
\section{Related Work and future suggestions} \section{Related Work and future suggestions}
\label{sec:related_work} \label{sec:related_work}