diff --git a/assignments/a2/a2.pdf b/assignments/a2/a2.pdf index 723c0ab..d4cb6e3 100644 Binary files a/assignments/a2/a2.pdf and b/assignments/a2/a2.pdf differ diff --git a/assignments/a2/a2.tex b/assignments/a2/a2.tex index d3e251e..c71d2ae 100644 --- a/assignments/a2/a2.tex +++ b/assignments/a2/a2.tex @@ -111,7 +111,7 @@ $\forall s \in sc.sections,~ ...$ % TODO: fill in the predicate definition for two meeting times conflicting \begin{align*} -MeetingTimesConflict(m_1, m_2) : m_1[0] == m_2[0] \land m_1[2] > m_2[1] \land m_2[2] > m_1[1] +MeetingTimesConflict(m_1, m_2) : m_1[0] == m_2[0] \land m_1[2] > m_2[1] \land m_2[2] > m_1[1] \\ \qquad \text{where $m_1, m_2 \in M$} \end{align*} @@ -122,8 +122,8 @@ MeetingTimesConflict(m_1, m_2) : m_1[0] == m_2[0] \land m_1[2] > m_2[1] \land m_ % Use the MeetingTimesConflict predicate in your response. \begin{align*} -SectionsConflict(s_1, s_2) : ('Y' \in \{s_1[1], s_2[1]\} \lor s_1[1] = s_2[1]) \Rightarrow \\ -\exists m_1 \in s_1[2], \text{ s.t. } \exists m_2 \in s_2[2], \text { s.t. } MeetingTimesConflict(m_1, m_2) +SectionsConflict(s_1, s_2) : (s_1[1]=\text{'Y'} \lor s_2[1]=\text{'Y'} \lor s_1[1] = s_2[1]) \land \\ +\exists m_1 \in s_1[2], \exists m_2 \in s_2[2], \text { s.t. } MeetingTimesConflict(m_1, m_2) \\ \qquad \text{where $s_1, s_2 \in S$} \end{align*}