merge

diff --git a/report/ass2-1.tex b/report/ass2-1.tex
index 462d0c8..a7b576e 100644 (file)
--- a/report/ass2-1.tex
+++ b/report/ass2-1.tex
@@ -190,6 +190,7 @@ houses and burglars is possible but would be very big and tedious because all
 the constraints about the burglars must be incorporated in the network.
 The network would look something like in figure~\ref{bnnetworkhouses}
 
+
 \begin{tabular}{|l|l|}
        \hline
        Joe &\\
@@ -256,7 +257,6 @@ The network would look something like in figure~\ref{bnnetworkhouses}
        \hline
 \end{tabular}
 
-
 \begin{figure}[H]
        \caption{Bayesian network of burglars and houses}
        \label{bnnetworkhouses}

diff --git a/report/src/pizza.ail b/report/src/pizza.ail
index cafb344..39188c4 100644 (file)
--- a/report/src/pizza.ail
+++ b/report/src/pizza.ail
@@ -1,24 +1,68 @@
-% Margarita : cheese, tomatosauce.
-% Hawaii    : cheese, tomatosauce, ham, pineapple.
-%      Salami    : cheese, tomatosauce, salami.
-%      Funghi    : cheese, tomatosauce, mushrooms, ham(50%).
-%      Pepperoni : cheese, tomatosauce, salami, jalapeños.
-
-
-Observeert vormen:
-       circles
-       doublecircles
-       lines
-       squares
-       blob
-
-Die vormen impliceren ingredienten:
-       salami
-       mozarella
-       ...
-
-Die ingredienten impliceren configuraties:
-       margarita
-       salami
-       hawaii
-       ...
+%%% General observer error from the low level image matching. %%%%%%%%%%%%%%%%%
+prob circle: 0.01.
+prob doublecircle: 0.01.
+prob lines: 0.01.
+prob squares: 0.01.
+prob blob: 0.01.
+prob noObserveError: 0.95.
+circlePresent <- circle & noObserveError.
+doublecirclePresent <- doublecircle & noObserveError.
+linesPresent <- lines & noObserveError.
+squaresPresent <- squares & noObserveError.
+blobPresent <- blob & noObserveError.
+
+%%% Ingredients definitions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Circle information
+prob basilicumcircle: 0.2.
+prob salamicircle: 0.4.
+prob mozarellacircle: 0.4.
+basilicum <- basilicumcircle & circlePresent.
+salami <- salamicircle & circlePresent.
+mozarella <- mozarellacircle & circlePresent.
+
+%% Doublecircle information
+prob doublecircleOlives: 0.5.
+prob doublecircleJalapenos: 0.5.
+jalapenos <- doublecircleJalapenos & doublecirclePresent.
+olives <- doublecircleOlives & doublecirclePresent.
+
+%% Lines information
+paprika <- linesPresent.
+
+%% Square information
+prob hamsquare: 0.5.
+prob pineapplesquare: 0.5.
+ham <- squaresPresent & hamsquare.
+pineapple <- squaresPresent & pineapplesquare.
+
+%% Blob information
+prob blobHam: 0.1.
+prob blobPineapple: 0.1.
+prob blobBasilicum: 0.1.
+prob blobMushrooms: 0.7.
+ham <- blobHam & blobPresent.
+pineapple <- blobPineapple & blobPresent.
+basilicum <- blobBasilicum & blobPresent.
+mushrooms <- blobMushrooms & blobPresent.
+
+%%% Pizza descriptions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Margarita
+p_margarita <- basilicum.
+       
+%% Hawaii
+prob hawaiibasilicum: 0.1.
+p_hawaii <- ham & pineapple & basilicum & hawaiibasilicum.
+
+%% Salami
+prob salamibasilicum: 0.1.
+p_salami <- salami & basilicum & salamibasilicum.
+
+%% Funghi
+prob funghiham: 0.5.
+p_funghi <- mushrooms & ham & funghiham.
+
+%% Salami
+p_pepperoni <- salami & jalapenos.
+
+%% Oliva
+p_oliva <- basilicum & olives.