aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duncan <pabs@pablotron.org>2021-03-06 13:20:52 -0500
committerPaul Duncan <pabs@pablotron.org>2021-03-06 13:20:52 -0500
commit83ef6a730f319de8c4673d7a9b381f49dcd41694 (patch)
tree77d1790bee1666a5e7778875fe9ec92570232e2a
parentf32bf21c47271c229455b5a9d64b9645d6e3fd23 (diff)
downloadmathy-master.tar.bz2
mathy-master.zip
add second view of permutations and combinations and definitionsHEADmaster
-rw-r--r--htdocs/js/data.js46
1 files changed, 43 insertions, 3 deletions
diff --git a/htdocs/js/data.js b/htdocs/js/data.js
index ab59066..6a6f754 100644
--- a/htdocs/js/data.js
+++ b/htdocs/js/data.js
@@ -253,7 +253,7 @@ var DATA = {
" \\text{Repetition} &",
" \\text{Formula} \\\\ ",
"\\hline",
- " \\text{Permutation} &",
+ " \\text{Permutation}&",
" \\text{Yes} &",
" \\text{Yes} &",
" n^k \\\\",
@@ -266,12 +266,52 @@ var DATA = {
" \\text{Combination} &",
" \\text{No} &",
" \\text{Yes} &",
- " \\frac{(n + k - 1)!}{k!(n - 1)!} = {n + k - 1 \\choose k} \\\\ ",
+ " % \\frac{(n + k - 1)!}{k!(n - 1)!} = ",
+ " {n + k - 1 \\choose k} \\\\ ",
"\\hline",
" \\text{Combination} &",
" \\text{No} &",
" \\text{No} &",
- " \\frac{n!}{k!(n - k)!} = {n \\choose k} \\\\ ",
+ " % \\frac{n!}{k!(n - k)!} = ",
+ " {n \\choose k} \\\\ ",
+ "\\hline",
+ "\\end{array} \\\\",
+ "",
+ "\\text{ } \\\\",
+ "\\text{Permutations and Combinations} \\\\",
+ "\\begin{array}{|c|c|c|}",
+ "\\hline",
+ " \\text{Name} &",
+ " \\text{With Repetition} &",
+ " \\text{Without Repetition} \\\\",
+ "\\hline",
+ " \\text{Permutation} &",
+ " n^k & ",
+ " \\frac{n!}{(n - k)!} \\\\",
+ "\\hline",
+ " \\text{Combination} &",
+ " {n + k - 1 \\choose k} &",
+ " {n \\choose k} \\\\",
+ "\\hline",
+ "\\end{array} \\\\",
+ "",
+ "",
+ "\\text{ } \\\\",
+ "\\text{Definitions} \\\\",
+ "\\begin{array}{|c|c|c|l|}",
+ "\\hline",
+ " \\text{Denoted} &",
+ " \\text{Read As} &",
+ " \\text{Formula} \\\\",
+ "\\hline",
+ " n! &",
+ " \\text{\"N factorial\"} &",
+ " n! = \\prod_{i=1}^n{i} \\\\",
+ " % = 1 \\cdot 2 \\cdot \\ldots \\cdot (n - 1) \\cdot n \\\\",
+ "\\hline",
+ " {n \\choose k} &",
+ " \\text{\"N choose K\"} &",
+ " {n \\choose k} = \\frac{n!}{k!(n - k)!} \\\\",
"\\hline",
"\\end{array}",
],