Update

[master.git] / ar / assignments / 2.tex

diff --git a/ar/assignments/2.tex b/ar/assignments/2.tex
index d1b13f1..5731d97 100644 (file)
--- a/ar/assignments/2.tex
+++ b/ar/assignments/2.tex
@@ -42,10 +42,11 @@ specified width and height.
                \nonumber & \vee\frac{c_jx+c_jw}{2}-\frac{c_ix+c_iw}{2}>15\\
                \nonumber & \vee\frac{c_iy+c_ih}{2}-\frac{c_jy+c_jh}{2}>15\\
                \nonumber & \vee\frac{c_jy+c_jh}{2}-\frac{c_iy+c_ih}{2}>15\Biggr)\wedge\\
-       \bigwedge_{i\in RC}\bigvee_{j\in PC}\Biggl( & c_ix=c_jx+c_jw+1\\
-               \nonumber & \vee c_ix+c_iw+1=c_jx\\
-               \nonumber & \vee c_iy=c_jy+c_jh+1\\
-               \nonumber & \vee c_iy+c_ih+1=c_jy\Biggr)
+       \bigwedge_{i\in RC}\bigvee_{j\in PC}\Biggl(
+               \nonumber & !(     c_ix-1     >c_jx+c_jw\\
+               \nonumber & \vee c_ix+1+c_jw<c_jx\\
+               \nonumber & \vee c_iy-1     >c_jy+c_jh\\
+               \nonumber & \vee c_iy+1+c_jh<c_jh\Biggr)\\
 \end{align}
 
 \subsection{SMT format solution}