commit f1bfd7d9b2f28532fc1c372560727081c193a498
parent e2ceeac1aeb641ce7180ffd9d80992e4b403b434
Author: Ivan Gankevich <igankevich@ya.ru>
Date: Sat, 23 Jun 2018 13:34:55 +0300
Redo implementation slide.
Diffstat:
2 files changed, 141 insertions(+), 25 deletions(-)
diff --git a/arma-slides-ru.org b/arma-slides-ru.org
@@ -8,7 +8,7 @@
#+BEAMER_THEME: SaintPetersburg
#+OPTIONS: todo:nil title:nil ':t toc:nil H:2
#+STARTUP: indent
-#+PROPERTY: header-args:R :results graphics :exports results
+#+PROPERTY: header-args:R :results graphics :exports results :eval no-export
#+begin_export latex
\setbeamertemplate{title page}{%
@@ -114,9 +114,18 @@
#+begin_src dot :exports results :file build/arma-pipeline-ru.pdf
digraph G {
- node [fontname="Open Sans",fontsize=10,margin="0.055,0",shape=box,bgcolor="E5E6E5",style="filled",height="0.37"]
+ node [
+ fontname="Open Sans",
+ fontsize=10,
+ margin="0.055,0",
+ shape=box,
+ fillcolor="#E5E6E5",
+ style="filled",
+ height="0.37",
+ color="#404040"
+ ]
graph [nodesep="0.25",ranksep="0.30",rankdir="LR" margin=0]
- edge [arrowsize=0.66]
+ edge [arrowsize=0.66,color="#404040"]
bgcolor="#F5F6F5"
acf [label="АКФ"]
@@ -222,9 +231,17 @@ digraph G {
#+begin_src dot :exports results :file build/acf-pipeline-ru.pdf
digraph G {
- node [fontname="Open Sans",fontsize=10,margin="0.055,0",shape=box,bgcolor="E5E6E5",style="filled"]
+ node [
+ fontname="Open Sans",
+ fontsize=10,
+ margin="0.055,0",
+ shape=box,
+ fillcolor="#E5E6E5",
+ style="filled",
+ color="#404040"
+ ]
graph [nodesep="0.25",ranksep="0.20",rankdir="TB" margin=0]
- edge [arrowsize=0.66]
+ edge [arrowsize=0.66,color="#404040"]
bgcolor="#F5F6F5"
function [label="Формула\nпрофиля волны",height="0.40"]
@@ -964,28 +981,126 @@ arma.plot_velocity_potential_field(
#+beamer: \label{slide-implementation}
-#+header: :width 1.6 :height 1.6 :bg #F5F6F5 :font sans
-#+begin_src R :file build/slides-ar-cubes-ru.pdf
-source(file.path("R", "common.R"))
-par(mgp=c(3,0.4,0), cex=0.6, mar=c(1,2,2,0))
-arma.plot_ar_cubes_2d_v2(
- 3,
- 3,
- xlabel="Индекс части (X)",
- ylabel="Индекс части (Y)",
- list(
- arrow_args=list(lwd=2,angle=7,length=0.125),
- adj_x=0.4,
- adj_y=0.5,
- no_axes=TRUE
- )
-)
-#+end_src
+#+begin_export latex
+\tikzset{Ann/.style={
+ fill=none,
+ baseline,
+ font=\footnotesize\linespread{1}\selectfont,
+}}%
+\tikzset{Cube/.style={
+ rectangle,
+ text width=0.7cm,
+ text height=0.7cm,
+ draw=spbuDarkGray,
+ fill=spbuWhite2,
+ thick,
+ font=\footnotesize\linespread{1}\selectfont,
+ align=center,
+ inner sep=0.5mm
+}}%
+\tikzset{CubeText/.style={
+ fill=none,
+ baseline,
+ font=\footnotesize\linespread{1}\selectfont,
+ inner sep=0mm
+}}%
+\tikzset{DataBlock/.style={
+ rectangle,
+ draw=spbuDarkGray,
+ thick,
+ text width=2cm,
+ align=center,
+ fill=spbuWhite2,
+ font=\footnotesize\linespread{1}\selectfont,
+ inner sep=1mm
+}}%
+\tikzset{Arrow/.style={
+ very thick,
+ arrows={-Triangle[length=0.25cm,width=0.125cm]},
+ draw=spbuDarkGray
+}}%
+\tikzset{Dashed/.style={
+ very thick,
+ draw=spbuDarkGray2,
+ dashed
+}}%
+\vspace{2cm}
+\begin{tikzpicture}[x=3cm,y=1cm,remember picture]
+% nodes
+\node[DataBlock,text width=1.2cm] (umlACF) at (0,0)
+ {АКФ};
+\node[DataBlock,text width=2.6cm] (umlYW) at (1.1,0.8)
+ {Коэффициенты АР};
+\node[DataBlock,text width=2.6cm] (umlNonlin) at (1.1,-0.8)
+ {Коэффициенты СС};
+\node[DataBlock,text width=1.5cm] (umlAR) at (2.1,0.8)
+ {Модель АР};
+\node[DataBlock,text width=1.5cm] (umlMA) at (2.1,-0.8)
+ {Модель СС};
+\node[DataBlock,text width=1.5cm] (umlARMA) at (3.1,0)
+ {Модель АРСС};
+\node[DataBlock] (umlPres) at (4.1,0)
+ {Давления};
+% arrows
+\path[Arrow] (umlACF.east) -- (umlYW.west);
+\path[Arrow] (umlACF.east) -- (umlNonlin.west);
+\path[Arrow] (umlYW.east) -- (umlAR.west);
+\path[Arrow] (umlNonlin.east) -- (umlMA.west);
+\path[Arrow] (umlAR.east) -- (umlARMA.west);
+\path[Arrow] (umlMA.east) -- (umlARMA.west);
+\path[Arrow] (umlARMA.east) -- (umlPres.west);
+\end{tikzpicture}
+#+end_export
-#+RESULTS:
-[[file:build/slides-ar-cubes-ru.pdf]]
+#+begin_export latex
+\begin{tikzpicture}[remember picture,overlay]
+% cubes
+\node[Cube,anchor=north west,yshift=-1.2cm,xshift=-3.5cm]
+ (cube00) at (current page.north east) {};
+\node[Cube,right=-0.5mm of cube00] (cube01) {};
+\node[Cube,below=-0.5mm of cube00] (cube10) {};
+\node[Cube,below=-0.5mm of cube01] (cube11) {};
+% cube labels
+\node[CubeText] (cubeLabel00) at (cube00) {A};
+\node[CubeText] (cubeLabel01) at (cube01) {B};
+\node[CubeText] (cubeLabel10) at (cube10) {C};
+\node[CubeText] (cubeLabel11) at (cube11) {D};
+% cube arrows
+\path[Arrow] (cubeLabel01.west) -- (cubeLabel00.east);
+\path[Arrow] (cubeLabel10.north) -- (cubeLabel00.south);
+\path[Arrow] (cubeLabel11.north west) -- (cubeLabel00.south east);
+\path[Arrow] (cubeLabel11.north) -- (cubeLabel01.south);
+\path[Arrow] (cubeLabel11.west) -- (cubeLabel10.east);
+\end{tikzpicture}
+#+end_export
-[[file:build/arma-pipeline-ru.pdf]]
+#+begin_export latex
+\begin{tikzpicture}[remember picture,overlay]
+% nodes
+\node[Ann,anchor=north,below=of umlACF] (annACF)
+ {Свертка (\(2\mathcal{F}\))};
+\node[Ann,anchor=north,above=of umlYW] (annYW)
+ {Симметричная СЛАУ};
+\node[Ann,anchor=north,below=of umlNonlin] (annNonlin)
+ {Метод простой итерации};
+\node[Ann,anchor=north,below=of umlMA,yshift=\baselineskip] (annMA)
+ {Свертка (\(3\mathcal{F}\))};
+\node[Ann,anchor=north,below=of umlPres] (annPres)
+ {Свертка (\(4\mathcal{F}\))};
+\node[Ann,anchor=south,above=of umlAR,align=center,yshift=1.5\baselineskip] (annAR)
+ {Мини-планировщик задач};
+\node[Ann,anchor=north,below=1mm of cube11.south west,align=center] (annARdeps)
+ {Авторегрессионные\\зависимости};
+% arrows
+\path[Dashed] (annACF.north -| umlACF.south) -- (umlACF.south);
+\path[Dashed] (annNonlin.north -| umlNonlin.south) -- (umlNonlin.south);
+\path[Dashed] (annYW.south -| umlYW.north) -- (umlYW.north);
+\path[Dashed] (annAR.south) -- (umlAR.north);
+\path[Dashed] (cube00.west |- annAR.east) -- (annAR.east);
+\path[Dashed] (annMA.north -| umlMA.south) -- (umlMA.south);
+\path[Dashed] (annPres.north -| umlPres.south) -- (umlPres.south);
+\end{tikzpicture}
+#+end_export
** Notes
:PROPERTIES:
diff --git a/slides-preamble.tex b/slides-preamble.tex
@@ -19,6 +19,7 @@
\usepackage{tikz}
\usetikzlibrary{arrows}
+\usetikzlibrary{arrows.meta}
\usetikzlibrary{decorations.markings}
\usetikzlibrary{positioning}
\usetikzlibrary{shapes}
