diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile index 69f816d..9ed0201 100644 --- a/II/Referatas/Makefile +++ b/II/Referatas/Makefile @@ -1,6 +1,6 @@ CROSSING=622916 6109267 626066 6111487 # xmin ymin xmax ymax ZEIMENA_TOLERANCES = 128 256 512 1024 2048 4096 -SINEWAVE_TOLERANCES = 2 16 32 40 +SINEWAVE_TOLERANCES = 2 16 32 CROSSING_TOLERANCES = 64 128 256 SINEWAVE_SIZE = 120x48 #CROSSING=622916 6119267 626066 6121487 diff --git a/II/Referatas/fig2layer.py b/II/Referatas/fig2layer.py index 816c6e9..b8c946c 100755 --- a/II/Referatas/fig2layer.py +++ b/II/Referatas/fig2layer.py @@ -24,7 +24,7 @@ def sinewave(args): TAIL_LEN, SINE_LEN = 7, 7 TAILS = np.zeros(int(TAIL_LEN / INTERVAL)) sin_range = np.arange(-pi/4, SINE_LEN, INTERVAL) * pi / 2 - amplitude = (np.sin(sin_range)+1)*2 + amplitude = (np.sin(sin_range)+1) else: TAIL_LEN, SINE_LEN = 3.5, 3.5 TAILS = np.zeros(int(TAIL_LEN / INTERVAL)) diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex index 9e8bcd9..cee2f82 100644 --- a/II/Referatas/mj-referatas.tex +++ b/II/Referatas/mj-referatas.tex @@ -304,7 +304,7 @@ When one applies {\DP} to figure~\ref{fig:sinewave2}, either both bends remain, or become a straight line, see table~\ref{tab:comparison-sinewave2} on page~\pageref{tab:comparison-sinewave2}. -\begin{figure}[h] +\begin{figure}[H] \renewcommand{\tabularxcolumn}[1]{>{\center\small}m{#1}} \begin{tabularx}{\textwidth}{ p{1.5cm} | X | X | } Tolerance DP/VW & @@ -323,10 +323,6 @@ page~\pageref{tab:comparison-sinewave2}. \includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-32} & \includegraphics[width=\linewidth]{overlaid-sinewave2-visvalingam-32} \tabularnewline \hline - 40/1600 & - \includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-40} & - \includegraphics[width=\linewidth]{overlaid-sinewave2-visvalingam-40} \tabularnewline \hline - \end{tabularx} \caption{{\DP} and {\VW} on example wave} \label{tab:comparison-sinewave2} @@ -339,7 +335,7 @@ page~\pageref{fig:sinewave2}. \begin{figure}[h] \centering \includegraphics[width=52mm]{sinewave1} - \caption{Possible river bend generalization} + \caption{Desired river bend generalization} \label{fig:sinewave1} \end{figure}