summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.txt7
-rw-r--r--html/encyclopedia/chemistry.html46
-rw-r--r--html/encyclopedia/mathematics.html44
-rw-r--r--html/encyclopedia/physics.html79
4 files changed, 110 insertions, 66 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fd71865..ad745bb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+# 44
+
+* encyclopedia: Fix errors on chemistry page;
+* encyclopedia: Update physics page;
+* encyclopedia: Update chemistry page;
+* encyclopedia: Update mathematics page;
+
# 43
* Stylesheet adjustments;
diff --git a/html/encyclopedia/chemistry.html b/html/encyclopedia/chemistry.html
index eb32b1b..33c15e3 100644
--- a/html/encyclopedia/chemistry.html
+++ b/html/encyclopedia/chemistry.html
@@ -18,11 +18,8 @@
<th>Enhed</th>
<th>Tegn<sub> af enhed</sub></th>
</tr>
- <tr>
- <td>mollarmasse</td>
- <td class="math">\(M\)</td>
- <td>kilogram pr. mol</td>
- <td class="math">\(\frac{kg}{mol}\)</td>
+ <tr class="small">
+ <th colspan="4">Grundlæggende Mål</th>
</tr>
<tr>
<td>stofmængde</td>
@@ -30,14 +27,41 @@
<td>mol</td>
<td class="math">\(mol\)</td>
</tr>
+ <tr class="small">
+ <th colspan="4">Afledte Mål</th>
+ </tr>
+ <tr>
+ <td>molar masse</td>
+ <td class="math">\(M\)</td>
+ <td>kilogram pr. mol</td>
+ <td class="math">\(\frac{kg}{mol}\)</td>
+ </tr>
</table>
<p class="graphicText">Evt. se <a href="/html/encyclopedia/physics.html#measures-and-units">fysikkens enheder</a>.</p>
+ <p>Yderligere mål:</p>
+ <table>
+ <tr>
+ <th>Mål</th>
+ <th>Tegn</th>
+ <th>Afledt af</th>
+ </tr>
+ <tr>
+ <td>atom masse</td>
+ <td class="math">\(A_r\)</td>
+ <td>masse</td>
+ </tr>
+ </table>
</div>
<div class="section" id="formulas">
<p class="large">Formler</p>
+ <p class="math">\(A_r = \frac{M}{M_u}\)</p>
+ <br />
<p class="math">\(m = Mn\)</p>
+ <br />
+ <p class="math">\(M = A_rM_u\)</p>
<p class="math">\(M = \frac{m}{n}\)</p>
- <p class="math">\(n = \frac{M}{m}\)</p>
+ <br />
+ <p class="math">\(n = \frac{m}{M}\)</p>
</div>
<div class="section" id="constants">
<p class="large">Konstanter</p>
@@ -47,10 +71,20 @@
<th>Symbol</th>
</tr>
<tr>
+ <td>molar masse konstanten</td>
+ <td class="math">\(M_u\)</td>
+ </tr>
+ <tr>
+ <td>atom masse konstanten</td>
+ <td class="math">\(m_u\)</td>
+ </tr>
+ <tr>
<td>Avagadros konstant</td>
<td class="math">\(N_A\)</td>
</tr>
</table>
+ <p class="math">\(M_u = m_uN_a \approx \frac{999\ 999\ 999\ 65}{10 ^ {14}}\ \frac{kg}{mol}\)</p>
+ <p class="math">\(m_u = \frac{m(_6 ^ {12}C)}{12} \approx \frac{16\ 605\ 390\ 666}{10 ^ {37}}\ kg\)</p>
<p class="math">\(N_A = 602\ 214\ 076 \cdot 10 ^ {15}\ mol ^ {-1}\)</p>
</div>
</div>
diff --git a/html/encyclopedia/mathematics.html b/html/encyclopedia/mathematics.html
index 2e079a5..a7001bb 100644
--- a/html/encyclopedia/mathematics.html
+++ b/html/encyclopedia/mathematics.html
@@ -15,7 +15,7 @@
<p class="math">\(z - y = x\)</p>
<p class="math">\(z - x = y\)</p>
<br />
- <p class="math">\(x y = z\)</p>
+ <p class="math">\(xy = z\)</p>
<p class="math">\(\frac{z}{y} = x\)</p>
<p class="math">\(\frac{z}{x} = y\)</p>
<br />
@@ -27,27 +27,27 @@
<p class="math">\(x ^ 0 = 1\)</p>
<p class="math">\(x ^ {\frac{a}{b}} = \sqrt[b]{x ^ a}\)</p>
<br />
- <p class="math">\(\frac{x}{y} = x \cdot \frac{1}{y}\)</p>
+ <p class="math">\(\frac{x}{y} = x\frac{1}{y}\)</p>
<p class="math">\(\frac{x}{y} + n = \frac{x + n y}{y}\)</p>
- <p class="math">\(\frac{x}{y} + \frac{a}{b} = \frac{x b + a y}{y b}\)</p>
- <p class="math">\(\frac{x}{y} n = \frac{x n}{y}\)</p>
- <p class="math">\(\frac{x}{y} \frac{a}{b} = \frac{x a}{y b}\)</p>
+ <p class="math">\(\frac{x}{y} + \frac{a}{b} = \frac{x b + ay}{yb}\)</p>
+ <p class="math">\(\frac{x}{y}n = \frac{xn}{y}\)</p>
+ <p class="math">\(\frac{x}{y}\frac{a}{b} = \frac{x a}{y b}\)</p>
<p class="math">\(\frac{x}{\frac{a}{b}} = \frac{xb}{a}\)</p>
<p class="math">\(\frac{\frac{x}{y}}{z} = \frac{x}{yz}\)</p>
- <p class="math">\(\frac{\frac{x}{y}}{\frac{a}{b}} = \frac{x b}{y a}\)</p>
+ <p class="math">\(\frac{\frac{x}{y}}{\frac{a}{b}} = \frac{xb}{ya}\)</p>
<br />
- <p class="math">\(x ^ a x ^ b = x ^ {a + b}\)</p>
+ <p class="math">\(x ^ ax ^ b = x ^ {a + b}\)</p>
<p class="math">\(\frac{x ^ a}{x ^ b} = x ^ {a - b}\)</p>
- <p class="math">\(x ^ a y ^ a = (x y) ^ a\)</p>
+ <p class="math">\(x ^ ay ^ a = (xy) ^ a\)</p>
<p class="math">\(\frac{x ^ a}{y ^ a} = (\frac{x}{y}) ^ a\)</p>
- <p class="math">\((x ^ a) ^ b = x ^ {a b}\)</p>
+ <p class="math">\((x ^ a) ^ b = x ^ {ab}\)</p>
</div>
<div class="section" id="equations">
<p class="large">Ligninger</p>
<p>Andengrads:</p>
- <p class="math">\(y = a x ^ 2 + b x + c\)</p>
+ <p class="math">\(y = ax ^ 2 + bx + c\)</p>
<p class="math">\(x = \frac{-b \pm \sqrt[2]{d}}{2a}\)</p>
- <p class="math">\(d = b ^ 2 - 4 a c\)</p>
+ <p class="math">\(d = b ^ 2 - 4ac\)</p>
</div>
<div class="section" id="functions">
<p class="large">Funktioner</p>
@@ -55,25 +55,25 @@
<p class="math">\(x = f ^ {-1}(y)\)</p>
<br />
<p>Lineær:</p>
- <p class="math">\(f(x) = a x + b\)</p>
+ <p class="math">\(f(x) = ax + b\)</p>
<p class="math">\(a = \frac{y_1 - y_0}{x_1 - x_0}\)</p>
<p class="math">\(b = y - ax\)</p>
- <p class="math">\(b = f(0) = 0a + b\)</p>
+ <p class="math">\(b = f(0)\)</p>
<br />
<p>Eksponentiel:</p>
- <p class="math">\(f(x) = b a ^ x\)</p>
+ <p class="math">\(f(x) = ba ^ x\)</p>
<p class="math">\(a = \sqrt[x_1 - x_0]{\frac{y_1}{y_{0}}}\)</p>
<p class="math">\(b = \frac{y}{a ^ x}\)</p>
- <p class="math">\(b = f(0) = b a ^ 0 = 1b\)</p>
+ <p class="math">\(b = f(0)\)</p>
<br />
<p>Potens:</p>
- <p class="math">\(f(x) = b x ^ a\)</p>
+ <p class="math">\(f(x) = bx ^ a\)</p>
<p class="math">\(a = \frac{log_n(y_1) - log_n(y_0)}{log_n(x_1) - log_n(x_1)}\)</p>
<p class="math">\(b = \frac{y}{x ^ a}\)</p>
- <p class="math">\(b = f(1) = b \cdot 1 ^ a = 1b\)</p>
+ <p class="math">\(b = f(1)\)</p>
<br />
<p>Kvadratisk (andengrads):</p>
- <p class="math">\(f(x) = a x ^ 2 + b x + c\)</p>
+ <p class="math">\(f(x) = ax ^ 2 + bx + c\)</p>
</div>
<div class="section" id="trigonometry">
<p class="large">Trigonometri</p>
@@ -109,11 +109,11 @@
<p class="math">\(arcsec = sec ^ {-1}\)</p>
<p class="math">\(arccsc = csc ^ {-1}\)</p>
<br />
- <p class="math">\(deg(rad) = \frac{rad \cdot \pi}{180}\)</p>
- <p class="math">\(rad(deg) = \frac{deg \cdot 180}{\pi}\)</p>
+ <p class="math">\(deg(rad) = \frac{rad\pi}{180}\)</p>
+ <p class="math">\(rad(deg) = \frac{deg180}{\pi}\)</p>
<br />
- <p class="math">\(vinkelsum(x) = \pi(x - 2)\)</p>
- <p class="math">\(vinkelsum(3) = \pi(3 - 2) = \pi\)</p>
+ <p class="math">\(vinkelsum(x) = (x - 2)\pi\)</p>
+ <p class="math">\(vinkelsum(3) = (3 - 2)\pi = \pi\)</p>
<br />
<p class="math">\(\angle A = sin ^ {-1} (\frac{a}{c}) = cos ^ {-1} (\frac{b}{c}) = tan ^ {-1} (\frac{a}{b}) = vinkelsum(3) - \angle B - \angle C\)</p>
<p class="math">\(\angle B = sin ^ {-1} (\frac{b}{c}) = cos ^ {-1} (\frac{a}{c}) = tan ^ {-1} (\frac{b}{a}) = vinkelsum(3) - \angle A - \angle C\)</p>
diff --git a/html/encyclopedia/physics.html b/html/encyclopedia/physics.html
index e3e634e..a433994 100644
--- a/html/encyclopedia/physics.html
+++ b/html/encyclopedia/physics.html
@@ -52,31 +52,7 @@
<td class="math">\(s\)</td>
</tr>
<tr class="small">
- <th colspan="4">Afledte Mål</th>
- </tr>
- <tr>
- <td>areal</td>
- <td class="math">\(A\)</td>
- <td>kvadratmeter</td>
- <td class="math">\(m ^ 2\)</td>
- </tr>
- <tr>
- <td>acceleration</td>
- <td class="math">\(a\)</td>
- <td>meter pr. kvadratsekund</td>
- <td class="math">\(\frac{m}{s ^ 2}\)</td>
- </tr>
- <tr>
- <td>varmekapacitet</td>
- <td class="math">\(C\)</td>
- <td>joule pr. kelvin</td>
- <td class="math">\(\frac{J}{K}\)</td>
- </tr>
- <tr>
- <td>specifik varmekapacitet</td>
- <td class="math">\(c\)</td>
- <td>joule pr. kelvin-kilogram</td>
- <td class="math">\(\frac{J}{K \cdot kg}\)</td>
+ <th colspan="4">Afledte Mål<sub> med navngivede enheder</sub></th>
</tr>
<tr>
<td>energi</td>
@@ -97,12 +73,6 @@
<td class="math">\(Hz\)</td>
</tr>
<tr>
- <td>hastighed</td>
- <td class="math">\(v\)</td>
- <td>meter pr. sekund</td>
- <td class="math">\(\frac{m}{s}\)</td>
- </tr>
- <tr>
<td>effekt</td>
<td class="math">\(P\)</td>
<td>watt</td>
@@ -120,6 +90,39 @@
<td>coulomb</td>
<td class="math">\(C\)</td>
</tr>
+ <tr class="small">
+ <th colspan="4">Afledte Mål<sub> med unavngivede enheder</sub></th>
+ </tr>
+ <tr>
+ <td>areal</td>
+ <td class="math">\(A\)</td>
+ <td>kvadratmeter</td>
+ <td class="math">\(m ^ 2\)</td>
+ </tr>
+ <tr>
+ <td>acceleration</td>
+ <td class="math">\(a\)</td>
+ <td>meter pr. kvadratsekund</td>
+ <td class="math">\(\frac{m}{s ^ 2}\)</td>
+ </tr>
+ <tr>
+ <td>varmekapacitet</td>
+ <td class="math">\(C\)</td>
+ <td>joule pr. kelvin</td>
+ <td class="math">\(\frac{J}{K}\)</td>
+ </tr>
+ <tr>
+ <td>specifik varmekapacitet</td>
+ <td class="math">\(c\)</td>
+ <td>joule pr. kelvin-kilogram</td>
+ <td class="math">\(\frac{J}{K \cdot kg}\)</td>
+ </tr>
+ <tr>
+ <td>hastighed</td>
+ <td class="math">\(v\)</td>
+ <td>meter pr. sekund</td>
+ <td class="math">\(\frac{m}{s}\)</td>
+ </tr>
<tr>
<td>volumen</td>
<td class="math">\(V\)</td>
@@ -187,26 +190,26 @@
<p class="math">\(\rho = \frac{m}{V}\)</p>
<br />
<p>På en planet:</p>
- <p class="math">\(g = \frac{G m}{r ^ {2}}\)</p>
+ <p class="math">\(g = \frac{Gm}{r ^ {2}}\)</p>
<p>... hvori <i>r</i> er afstanden til planetens kerne.</p>
<p class="math">\(g = \frac{981}{100} \frac{m}{s ^ 2}\)</p>
<p>... er standard på Jorden.</p>
<br />
- <p class="math">\(F = m a\)</p>
+ <p class="math">\(F = ma\)</p>
<p>Gravtitation mellem to objekter:</p>
- <p class="math">\(F = \frac{G m_{0} m_{1}}{r ^ {2}}\)</p>
+ <p class="math">\(F = \frac{Gm_{0}m_{1}}{r ^ {2}}\)</p>
<p>... <i>m_0</i> og <i>m_1</i> er masserne af objekterne og <i>r</i> er distancen mellem centrene af de to objekter.</p>
<br />
<p class="math">\(p = \frac{F}{A}\)</p>
<br />
<p class="math">\(P = \frac{E}{t}\)</p>
<br />
- <p class="math">\(E = F s\)</p>
- <p class="math">\(E = P t\)</p>
+ <p class="math">\(E = Fs\)</p>
+ <p class="math">\(E = Pt\)</p>
<p class="math">\(K = \frac{mv ^ {2}}{2}\)</p>
- <p class="math">\(Q = C T = c m T\)</p>
+ <p class="math">\(Q = CT = cmT\)</p>
<p>Gravitation:</p>
- <p class="math">\(U = F s = m g s\)</p>
+ <p class="math">\(U = Fs = mgs\)</p>
<p>... hvori <i>F</i> er tyngdekraften og <i>g</i> er den lokale tyngeacceleration.</p>
</div>
<div class="section" id="constants">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 01:37:20 +0100