Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into iss1229
Browse files Browse the repository at this point in the history
  • Loading branch information
sangwinc committed Feb 10, 2025
2 parents 9a25a32 + d58e500 commit d978aa7
Show file tree
Hide file tree
Showing 5 changed files with 801 additions and 291 deletions.
19 changes: 19 additions & 0 deletions doc/en/Authoring/Answer_Tests/Results/AlgEquiv.md
Original file line number Diff line number Diff line change
Expand Up @@ -4694,6 +4694,25 @@ qrt(34-2*sqrt(17))-2*sqrt(34+2
<td class="cell c5">1</td>
<td class="cell c6">ATLogic_True.</td>
</tr>
<tr class="pass">
<td class="cell c0">AlgEquiv</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>((not A) and (not B)) or ((not
A) and B)</pre></td>
<td class="cell c3"><pre>not A</pre></td>
<td class="cell c4"></td>
<td class="cell c5">1</td>
<td class="cell c6">ATLogic_True.</td>
</tr>
<tr class="pass">
<td class="cell c0">AlgEquiv</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>(A xor B) nounand (A xnor B)</pre></td>
<td class="cell c3"><pre>false</pre></td>
<td class="cell c4"></td>
<td class="cell c5">1</td>
<td class="cell c6">ATLogic_True.</td>
</tr>
<tr class="pass">
<td class="cell c0">AlgEquiv</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
Expand Down
28 changes: 28 additions & 0 deletions doc/en/Authoring/Answer_Tests/Results/Equiv.md
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,34 @@ rue]</pre></td>
<td class="cell c0"><td colspan="2"></td></td>
<td class="cell c1"><td colspan="4">\[\begin{array}{lll} &\frac{1}{x^2+1}=\frac{1}{\left(x+\mathrm{i}\right)\cdot \left(x-\mathrm{i}\right)}& \cr \color{green}{\Leftrightarrow}&\mathbf{True}& \cr \end{array}\]</td></td>
</tr>
<tr class="pass">
<td class="cell c0">Equiv</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>[(A nounor B) nounand (not A n
ounor B),B]</pre></td>
<td class="cell c3"><pre>[]</pre></td>
<td class="cell c4"></td>
<td class="cell c5">1</td>
<td class="cell c6">(EMPTYCHAR, EQUIVCHAR)</td>
</tr>
<tr class="pass">
<td class="cell c0"><td colspan="2"></td></td>
<td class="cell c1"><td colspan="4">\[\begin{array}{lll} &\left\{\begin{array}{l}A\,{\text{ or }}\, B\cr {\rm not}\left( A \right)\,{\text{ or }}\, B\cr \end{array}\right.& \cr \color{green}{\Leftrightarrow}&B& \cr \end{array}\]</td></td>
</tr>
<tr class="pass">
<td class="cell c0">Equiv</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>[(A nounor B) nounand (not A n
ounor B),stackeq(B)]</pre></td>
<td class="cell c3"><pre>[]</pre></td>
<td class="cell c4"></td>
<td class="cell c5">1</td>
<td class="cell c6">(EMPTYCHAR, CHECKMARK)</td>
</tr>
<tr class="pass">
<td class="cell c0"><td colspan="2"></td></td>
<td class="cell c1"><td colspan="4">\[\begin{array}{lll} &\left\{\begin{array}{l}A\,{\text{ or }}\, B\cr {\rm not}\left( A \right)\,{\text{ or }}\, B\cr \end{array}\right.& \cr \color{green}{\checkmark}&=B& \cr \end{array}\]</td></td>
</tr>
<tr class="pass">
<td class="cell c0">Equiv</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
Expand Down
109 changes: 55 additions & 54 deletions doc/en/Authoring/Answer_Tests/Results/PropLogic.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,92 +61,93 @@ This page exposes the results of running answer tests on STACK test cases. This
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>A implies B</pre></td>
<td class="cell c3"><pre>not(A) or B</pre></td>
<td class="cell c2"><pre>not(A) and not(B)</pre></td>
<td class="cell c3"><pre>not(A or B)</pre></td>
<td class="cell c4"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>(a and b and c) xor (a and b)
xor (a and c) xor a xor true</pre></td>
<td class="cell c3"><pre>(a implies b) or c</pre></td>
<td class="cell c2"><pre>not(A) and not(B)</pre></td>
<td class="cell c3"><pre>not(A and B)</pre></td>
<td class="cell c4"></td>
<td class="cell c5">1</td>
<td class="cell c5">0</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>not(A) or B</pre></td>
<td class="cell c3"><pre>boolean_form(A implies B)</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>not(A) or B</pre></td>
<td class="cell c3"><pre>A implies B</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>not(A) and B</pre></td>
<td class="cell c3"><pre>A implies B</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">0</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>(not A and B) or (not B and A)</pre></td>
<td class="cell c3"><pre>A xor B</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>(A and B) or (not A and not B)</pre></td>
<td class="cell c3"><pre>A xnor B</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>((not A) and (not B)) or ((not
A) and B)</pre></td>
<td class="cell c3"><pre>not A</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>(A xor B) nounand (A xnor B)</pre></td>
<td class="cell c3"><pre>false</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
<td class="cell c0"></td>
<td class="cell c1"></td>
<td class="cell c2"></td>
<td class="cell c3"></td>
<tr class="pass">
<td class="cell c0">PropLogic</td>
<td class="cell c1"><span style="color:green;"><i class="fa fa-check"></i></span></td>
<td class="cell c2"><pre>(a and b and c) xor (a and b)
xor (a and c) xor a xor true</pre></td>
<td class="cell c3"><pre>(a implies b) or c</pre></td>
<td class="cell c4"></td>
<td class="cell c5"></td>
<td class="cell c5">1</td>
<td class="cell c6"></td>
</tr>
<tr class="emptyrow">
Expand Down
Loading

0 comments on commit d978aa7

Please sign in to comment.