From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 2 Feb 2015 09:17:24 +0000 (+0100)
Subject: update
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=2d2fd306719e2d9a9db2214a473cc779137ce2c9;p=ker2014-2.git

update
---

diff --git a/report/ass2-1.tex b/report/ass2-1.tex
index 66fed8f..119d88e 100644
--- a/report/ass2-1.tex
+++ b/report/ass2-1.tex
@@ -186,6 +186,7 @@ A bayesian network representation of the burglary problem with a multitude of
 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 figere~\ref{bnnetworkhouses}
+accompanied with the probability distributions below.
 
 \begin{tabular}{|l|l|}
 	\hline
@@ -253,7 +254,6 @@ The network would look something like in figere~\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
--- 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.