stud

commit 9dda0431af26dd3794fb40e503f2beb7c0e76906 (tree)
parent bebe4cd3bfb162f5a59a15d65ecbdf1a591858e4
Author: Motiejus Jakštys <desired.mta@gmail.com>
Date:   Wed, 27 May 2020 13:56:37 +0300

add sinewave2 to doc

Diffstat:
M
II/Referatas/Makefile
 | 
9
+++++----
M
II/Referatas/mj-referatas.tex
 | 
18
+++++++++++++-----

2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile
@@ -15,7 +15,7 @@ GEN2 = $(addsuffix .pdf, \
 		   $(addprefix overlaid-sinewave-visvalingam-,$(SINEWAVE_TOLERANCES)))
 
 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 $<
 
 define algo2img
@@ -38,7 +38,8 @@ $(eval $(call algo2img,sinewave,douglas,60x24))
 $(eval $(call algo2img,sinewave,visvalingam,60x24))
 $(eval $(call algo2img,zeimena,douglas,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,crossing.pdf,zeimena.gpkg,--size=105x74 --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,visvalingam,--size $(SINEWAVE_SIZE)))
 
-sinewave.gpkg: fig2layer.py
-	./fig2layer.py -o $@ sine
+sinewave%.gpkg: fig2layer.py
+	./fig2layer.py -o $@ sine --numwaves=$*
 
 rectangle.gpkg: fig2layer.py
 	./fig2layer.py -o $@ rect --bounds $(CROSSING)
diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex
@@ -294,12 +294,12 @@ line, but too small to retain both and retain their complexity.
 
 \begin{figure}[h]
     \centering
-    \includegraphics[width=52mm]{sinewave}
+    \includegraphics[width=52mm]{sinewave2}
     \caption{Example river bend that should be generalized}
-    \label{fig:sinewave}
+    \label{fig:sinewave2}
 \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
 page~\pageref{tab:comparison-sinewave}.
 
@@ -331,8 +331,16 @@ page~\pageref{tab:comparison-sinewave}.
     \label{tab:comparison-sinewave}
 \end{figure}
 
-Ideally, the double-bend in figure~\ref{fig:sinewave} should be normalized to a
-larger single-bend, similar to figure~ on page~.
+Ideally, the double-bend in figure~\ref{fig:sinewave2} should be normalized to a
+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}
 \label{sec:related_work}