motiejus/stud
1
Fork 0
Code Releases Activity

sine waves are a bit less aggressive

Browse Source
This commit is contained in:
Motiejus Jakštys 2020-05-27 14:45:11 +03:00
parent 38f75291b2
commit 8e67470f7e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
II/Referatas/Makefile
View File

@ -1,6 +1,6 @@
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 ZEIMENA_TOLERANCES = 128 256 512 1024 2048 4096
SINEWAVE_TOLERANCES = 2 16 32 40 SINEWAVE_TOLERANCES = 2 16 32
CROSSING_TOLERANCES = 64 128 256 CROSSING_TOLERANCES = 64 128 256
SINEWAVE_SIZE = 120x48 SINEWAVE_SIZE = 120x48
#CROSSING=622916 6119267 626066 6121487 #CROSSING=622916 6119267 626066 6121487

2
II/Referatas/fig2layer.py
View File

@ -24,7 +24,7 @@ def sinewave(args):
TAIL_LEN, SINE_LEN = 7, 7 TAIL_LEN, SINE_LEN = 7, 7
TAILS = np.zeros(int(TAIL_LEN / INTERVAL)) TAILS = np.zeros(int(TAIL_LEN / INTERVAL))
sin_range = np.arange(-pi/4, SINE_LEN, INTERVAL) * pi / 2 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: else:
TAIL_LEN, SINE_LEN = 3.5, 3.5 TAIL_LEN, SINE_LEN = 3.5, 3.5
TAILS = np.zeros(int(TAIL_LEN / INTERVAL)) TAILS = np.zeros(int(TAIL_LEN / INTERVAL))

8
II/Referatas/mj-referatas.tex
View File

@ -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 or become a straight line, see table~\ref{tab:comparison-sinewave2} on
page~\pageref{tab:comparison-sinewave2}. page~\pageref{tab:comparison-sinewave2}.
\begin{figure}[h] \begin{figure}[H]
\renewcommand{\tabularxcolumn}[1]{>{\center\small}m{#1}} \renewcommand{\tabularxcolumn}[1]{>{\center\small}m{#1}}
\begin{tabularx}{\textwidth}{ p{1.5cm} | X | X | } \begin{tabularx}{\textwidth}{ p{1.5cm} | X | X | }
Tolerance DP/VW & Tolerance DP/VW &
@ -323,10 +323,6 @@ page~\pageref{tab:comparison-sinewave2}.
\includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-32} & \includegraphics[width=\linewidth]{overlaid-sinewave2-douglas-32} &
\includegraphics[width=\linewidth]{overlaid-sinewave2-visvalingam-32} \tabularnewline \hline \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} \end{tabularx}
\caption{{\DP} and {\VW} on example wave} \caption{{\DP} and {\VW} on example wave}
\label{tab:comparison-sinewave2} \label{tab:comparison-sinewave2}
@ -339,7 +335,7 @@ page~\pageref{fig:sinewave2}.
\begin{figure}[h] \begin{figure}[h]
\centering \centering
\includegraphics[width=52mm]{sinewave1} \includegraphics[width=52mm]{sinewave1}
\caption{Possible river bend generalization} \caption{Desired river bend generalization}
\label{fig:sinewave1} \label{fig:sinewave1}
\end{figure} \end{figure}