Skip to content

Commit d643776

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 7c40660 + e274809 commit d643776

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

README.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ The terminology which is adopted is this:
7878
|loosely equals | `≈` | eq | equals | equality| other element| link:{ghm}abstractalgebra/AlgebraicElement.java[`AlgebraicElement`]
7979

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

8585

8686

docs/index.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -309,29 +309,29 @@ <h3 id="_abstract_algebras">1.1. Abstract Algebras</h3>
309309
</tr>
310310
<tr>
311311
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
312-
<td class="tableblock halign-left valign-top"><p class="tableblock">&#8216;√&#8217;</p></td>
313-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
314-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
312+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code><sup>n</sup>√x</code></p></td>
315313
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
316314
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
315+
<td class="tableblock halign-left valign-top"><p class="tableblock">n-th root</p></td>
316+
<td class="tableblock halign-left valign-top"><p class="tableblock">base</p></td>
317317
<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>
318318
</tr>
319319
<tr>
320320
<td class="tableblock halign-left valign-top"><p class="tableblock">power</p></td>
321-
<td class="tableblock halign-left valign-top"><p class="tableblock">'^'</p></td>
322-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
323-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
324-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
325-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
321+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>x<sup>n</sup></code></p></td>
322+
<td class="tableblock halign-left valign-top"></td>
323+
<td class="tableblock halign-left valign-top"></td>
324+
<td class="tableblock halign-left valign-top"><p class="tableblock">n-th power</p></td>
325+
<td class="tableblock halign-left valign-top"><p class="tableblock">exponent</p></td>
326326
<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>
327327
</tr>
328328
<tr>
329329
<td class="tableblock halign-left valign-top"><p class="tableblock">tetration</p></td>
330-
<td class="tableblock halign-left valign-top"><p class="tableblock">'^'</p></td>
331-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
332-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
333-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
334-
<td class="tableblock halign-left valign-top"><p class="tableblock">root</p></td>
330+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>x↑↑n</code> <code><sup>n</sup>x</code></p></td>
331+
<td class="tableblock halign-left valign-top"></td>
332+
<td class="tableblock halign-left valign-top"></td>
333+
<td class="tableblock halign-left valign-top"></td>
334+
<td class="tableblock halign-left valign-top"><p class="tableblock">height</p></td>
335335
<td class="tableblock halign-left valign-top"></td>
336336
</tr>
337337
</tbody>

0 commit comments

Comments
 (0)