Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
mihxil committed Oct 24, 2024
2 parents 7c40660 + e274809 commit d643776
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ The terminology which is adopted is this:
|loosely equals | `≈` | eq | equals | equality| other element| link:{ghm}abstractalgebra/AlgebraicElement.java[`AlgebraicElement`]

7+^| integer operators
| root | '`√`' | root | root | root | root | link:{ghm}abstractalgebra/CompleteFieldElement.java[`CompleteFieldElement`]
| power | '^' | root | root | root | root | link:{ghm}abstractalgebra/CompleteFieldElement.java[`CompleteFieldElement`]
| tetration | '^' | root | root | root | root | | link:{ghm}abstractalgebra/CompleteFieldElement.java[`CompleteFieldElement`]
| root | `^n^√x` | root | root | n-th root | base | link:{ghm}abstractalgebra/CompleteFieldElement.java[`CompleteFieldElement`]
| power | `x^n^` | | | n-th power | exponent | link:{ghm}abstractalgebra/CompleteFieldElement.java[`CompleteFieldElement`]
| tetration | `x↑↑n` `^n^x` | | | | height | | link:{ghm}abstractalgebra/CompleteFieldElement.java[`CompleteFieldElement`]



Expand Down
26 changes: 13 additions & 13 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -309,29 +309,29 @@ <h3 id="_abstract_algebras">1.1. Abstract Algebras</h3>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">&#8216;√&#8217;</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code><sup>n</sup>√x</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">n-th root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">base</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/mihxil/math/blob/main/mihxil-math/src/main/java/org/meeuw/math/abstractalgebra/CompleteFieldElement.java"><code>CompleteFieldElement</code></a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">power</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">'^'</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>x<sup>n</sup></code></p></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">n-th power</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">exponent</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/mihxil/math/blob/main/mihxil-math/src/main/java/org/meeuw/math/abstractalgebra/CompleteFieldElement.java"><code>CompleteFieldElement</code></a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">tetration</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">'^'</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>x↑↑n</code> <code><sup>n</sup>x</code></p></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">height</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
Expand Down

0 comments on commit d643776

Please sign in to comment.