X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=matthijs%2Fintroduction.lhs;h=503eac4f008c13e2b667cdfd83ff0cca4475fd69;hb=052773558247613c012360db239176e6aba7f8be;hp=7aff0cfd247c33e8ddfdcabfeb2643d570f24f42;hpb=9246a7cdb2a903798eb1719cbd6df1753ee61ee9;p=matthijs%2Fmaster-project%2Ffinal-presentation.git

diff --git a/matthijs/introduction.lhs b/matthijs/introduction.lhs
index 7aff0cf..503eac4 100644
--- a/matthijs/introduction.lhs
+++ b/matthijs/introduction.lhs
@@ -114,21 +114,19 @@
 {
   \frametitle{Multiply-accumulate}
   \begin{columns}
-    \begin{column}{5cm}
-      \begin{block}{}
+    \begin{column}{4cm}
         \begin{tabular}{lll}
           Input A & Input B & Output \\
           \hline
-          1 & 1 & 0 \\
-          1 & 2 & 1 \\
-          1 & 1 & 3 \\
-          2 & 2 & 4 \\
+          1 & 1 & 1 \\
+          1 & 2 & 3 \\
+          1 & 1 & 4 \\
+          2 & 2 & 8 \\
         \end{tabular}
-      \end{block}
     \end{column}
-    \begin{column}{5cm}
+    \begin{column}{6cm}
       \begin{figure}
-        TODO: Image of MAC with internal register
+        \includegraphics[width=7cm]{figures/archs/Mac}
       \end{figure}
     \end{column}
   \end{columns}
@@ -149,7 +147,7 @@
 {
   \frametitle{Multiply-accumulate}
   \begin{columns}
-    \begin{column}{5cm}
+    \begin{column}{4cm}
       \begin{block}{}
         \vspace{-0.5cm}
 \begin{verbatim}
@@ -159,9 +157,9 @@ in (State sum, sum)
 \end{verbatim}
       \end{block}
     \end{column}
-    \begin{column}{5cm}
+    \begin{column}{6cm}
       \begin{figure}
-        TODO: Image of MAC with external register
+        \includegraphics[width=7cm]{figures/archs/MacExternal}
       \end{figure}
     \end{column}
   \end{columns}
@@ -182,7 +180,7 @@ in (State sum, sum)
 
   \begin{block}{Recursive run function}
     run f (i:is) s = let
-      (o, s') = f i s
+      (s', o) = f i s
     in o : (run f is s')
   \end{block}
 
@@ -241,7 +239,8 @@ in (State sum, sum)
   \item Core: simpele functionale taal, niet minder expressief (vergelijk:
   taal zonder synoniemen)
   \item VHDL: Complexe HDL, gebruiken alleen netlist onderdelen.
-  \item Normalisatie: Nog simpeler maken.
+  \item Normalisatie: Nog simpeler maken (Polymorphisme, hogere orde eruit,
+  eenduidige vorm).
 }
 
 \subsection{Normalization}