From ff0ce4289c7ba7fee61beb71ba0094a0954ffb91 Mon Sep 17 00:00:00 2001
From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Fri, 15 Feb 2013 16:18:22 +0000
Subject: [PATCH] Improve index propagation graph.

---
 images-dot/index_propagation_dag.dot | 21 +++++++++++++--------
 presentation.tex                     |  3 ++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/images-dot/index_propagation_dag.dot b/images-dot/index_propagation_dag.dot
index c339469..38e3c06 100644
--- a/images-dot/index_propagation_dag.dot
+++ b/images-dot/index_propagation_dag.dot
@@ -1,22 +1,27 @@
 digraph discrete_expression_dag
 {
-  size="6x9";
-  ratio="compress";
+  size="9x6";
+  ratio="fill";
 
   // Expression DAG
-  node[shape=box, style=filled, texmode="raw", height=0.3,
+  node[shape=box, style=filled, texmode="raw", height=0.5,
     style="thick,draw=blue!75,fill=blue!20,rounded corners=1pt"
   ];
 
+  "=";
+  "T[alpha,beta]";
   "multiply" [label="$\times$"];
   "dot" [label="$\\begin{matrix} \\cdot \\\\ \\{x_b=x''_k, y_b=y''_k, z_b=z''_k\\} \\end{matrix}$", height=1.0];
+  "=" [label="$\\begin{matrix} = \\\\ \\{row=func_b, col=func_k\\} \\end{matrix}$", height=1.0];
 
   edge[texmode="raw"];
-  "dot" -> "bra[alpha]" [label="$\\{func_b,x_b,y_b,z_b\\}$"];
-  "fft" -> "ket[beta]" [label="$\\{func_k,x_k,y_k,z_k\\}$"];
-  "laplacian" -> "fft" [label="$\\{func_k,x'_k,y'_k,z'_k\\}$"];
-  "ifft" -> "laplacian" [label="$\\{func_k,x'_k,y'_k,z'_k\\}$"];
-  "dot" -> "ifft" [label="$\\{func_k,x''_k,y''_k,z''_k\\}$"];
+  "=" -> "T[alpha,beta]" [label="$\\{row,col\\}$"];
+  "=" -> "multiply" [label="$\\{func_b,func_k\\}$"];
   "multiply" -> "dot" [label="$\\{func_b,func_k\\}$"];
   "multiply" -> "-0.5" [label="$\\emptyset$"];
+  "dot" -> "bra[alpha]" [label="$\\{func_b,x_b,y_b,z_b\\}$"];
+  "dot" -> "ifft" [label="$\\{func_k,x''_k,y''_k,z''_k\\}$"];
+  "ifft" -> "laplacian" [label="$\\{func_k,x'_k,y'_k,z'_k\\}$"];
+  "laplacian" -> "fft" [label="$\\{func_k,x'_k,y'_k,z'_k\\}$"];
+  "fft" -> "ket[beta]" [label="$\\{func_k,x_k,y_k,z_k\\}$"];
 }
diff --git a/presentation.tex b/presentation.tex
index c61195d..17d3492 100644
--- a/presentation.tex
+++ b/presentation.tex
@@ -259,8 +259,9 @@ Permutation & $T_{perm} = (I \succ I') \cup (I' \succ I)$ \\
 We developed an code generator in Scala that attempted to reason
 abstractly about the indices involved in the computation.
 
+\vspace{0.5em}
 \centering
-\resizebox{!}{0.5\textheight}{
+\resizebox{!}{0.7\textheight}{
 \begin{tikzpicture}[scale=0.5, minimum size=2em, thick]
 \input{images-dot/index_propagation_dag}
 \end{tikzpicture}
-- 
2.47.3