graaf klaar

diff --git a/report/ass2-1.tex b/report/ass2-1.tex
index 03b3569..964ec1e 100644 (file)
--- a/report/ass2-1.tex
+++ b/report/ass2-1.tex
@@ -7,46 +7,64 @@
 \end{figure}
 
 \strut\\
-\begin{tabular}{|l|l|}
+\begin{tabular}{|l|ll|}
        \hline
-               & Burglar\\
+       & \multicolumn{2}{c|}{Radio}\\
+       Earthquake & T & F\\
        \hline
-       T & $0.01$\\
-       F & $0.99$\\
+       T & $0.9998$ & $0.0002$\\
+       F & $0.0002$ & $0.9998$\\
        \hline
 \end{tabular}
-\begin{tabular}{|l|l|}
+%
+\begin{tabular}{|l|ll|}
        \hline
-               & Earthquake\\
+       & \multicolumn{2}{c|}{$I_1$}\\
+       Earthquake & T & F\\
        \hline
-       T & $0.01$\\
-       F & $0.99$\\
+       T & $0.2$ & $0.08$\\
+       F & $0$ & $1$\\
        \hline
-\end{tabular}\\
+\end{tabular}
+%
 \begin{tabular}{|l|ll|}
        \hline
-               & \multicolumn{2}{c|}{Alarm}\\
+       & \multicolumn{2}{c|}{$I_2$}\\
        Burglar & T & F\\
        \hline
        T & $0.95$ & $0.05$\\
-       F & $0.00$ & $1.00$\\
+       F & $0$ & $1$\\
        \hline
 \end{tabular}
+%
+\begin{tabular}{|ll|ll|}
+       \hline
+       && \multicolumn{2}{c|}{Burglar}\\
+       i1 & i2 & T & F\\
+       \hline
+       T & T & $1$ & $0$\\
+       T & F & $1$ & $0$\\
+       F & T & $1$ & $0$\\
+       F & F & $0$ & $1$\\
+       \hline
+\end{tabular}
+%
 \begin{tabular}{|l|ll|}
        \hline
-               & \multicolumn{2}{c|}{Alarm}\\
-       Earthquake & T & F\\
+       & \multicolumn{2}{c|}{Watson}\\
+       Alarm & T & F\\
        \hline
-       T & $0.20$ & $0.80$\\
-       F & $0.00$ & $1.00$\\
+       T & $0.8$ & $0.2$\\
+       F & $0.4$ & $0.6$\\
        \hline
 \end{tabular}
+%
 \begin{tabular}{|l|ll|}
        \hline
-               & \multicolumn{2}{c|}{Holmes}\\
-       Earthquake & T & F\\
+       & \multicolumn{2}{c|}{Gibbons}\\
+       Alarm & T & F\\
        \hline
-       T & $0.9998$ & $0.0002$\\
-       F & $0.00$ & $1.00$\\
+       T & $0.99$ & $0.01$\\
+       F & $0.04$ & $0.96$\\
        \hline
 \end{tabular}

diff --git a/report/d1.dot b/report/d1.dot
index da5cca4..29cf034 100644 (file)
--- a/report/d1.dot
+++ b/report/d1.dot
@@ -1,10 +1,18 @@
 digraph {
+       i1 [label=<I<SUB>1</SUB>>]
+       i2 [label=<I<SUB>2</SUB>>]
+       n [shape=plaintext label="Noisy OR"]
+       n -> alarm [style=invis]
+       newscast [label="Newcast calls"]
+       gibbons [label="Gibbons calls"]
+       watson [label="Watson calls"]
+       
        earthquake -> i1
        burglar -> i2
        i1 -> alarm
        i2 -> alarm
-       earthquake -> "Newscast calls"
+       earthquake -> newscast
 
-       alarm -> "Watson calls"
-       alarm -> "Gibson calls"
+       alarm -> watson
+       alarm -> gibbons
 }